[haiku-commits] haiku: hrev48362 - src/apps/debugger/user_interface/gui/team_window
- From: anevilyak@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 23 Nov 2014 06:19:58 +0100 (CET)
hrev48362 adds 1 changeset to branch 'master'
old head: b4a861136b9249eefc78a47528e5f4e515c633c6
new head: 0690178786125729bcfc3d986f330bf6998870f8
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=0690178+%5Eb4a8611
----------------------------------------------------------------------------
0690178: Debugger: Further improvements to expression handling.
VariablesView:
- ModelNode now acquires a reference to its target variable. This
is necessary because in the case of expression variables, the
model node is ultimately the only one aware of it, and therefore
needs to manage its lifetime.
- AddSyntheticNode() now discriminates between the case where it
needs to create a node child on behalf of the caller versus when
it's given an already created one, as is the case when an expression
resolves to a value node. Consequently it also detects whether
it needs to request value resolution or not, and handles accordingly.
- _AddExpressionNode() now supports value node results and handles
them accordingly.
[ Rene Gollent <rene@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev48362
Commit: 0690178786125729bcfc3d986f330bf6998870f8
URL: http://cgit.haiku-os.org/haiku/commit/?id=0690178
Author: Rene Gollent <rene@xxxxxxxxxxx>
Date: Sun Nov 23 05:12:59 2014 UTC
----------------------------------------------------------------------------
1 file changed, 55 insertions(+), 38 deletions(-)
.../gui/team_window/VariablesView.cpp | 93 ++++++++++++--------
----------------------------------------------------------------------------
diff --git a/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp
b/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp
index df0416f..0414f41 100644
--- a/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp
+++ b/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp
@@ -269,6 +269,7 @@ public:
fHidden(false),
fValueChanged(false)
{
+ fVariable->AcquireReference();
fNodeChild->AcquireReference();
}
@@ -282,6 +283,7 @@ public:
child->ReleaseReference();
fNodeChild->ReleaseReference();
+ fVariable->ReleaseReference();
if (fComponentPath != NULL)
fComponentPath->ReleaseReference();
@@ -1516,25 +1518,28 @@
VariablesView::VariableTableModel::AddSyntheticNode(Variable* variable,
ValueNodeContainer* container = fNodeManager->GetContainer();
AutoLocker<ValueNodeContainer> containerLocker(container);
- _child = new(std::nothrow) VariableValueNodeChild(variable);
- if (_child == NULL)
- return B_NO_MEMORY;
-
- BReference<ValueNodeChild> childReference(_child, true);
- ValueNode* valueNode;
status_t error;
- if (_child->IsInternal())
- error = _child->CreateInternalNode(valueNode);
- else {
- error = TypeHandlerRoster::Default()->CreateValueNode(_child,
- _child->GetType(), valueNode);
- }
+ if (_child == NULL) {
+ _child = new(std::nothrow) VariableValueNodeChild(variable);
+ if (_child == NULL)
+ return B_NO_MEMORY;
- if (error != B_OK)
- return error;
+ BReference<ValueNodeChild> childReference(_child, true);
+ ValueNode* valueNode;
+ if (_child->IsInternal())
+ error = _child->CreateInternalNode(valueNode);
+ else {
+ error =
TypeHandlerRoster::Default()->CreateValueNode(_child,
+ _child->GetType(), valueNode);
+ }
+
+ if (error != B_OK)
+ return error;
+
+ _child->SetNode(valueNode);
+ valueNode->ReleaseReference();
+ }
- _child->SetNode(valueNode);
- valueNode->ReleaseReference();
container->AddChild(_child);
error = _AddNode(variable, NULL, _child);
@@ -1551,8 +1556,14 @@
VariablesView::VariableTableModel::AddSyntheticNode(Variable* variable,
fNodeManager->AddChildNodes(_child);
ModelNode* childNode = fNodeTable.Lookup(_child);
- if (childNode != NULL)
- fContainerListener->ModelNodeValueRequested(childNode);
+ if (childNode != NULL) {
+ ValueNode* valueNode = _child->Node();
+ if (valueNode->LocationAndValueResolutionState()
+ == VALUE_NODE_UNRESOLVED) {
+ fContainerListener->ModelNodeValueRequested(childNode);
+ } else
+ ValueNodeValueChanged(valueNode);
+ }
ValueNodeChildrenCreated(_child->Node());
return B_OK;
@@ -2881,13 +2892,6 @@ VariablesView::_AddExpressionNode(ExpressionInfo* info,
status_t result,
BReference<Variable> variableReference;
BVariant valueData;
- Value* primitive = value->PrimitiveValue();
- if (primitive != NULL) {
- if (!primitive->ToVariant(valueData))
- return;
- } else
- valueData.SetTo("Unsupported expression result type.");
-
ExpressionVariableID* id
= new(std::nothrow) ExpressionVariableID(info);
if (id == NULL)
@@ -2895,21 +2899,35 @@ VariablesView::_AddExpressionNode(ExpressionInfo* info,
status_t result,
BReference<ObjectID> idReference(id, true);
Type* type = NULL;
- if (_GetTypeForTypeCode(valueData.Type(), type) != B_OK)
- return;
- BReference<Type> typeReference(type, true);
-
- ValueLocation* location = new(std::nothrow) ValueLocation();
- if (location == NULL)
- return;
- BReference<ValueLocation> locationReference(location, true);
- if (valueData.IsNumber()) {
+ ValueLocation* location = NULL;
+ ValueNodeChild* child = NULL;
+ BReference<Type> typeReference;
+ BReference<ValueLocation> locationReference;
+ if (value->Kind() == EXPRESSION_RESULT_KIND_PRIMITIVE) {
+ value->PrimitiveValue()->ToVariant(valueData);
+ if (_GetTypeForTypeCode(valueData.Type(), type) != B_OK)
+ return;
+ typeReference.SetTo(type, true);
- ValuePieceLocation piece;
- if (!piece.SetToValue(valueData.Bytes(), valueData.Size())
- || !location->AddPiece(piece)) {
+ location = new(std::nothrow) ValueLocation();
+ if (location == NULL)
return;
+ locationReference.SetTo(location, true);
+
+ if (valueData.IsNumber()) {
+
+ ValuePieceLocation piece;
+ if (!piece.SetToValue(valueData.Bytes(),
valueData.Size())
+ || !location->AddPiece(piece)) {
+ return;
+ }
}
+ } else if (value->Kind() == EXPRESSION_RESULT_KIND_VALUE_NODE) {
+ child = value->ValueNodeValue();
+ type = child->GetType();
+ typeReference.SetTo(type);
+ location = child->Location();
+ locationReference.SetTo(location);
}
variable = new(std::nothrow) Variable(id,
@@ -2918,7 +2936,6 @@ VariablesView::_AddExpressionNode(ExpressionInfo* info,
status_t result,
return;
variableReference.SetTo(variable, true);
- ValueNodeChild* child = NULL;
status_t error = fVariableTableModel->AddSyntheticNode(variable, child);
if (error != B_OK)
return;
Other related posts:
- » [haiku-commits] haiku: hrev48362 - src/apps/debugger/user_interface/gui/team_window - anevilyak
