mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 10:16:03 +02:00
Code Issues Wiki Activity

Simple changes for Sonar warnings

Browse source 
Change-Id: I180c828485beccd7944c61a8e58d42b909333a41
This commit is contained in:
Marc Khouzam 2015-08-14 11:15:11 -04:00
parent dc4b8aaf58
commit f8292e1bc4
1 changed files with 169 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

331
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java
View file

@ -338,38 +338,38 @@ public class MIVariableManager implements ICommandControl {
// This is the lock used when we must run multiple // This is the lock used when we must run multiple
// operations at once. This lock should be independent of the // operations at once. This lock should be independent of the
// UPDATING state, which is why we don't make it part of the state // UPDATING state, which is why we don't make it part of the state
private boolean locked = false; private boolean fLocked = false;
// This id is the one used to search for this object in our hash-map // This id is the one used to search for this object in our hash-map
private final VariableObjectId internalId; private final VariableObjectId fInternalId;
/** The raw MI value for this variable object /** The raw MI value for this variable object
* @since 4.6 * @since 4.6
*/ */
private MITuple raw; private MITuple fRaw;
// This is the name of the variable object, as given by GDB (e.g., var1 or var1.public.x) // This is the name of the variable object, as given by GDB (e.g., var1 or var1.public.x)
private String gdbName = null; private String fGdbName = null;
// The current format of this variable object, within GDB // The current format of this variable object, within GDB
private String format = IFormattedValues.NATURAL_FORMAT; private String fFormat = IFormattedValues.NATURAL_FORMAT;
// The full expression that can be used to characterize this object // The full expression that can be used to characterize this object
// plus some other information that shall live longer than the // plus some other information that shall live longer than the
// MIVariableObject. // MIVariableObject.
private ExpressionInfo exprInfo; private ExpressionInfo fExprInfo;
private String type = null; private String fType = null;
private GDBType gdbType; private GDBType fGdbType;
// A hint at the number of children. This value is obtained // A hint at the number of children. This value is obtained
// from -var-create or -var-list-children. It may not be right in the case // from -var-create or -var-list-children. It may not be right in the case
// of C++ structures, where GDB has a level of children for private/public/protected. // of C++ structures, where GDB has a level of children for private/public/protected.
private int numChildrenHint = 0; private int fNumChildrenHint = 0;
private Boolean editable = null; private Boolean fEditable = null;
// The current values of the expression for each format. (null if not known yet) // The current values of the expression for each format. (null if not known yet)
private Map<String, String> valueMap = null; private Map<String, String> fValueMap = null;
// A queue of request monitors waiting for this object to be ready // A queue of request monitors waiting for this object to be ready
private LinkedList<RequestMonitor> operationsPending; private LinkedList<RequestMonitor> fOperationsPending;
// A queue of request monitors that requested an update // A queue of request monitors that requested an update
protected LinkedList<DataRequestMonitor<Boolean>> updatesPending; protected LinkedList<DataRequestMonitor<Boolean>> updatesPending;
@ -379,23 +379,22 @@ public class MIVariableManager implements ICommandControl {
// The children of this variable, if any. // The children of this variable, if any.
// Null means we didn't fetch them yet, while an empty array means no children // Null means we didn't fetch them yet, while an empty array means no children
private ExpressionInfo[] children = null; private ExpressionInfo[] fChildren = null;
// we need to keep track of fake children because they are in the LRU and need to be removed in some cases. // we need to keep track of fake children because they are in the LRU and need to be removed in some cases.
private List<ExpressionInfo> fakeChildren = new ArrayList<ExpressionInfo>(3); private List<ExpressionInfo> fFakeChildren = new ArrayList<>(3);
private boolean hasMore = false; private boolean fHasMore = false;
private MIDisplayHint displayHint = MIDisplayHint.NONE; private MIDisplayHint fDisplayHint = MIDisplayHint.NONE;
// The parent of this variable object within GDB. Null if this object has no parent // The parent of this variable object within GDB. Null if this object has no parent
private MIVariableObject parent = null; private MIVariableObject fParent = null;
// The root parent that must be used to issue -var-update. // The root parent that must be used to issue -var-update.
// If this object is a root, then the rootToUpdate is itself // If this object is a root, then the rootToUpdate is itself
private MIRootVariableObject rootToUpdate = null; private MIRootVariableObject fRootToUpdate = null;
protected boolean outOfScope = false; protected boolean outOfScope = false;
private boolean fetchingChildren = false; private boolean fFetchingChildren = false;
/** /**
* In case of base class variables that are accessed in a derived class * In case of base class variables that are accessed in a derived class
@ -403,7 +402,7 @@ public class MIVariableManager implements ICommandControl {
* We have to use a workaround and apply it to the complete hierarchy of this varObject. * We have to use a workaround and apply it to the complete hierarchy of this varObject.
* Bug 320277 * Bug 320277
*/ */
private boolean hasCastToBaseClassWorkaround = false; private boolean fHasCastToBaseClassWorkaround = false;
public MIVariableObject(VariableObjectId id, MIVariableObject parentObj) { public MIVariableObject(VariableObjectId id, MIVariableObject parentObj) {
this(id, parentObj, false); this(id, parentObj, false);
@ -414,15 +413,15 @@ public class MIVariableManager implements ICommandControl {
boolean needsCreation) { boolean needsCreation) {
currentState = needsCreation ? STATE_NOT_CREATED : STATE_READY; currentState = needsCreation ? STATE_NOT_CREATED : STATE_READY;
operationsPending = new LinkedList<RequestMonitor>(); fOperationsPending = new LinkedList<>();
updatesPending = new LinkedList<DataRequestMonitor<Boolean>>(); updatesPending = new LinkedList<>();
fetchChildrenPending = new LinkedList<DataRequestMonitor<ChildrenInfo>>(); fetchChildrenPending = new LinkedList<>();
internalId = id; fInternalId = id;
setParent(parentObj); setParent(parentObj);
// No values are available yet // No values are available yet
valueMap = new HashMap<String, String>(); fValueMap = new HashMap<>();
resetValues(); resetValues();
} }
@ -433,21 +432,21 @@ public class MIVariableManager implements ICommandControl {
* be represented as fields or methods in this class. * be represented as fields or methods in this class.
* @since 4.7 * @since 4.7
*/ */
public MITuple getRawFields() { return raw; } public MITuple getRawFields() { return fRaw; }
public VariableObjectId getInternalId() { return internalId; } public VariableObjectId getInternalId() { return fInternalId; }
public String getGdbName() { return gdbName; } public String getGdbName() { return fGdbName; }
public String getCurrentFormat() { return format; } public String getCurrentFormat() { return fFormat; }
public MIVariableObject getParent() { return parent; } public MIVariableObject getParent() { return fParent; }
public MIRootVariableObject getRootToUpdate() { return rootToUpdate; } public MIRootVariableObject getRootToUpdate() { return fRootToUpdate; }
public String getExpression() { return exprInfo.getFullExpr(); } public String getExpression() { return fExprInfo.getFullExpr(); }
public String getType() { return type; } public String getType() { return fType; }
/** /**
* @since 4.0 * @since 4.0
*/ */
public ExpressionInfo getExpressionInfo() { return exprInfo; } public ExpressionInfo getExpressionInfo() { return fExprInfo; }
/** /**
* @return <code>true</code> if value and children of this varobj are * @return <code>true</code> if value and children of this varobj are
@ -455,7 +454,7 @@ public class MIVariableManager implements ICommandControl {
* *
* @since 4.0 * @since 4.0
*/ */
public boolean isDynamic() { return exprInfo.isDynamic(); } public boolean isDynamic() { return fExprInfo.isDynamic(); }
/** /**
* @return For dynamic varobjs ({@link #isDynamic() returns true}) this * @return For dynamic varobjs ({@link #isDynamic() returns true}) this
@ -465,18 +464,18 @@ public class MIVariableManager implements ICommandControl {
* *
* @since 4.0 * @since 4.0
*/ */
public boolean hasMore() { return hasMore; } public boolean hasMore() { return fHasMore; }
/** /**
* @since 4.0 * @since 4.0
*/ */
public MIDisplayHint getDisplayHint() { return displayHint; }; public MIDisplayHint getDisplayHint() { return fDisplayHint; };
/** /**
* @since 4.3 * @since 4.3
*/ */
public void setDisplayHint(MIDisplayHint displayHint) { public void setDisplayHint(MIDisplayHint displayHint) {
this.displayHint = displayHint; this.fDisplayHint = displayHint;
}; };
/** /**
@ -485,7 +484,7 @@ public class MIVariableManager implements ICommandControl {
public boolean hasChildren() { return (getNumChildrenHint() != 0 || hasMore()); } public boolean hasChildren() { return (getNumChildrenHint() != 0 || hasMore()); }
/** @since 3.0 */ /** @since 3.0 */
public GDBType getGDBType() { return gdbType; } public GDBType getGDBType() { return fGdbType; }
/** /**
* Returns a hint to the number of children. This hint is often correct, * Returns a hint to the number of children. This hint is often correct,
* except when we are dealing with C++ complex structures where * except when we are dealing with C++ complex structures where
@ -495,10 +494,10 @@ public class MIVariableManager implements ICommandControl {
* hint can be trusted. * hint can be trusted.
* *
* Note that a hint of 0 children can always be trusted, except for * Note that a hint of 0 children can always be trusted, except for
* <code>{@link #hasMore} == true</code>. * <code>{@link #fHasMore} == true</code>.
* *
* @since 3.0 */ * @since 3.0 */
public int getNumChildrenHint() { return numChildrenHint; } public int getNumChildrenHint() { return fNumChildrenHint; }
/** /**
* Returns whether the number of children hint can be * Returns whether the number of children hint can be
* trusted for this variable object. * trusted for this variable object.
@ -519,10 +518,9 @@ public class MIVariableManager implements ICommandControl {
return ((getNumChildrenHint() == 0 && ! hasMore()) || isArray()); return ((getNumChildrenHint() == 0 && ! hasMore()) || isArray());
} }
public String getValue(String format) { return valueMap.get(format); } public String getValue(String format) { return fValueMap.get(format); }
public ExpressionInfo[] getChildren() { return children; }
public ExpressionInfo[] getChildren() { return fChildren; }
public boolean isArray() { return (getGDBType() == null) ? false : getGDBType().getType() == GDBType.ARRAY; } public boolean isArray() { return (getGDBType() == null) ? false : getGDBType().getType() == GDBType.ARRAY; }
public boolean isPointer() { return (getGDBType() == null) ? false : getGDBType().getType() == GDBType.POINTER; } public boolean isPointer() { return (getGDBType() == null) ? false : getGDBType().getType() == GDBType.POINTER; }
@ -567,8 +565,8 @@ public class MIVariableManager implements ICommandControl {
return !isDynamic() || isDynamicButSafe; return !isDynamic() || isDynamicButSafe;
} }
public void setGdbName(String n) { gdbName = n; } public void setGdbName(String n) { fGdbName = n; }
public void setCurrentFormat(String f) { format = f; } public void setCurrentFormat(String f) { fFormat = f; }
/** /**
* @param fullExpression * @param fullExpression
@ -596,21 +594,21 @@ public class MIVariableManager implements ICommandControl {
* @since 4.0 * @since 4.0
*/ */
public void setExpressionData(ExpressionInfo info, String typeName, int num, boolean hasMore) { public void setExpressionData(ExpressionInfo info, String typeName, int num, boolean hasMore) {
exprInfo = info; fExprInfo = info;
setType(typeName); setType(typeName);
numChildrenHint = num; fNumChildrenHint = num;
this.hasMore = hasMore; this.fHasMore = hasMore;
} }
/** /**
* @since 4.1 * @since 4.1
*/ */
public void setType(String newTypeName) { public void setType(String newTypeName) {
type = newTypeName; fType = newTypeName;
gdbType = getGDBTypeParser().parse(newTypeName); fGdbType = getGDBTypeParser().parse(newTypeName);
} }
public void setValue(String format, String val) { valueMap.put(format, val); } public void setValue(String format, String val) { fValueMap.put(format, val); }
public void resetValues(String valueInCurrentFormat) { public void resetValues(String valueInCurrentFormat) {
resetValues(); resetValues();
@ -618,11 +616,11 @@ public class MIVariableManager implements ICommandControl {
} }
public void resetValues() { public void resetValues() {
valueMap.put(IFormattedValues.NATURAL_FORMAT, null); fValueMap.put(IFormattedValues.NATURAL_FORMAT, null);
valueMap.put(IFormattedValues.BINARY_FORMAT, null); fValueMap.put(IFormattedValues.BINARY_FORMAT, null);
valueMap.put(IFormattedValues.HEX_FORMAT, null); fValueMap.put(IFormattedValues.HEX_FORMAT, null);
valueMap.put(IFormattedValues.OCTAL_FORMAT, null); fValueMap.put(IFormattedValues.OCTAL_FORMAT, null);
valueMap.put(IFormattedValues.DECIMAL_FORMAT, null); fValueMap.put(IFormattedValues.DECIMAL_FORMAT, null);
} }
/** /**
@ -631,13 +629,13 @@ public class MIVariableManager implements ICommandControl {
* children anew. * children anew.
*/ */
public void setChildren(ExpressionInfo[] c) { public void setChildren(ExpressionInfo[] c) {
children = c; fChildren = c;
if (children != null) { if (fChildren != null) {
numChildrenHint = children.length; fNumChildrenHint = fChildren.length;
} }
if (children != null) { if (fChildren != null) {
for (ExpressionInfo child : children) { for (ExpressionInfo child : fChildren) {
assert (child != null); assert (child != null);
} }
} }
@ -649,21 +647,21 @@ public class MIVariableManager implements ICommandControl {
* @since 4.0 * @since 4.0
*/ */
public void addChildren(ExpressionInfo[] newChildren) { public void addChildren(ExpressionInfo[] newChildren) {
if (children == null) { if (fChildren == null) {
children = new ExpressionInfo[newChildren.length]; fChildren = new ExpressionInfo[newChildren.length];
System.arraycopy(newChildren, 0, children, 0, newChildren.length); System.arraycopy(newChildren, 0, fChildren, 0, newChildren.length);
} else { } else {
ExpressionInfo[] oldChildren = children; ExpressionInfo[] oldChildren = fChildren;
children = new ExpressionInfo[children.length + newChildren.length]; fChildren = new ExpressionInfo[fChildren.length + newChildren.length];
System.arraycopy(oldChildren, 0, children, 0, oldChildren.length); System.arraycopy(oldChildren, 0, fChildren, 0, oldChildren.length);
System.arraycopy(newChildren, 0, children, oldChildren.length, newChildren.length); System.arraycopy(newChildren, 0, fChildren, oldChildren.length, newChildren.length);
} }
numChildrenHint = children.length; fNumChildrenHint = fChildren.length;
for (ExpressionInfo child : children) { for (ExpressionInfo child : fChildren) {
assert (child != null); assert (child != null);
} }
} }
@ -697,10 +695,10 @@ public class MIVariableManager implements ICommandControl {
* @since 4.0 * @since 4.0
*/ */
public void shrinkChildrenTo(int newNumChildren) { public void shrinkChildrenTo(int newNumChildren) {
if (children != null) { if (fChildren != null) {
ExpressionInfo[] oldChildren = children; ExpressionInfo[] oldChildren = fChildren;
for (int i = oldChildren.length - 1; i >= newNumChildren; --i) { for (int i = oldChildren.length - 1; i >= newNumChildren; --i) {
String childFullExpression = children[i].getFullExpr(); String childFullExpression = fChildren[i].getFullExpr();
VariableObjectId childId = new VariableObjectId(); VariableObjectId childId = new VariableObjectId();
childId.generateId(childFullExpression, getInternalId()); childId.generateId(childFullExpression, getInternalId());
@ -708,11 +706,11 @@ public class MIVariableManager implements ICommandControl {
} }
children = new ExpressionInfo[newNumChildren]; fChildren = new ExpressionInfo[newNumChildren];
System.arraycopy(oldChildren, 0, children, 0, newNumChildren); System.arraycopy(oldChildren, 0, fChildren, 0, newNumChildren);
} }
numChildrenHint = newNumChildren; fNumChildrenHint = newNumChildren;
} }
/** /**
@ -742,27 +740,27 @@ public class MIVariableManager implements ICommandControl {
* @since 4.1 * @since 4.1
*/ */
public void cleanupChildren() { public void cleanupChildren() {
hasMore = false; fHasMore = false;
if (children != null) { if (fChildren != null) {
for (ExpressionInfo child : children) { for (ExpressionInfo child : fChildren) {
cleanupChild(child); cleanupChild(child);
} }
children = null; fChildren = null;
numChildrenHint = 0; fNumChildrenHint = 0;
} }
for (ExpressionInfo fakeChild : fakeChildren) { for (ExpressionInfo fakeChild : fFakeChildren) {
cleanupChild(fakeChild); cleanupChild(fakeChild);
} }
fakeChildren.clear(); fFakeChildren.clear();
} }
public void setParent(MIVariableObject p) { public void setParent(MIVariableObject p) {
parent = p; fParent = p;
if (p == null) { if (p == null) {
rootToUpdate = (this instanceof MIRootVariableObject) ? (MIRootVariableObject) this fRootToUpdate = (this instanceof MIRootVariableObject) ? (MIRootVariableObject) this
: null; : null;
} else { } else {
rootToUpdate = p.getRootToUpdate(); fRootToUpdate = p.getRootToUpdate();
} }
} }
@ -771,14 +769,14 @@ public class MIVariableManager implements ICommandControl {
} }
private void lock() { private void lock() {
locked = true; fLocked = true;
} }
private void unlock() { private void unlock() {
locked = false; fLocked = false;
while (!operationsPending.isEmpty()) { while (!fOperationsPending.isEmpty()) {
operationsPending.poll().done(); fOperationsPending.poll().done();
} }
} }
@ -878,20 +876,20 @@ public class MIVariableManager implements ICommandControl {
if (update.isChanged()) { if (update.isChanged()) {
setType(update.getNewType()); setType(update.getNewType());
cleanupChildren(); cleanupChildren();
editable = null; fEditable = null;
updateLimit(IMIExpressions.CHILD_COUNT_LIMIT_UNSPECIFIED); updateLimit(IMIExpressions.CHILD_COUNT_LIMIT_UNSPECIFIED);
} }
// These properties of the variable will probably not change, // These properties of the variable will probably not change,
// but if they are - we should handle it properly. // but if they are - we should handle it properly.
setDisplayHint(update.getDisplayHint()); setDisplayHint(update.getDisplayHint());
exprInfo.setDynamic(update.isDynamic()); fExprInfo.setDynamic(update.isDynamic());
MIVar[] newChildren = update.getNewChildren(); MIVar[] newChildren = update.getNewChildren();
// children == null means fetchChildren will happen later, so // children == null means fetchChildren will happen later, so
// don't try to create a sparsely filled children array here. // don't try to create a sparsely filled children array here.
final boolean addNewChildren = (children != null); final boolean addNewChildren = (fChildren != null);
final ExpressionInfo[] addedChildren = (addNewChildren && (newChildren != null)) ? new ExpressionInfo[newChildren.length] final ExpressionInfo[] addedChildren = (addNewChildren && (newChildren != null)) ? new ExpressionInfo[newChildren.length]
: null; : null;
@ -905,14 +903,14 @@ public class MIVariableManager implements ICommandControl {
rm.setStatus(getStatus()); rm.setStatus(getStatus());
} else { } else {
if (update.numChildrenChanged()) { if (update.numChildrenChanged()) {
if (children != null) { if (fChildren != null) {
// Remove those children that don't exist any longer. // Remove those children that don't exist any longer.
if (children.length > update.getNewNumChildren()) { if (fChildren.length > update.getNewNumChildren()) {
shrinkChildrenTo(update.getNewNumChildren()); shrinkChildrenTo(update.getNewNumChildren());
} }
} else { } else {
// Just update the child count. // Just update the child count.
numChildrenHint = update.getNewNumChildren(); fNumChildrenHint = update.getNewNumChildren();
} }
// Add the new children. // Add the new children.
@ -921,15 +919,15 @@ public class MIVariableManager implements ICommandControl {
} }
} }
assert((children == null) || (children.length == numChildrenHint)); assert((fChildren == null) || (fChildren.length == fNumChildrenHint));
hasMore = update.hasMore(); fHasMore = update.hasMore();
// If there was no -var-list-children yet for a varobj, // If there was no -var-list-children yet for a varobj,
// the new children will not be reported by -var-update. // the new children will not be reported by -var-update.
// Set the children to null such that the next time children // Set the children to null such that the next time children
// are requested, they will be fetched. // are requested, they will be fetched.
if (hasMore() && (numChildrenHint == 0)) { if (hasMore() && (fNumChildrenHint == 0)) {
setChildren(null); setChildren(null);
} }
@ -988,7 +986,7 @@ public class MIVariableManager implements ICommandControl {
protected void handleCompleted() { protected void handleCompleted() {
if (isSuccess()) { if (isSuccess()) {
if (addNewChildren && addedChildren != null) { if (addNewChildren && addedChildren != null) {
addedChildren[insertPosition] = monitoredVar.exprInfo; addedChildren[insertPosition] = monitoredVar.fExprInfo;
} }
} else { } else {
// Create a fresh MIVariableObject for this child, using // Create a fresh MIVariableObject for this child, using
@ -996,7 +994,7 @@ public class MIVariableManager implements ICommandControl {
MIVariableObject newVar = createChild(childId, childFullExpression, MIVariableObject newVar = createChild(childId, childFullExpression,
indexInParent, newChild); indexInParent, newChild);
if (addNewChildren && addedChildren != null) { if (addNewChildren && addedChildren != null) {
addedChildren[insertPosition] = newVar.exprInfo; addedChildren[insertPosition] = newVar.fExprInfo;
} }
} }
@ -1029,7 +1027,7 @@ public class MIVariableManager implements ICommandControl {
// the new varobj provided by -var-update. // the new varobj provided by -var-update.
childVar = createChild(childId, childFullExpression, i, newChild); childVar = createChild(childId, childFullExpression, i, newChild);
if (addNewChildren && addedChildren != null) { if (addNewChildren && addedChildren != null) {
addedChildren[arrayPosition] = childVar.exprInfo; addedChildren[arrayPosition] = childVar.fExprInfo;
} }
} }
@ -1056,12 +1054,12 @@ public class MIVariableManager implements ICommandControl {
* The data request monitor that will hold the value returned * The data request monitor that will hold the value returned
*/ */
private void getAttributes(final DataRequestMonitor<Boolean> rm) { private void getAttributes(final DataRequestMonitor<Boolean> rm) {
if (editable != null) { if (fEditable != null) {
rm.setData(editable); rm.setData(fEditable);
rm.done(); rm.done();
} else if (isComplex()) { } else if (isComplex()) {
editable = false; fEditable = false;
rm.setData(editable); rm.setData(fEditable);
rm.done(); rm.done();
} else { } else {
fCommandControl.queueCommand( fCommandControl.queueCommand(
@ -1069,9 +1067,9 @@ public class MIVariableManager implements ICommandControl {
new DataRequestMonitor<MIVarShowAttributesInfo>(fSession.getExecutor(), rm) { new DataRequestMonitor<MIVarShowAttributesInfo>(fSession.getExecutor(), rm) {
@Override @Override
protected void handleSuccess() { protected void handleSuccess() {
editable = getData().isEditable(); fEditable = getData().isEditable();
rm.setData(editable); rm.setData(fEditable);
rm.done(); rm.done();
} }
}); });
@ -1128,8 +1126,8 @@ public class MIVariableManager implements ICommandControl {
return; return;
} }
if (locked) { if (fLocked) {
operationsPending.add(new RequestMonitor(fSession.getExecutor(), rm) { fOperationsPending.add(new RequestMonitor(fSession.getExecutor(), rm) {
@Override @Override
protected void handleSuccess() { protected void handleSuccess() {
getValue(dmc, rm); getValue(dmc, rm);
@ -1249,7 +1247,7 @@ public class MIVariableManager implements ICommandControl {
private void getChildren(final IExpressionDMContext exprDmc, private void getChildren(final IExpressionDMContext exprDmc,
final int clientNumChildrenLimit, final DataRequestMonitor<ChildrenInfo> rm) { final int clientNumChildrenLimit, final DataRequestMonitor<ChildrenInfo> rm) {
if (fetchingChildren) { if (fFetchingChildren) {
// Only one request monitor can fetch children at a time. // Only one request monitor can fetch children at a time.
fetchChildrenPending.add(new DataRequestMonitor<ChildrenInfo>(fSession.getExecutor(), rm) { fetchChildrenPending.add(new DataRequestMonitor<ChildrenInfo>(fSession.getExecutor(), rm) {
@ -1270,13 +1268,13 @@ public class MIVariableManager implements ICommandControl {
}); });
} else { } else {
fetchingChildren = true; fFetchingChildren = true;
fetchChildren(exprDmc, clientNumChildrenLimit, new DataRequestMonitor<ChildrenInfo>(fSession.getExecutor(), rm) { fetchChildren(exprDmc, clientNumChildrenLimit, new DataRequestMonitor<ChildrenInfo>(fSession.getExecutor(), rm) {
@Override @Override
protected void handleCompleted() { protected void handleCompleted() {
fetchingChildren = false; fFetchingChildren = false;
if (isSuccess()) { if (isSuccess()) {
rm.setData(getData()); rm.setData(getData());
@ -1326,7 +1324,7 @@ public class MIVariableManager implements ICommandControl {
// If we already know the children, no need to go to the back-end // If we already know the children, no need to go to the back-end
ExpressionInfo[] childrenArray = getChildren(); ExpressionInfo[] childrenArray = getChildren();
if (childrenArray != null && ! addChildren) { if (childrenArray != null && ! addChildren) {
rm.setData(new ChildrenInfo(childrenArray, hasMore)); rm.setData(new ChildrenInfo(childrenArray, fHasMore));
rm.done(); rm.done();
return; return;
} }
@ -1335,7 +1333,7 @@ public class MIVariableManager implements ICommandControl {
if (! hasChildren()) { if (! hasChildren()) {
// First store the empty list, for the next time // First store the empty list, for the next time
setChildren(new ExpressionInfo[0]); setChildren(new ExpressionInfo[0]);
rm.setData(new ChildrenInfo(getChildren(), hasMore)); rm.setData(new ChildrenInfo(getChildren(), fHasMore));
rm.done(); rm.done();
return; return;
} }
@ -1369,13 +1367,13 @@ public class MIVariableManager implements ICommandControl {
relExpr = relExpr + "[" + (castingIndex + i) + "]";//$NON-NLS-1$//$NON-NLS-2$ relExpr = relExpr + "[" + (castingIndex + i) + "]";//$NON-NLS-1$//$NON-NLS-2$
childrenOfArray[i] = new ExpressionInfo(fullExpr, relExpr, false, exprInfo, i); childrenOfArray[i] = new ExpressionInfo(fullExpr, relExpr, false, fExprInfo, i);
} }
// First store these children, for the next time // First store these children, for the next time
setChildren(childrenOfArray); setChildren(childrenOfArray);
hasMore = false; fHasMore = false;
rm.setData(new ChildrenInfo(getChildren(), hasMore)); rm.setData(new ChildrenInfo(getChildren(), fHasMore));
rm.done(); rm.done();
return; return;
} }
@ -1385,8 +1383,8 @@ public class MIVariableManager implements ICommandControl {
// be called here with a fully created object. // be called here with a fully created object.
// Also no need to lock the object, since getting the children won't affect other operations // Also no need to lock the object, since getting the children won't affect other operations
final int from = (addChildren && (children != null)) ? getNumChildrenHint() : 0; final int from = (addChildren && (fChildren != null)) ? getNumChildrenHint() : 0;
final int to = Math.max(newNumChildrenLimit, exprInfo.getChildCountLimit()); final int to = Math.max(newNumChildrenLimit, fExprInfo.getChildCountLimit());
ICommand<MIVarListChildrenInfo> varListChildren = isSafeToAskForAllChildren() ? ICommand<MIVarListChildrenInfo> varListChildren = isSafeToAskForAllChildren() ?
fCommandFactory.createMIVarListChildren(getRootToUpdate().getControlDMContext(), getGdbName()) fCommandFactory.createMIVarListChildren(getRootToUpdate().getControlDMContext(), getGdbName())
@ -1412,8 +1410,8 @@ public class MIVariableManager implements ICommandControl {
protected void handleSuccess() { protected void handleSuccess() {
// Store the children in our variable object cache // Store the children in our variable object cache
addChildren(realChildren); addChildren(realChildren);
hasMore = localHasMore; fHasMore = localHasMore;
rm.setData(new ChildrenInfo(getChildren(), hasMore)); rm.setData(new ChildrenInfo(getChildren(), fHasMore));
int updateLimit = updateLimit(to); int updateLimit = updateLimit(to);
@ -1472,7 +1470,7 @@ public class MIVariableManager implements ICommandControl {
public String getChildPath() { return childFullExpression; } public String getChildPath() { return childFullExpression; }
public boolean getChildHasCastToBaseClassWorkaround() { return childHasCastToBaseClassWorkaround; } public boolean getChildHasCastToBaseClassWorkaround() { return childHasCastToBaseClassWorkaround; }
}; }
final DataRequestMonitor<ChildFullExpressionInfo> childPathRm = final DataRequestMonitor<ChildFullExpressionInfo> childPathRm =
new DataRequestMonitor<ChildFullExpressionInfo>(fSession.getExecutor(), countingRm) { new DataRequestMonitor<ChildFullExpressionInfo>(fSession.getExecutor(), countingRm) {
@ -1484,7 +1482,7 @@ public class MIVariableManager implements ICommandControl {
// 1- if its parent was set (which is the current varObj) // 1- if its parent was set (which is the current varObj)
// 2- if the workaround was used for the child itself, which is part of ChildFullExpressionInfo // 2- if the workaround was used for the child itself, which is part of ChildFullExpressionInfo
final boolean childHasCastToBaseClassWorkaround = final boolean childHasCastToBaseClassWorkaround =
hasCastToBaseClassWorkaround || getData().getChildHasCastToBaseClassWorkaround(); fHasCastToBaseClassWorkaround || getData().getChildHasCastToBaseClassWorkaround();
// For children that do not map to a real expression (such as f.public) // For children that do not map to a real expression (such as f.public)
// GDB returns an empty string. In this case, we can use another unique // GDB returns an empty string. In this case, we can use another unique
@ -1525,17 +1523,17 @@ public class MIVariableManager implements ICommandControl {
var = createChild(childId, childFullExpression, indexInParent, child); var = createChild(childId, childFullExpression, indexInParent, child);
} }
var.hasCastToBaseClassWorkaround = childHasCastToBaseClassWorkaround; var.fHasCastToBaseClassWorkaround = childHasCastToBaseClassWorkaround;
if (fakeChild) { if (fakeChild) {
if (! isSuccess()) { if (! isSuccess()) {
fakeChildren.add(var.exprInfo); fFakeChildren.add(var.fExprInfo);
} }
addRealChildrenOfFake(var, exprDmc, realChildren, addRealChildrenOfFake(var, exprDmc, realChildren,
arrayPosition, countingRm); arrayPosition, countingRm);
} else { } else {
// This is a real child // This is a real child
realChildren[arrayPosition] = new ExpressionInfo[] { var.exprInfo }; realChildren[arrayPosition] = new ExpressionInfo[] { var.fExprInfo };
countingRm.done(); countingRm.done();
} }
} }
@ -1554,7 +1552,7 @@ public class MIVariableManager implements ICommandControl {
childVar = null; childVar = null;
} else { } else {
// The child already exists so we can re-use it. // The child already exists so we can re-use it.
childVar.hasCastToBaseClassWorkaround = childHasCastToBaseClassWorkaround; childVar.fHasCastToBaseClassWorkaround = childHasCastToBaseClassWorkaround;
if (fakeChild) { if (fakeChild) {
// I don't think this should happen, but we put it just in case // I don't think this should happen, but we put it just in case
addRealChildrenOfFake(childVar, exprDmc, realChildren, addRealChildrenOfFake(childVar, exprDmc, realChildren,
@ -1579,15 +1577,15 @@ public class MIVariableManager implements ICommandControl {
if (childVar == null) { if (childVar == null) {
childVar = createChild(childId, childFullExpression, indexInParent, child); childVar = createChild(childId, childFullExpression, indexInParent, child);
childVar.hasCastToBaseClassWorkaround = childHasCastToBaseClassWorkaround; childVar.fHasCastToBaseClassWorkaround = childHasCastToBaseClassWorkaround;
if (fakeChild) { if (fakeChild) {
fakeChildren.add(childVar.exprInfo); fFakeChildren.add(childVar.fExprInfo);
addRealChildrenOfFake(childVar, exprDmc, realChildren, addRealChildrenOfFake(childVar, exprDmc, realChildren,
arrayPosition, countingRm); arrayPosition, countingRm);
} else { } else {
// This is a real child // This is a real child
realChildren[arrayPosition] = new ExpressionInfo[] { childVar.exprInfo }; realChildren[arrayPosition] = new ExpressionInfo[] { childVar.fExprInfo };
countingRm.done(); countingRm.done();
} }
} }
@ -1600,13 +1598,13 @@ public class MIVariableManager implements ICommandControl {
// to call -var-info-path-expression for real, but just pretend we did. // to call -var-info-path-expression for real, but just pretend we did.
childPathRm.setData(new ChildFullExpressionInfo("")); //$NON-NLS-1$ childPathRm.setData(new ChildFullExpressionInfo("")); //$NON-NLS-1$
childPathRm.done(); childPathRm.done();
} else if (isDynamic() || exprInfo.hasDynamicAncestor()) { } else if (isDynamic() || fExprInfo.hasDynamicAncestor()) {
// Equivalent to (which can't be implemented): child.hasDynamicAncestor // Equivalent to (which can't be implemented): child.hasDynamicAncestor
// The new child has a dynamic ancestor. Such children don't support // The new child has a dynamic ancestor. Such children don't support
// var-info-path-expression. Build the expression ourselves. // var-info-path-expression. Build the expression ourselves.
childPathRm.setData(new ChildFullExpressionInfo(buildChildExpression(exprDmc.getExpression(), child.getExp()))); childPathRm.setData(new ChildFullExpressionInfo(buildChildExpression(exprDmc.getExpression(), child.getExp())));
childPathRm.done(); childPathRm.done();
} else if (hasCastToBaseClassWorkaround) { } else if (fHasCastToBaseClassWorkaround) {
// We had to use the "CastToBaseClass" workaround in the hierarchy, so we // We had to use the "CastToBaseClass" workaround in the hierarchy, so we
// know -var-info-path-expression won't work in this case. We have to // know -var-info-path-expression won't work in this case. We have to
// build the expression ourselves again to keep the workaround as part // build the expression ourselves again to keep the workaround as part
@ -1700,7 +1698,7 @@ public class MIVariableManager implements ICommandControl {
MIVariableObject var = createVariableObject(childId, this); MIVariableObject var = createVariableObject(childId, this);
ExpressionInfo childInfo = new ExpressionInfo(childFullExpression, ExpressionInfo childInfo = new ExpressionInfo(childFullExpression,
childData.getExp(), childData.isDynamic(), exprInfo, childData.getExp(), childData.isDynamic(), fExprInfo,
indexInParent); indexInParent);
var.initFrom(childData, childInfo); var.initFrom(childData, childInfo);
@ -1716,7 +1714,7 @@ public class MIVariableManager implements ICommandControl {
*/ */
protected boolean requiresAdditionalChildren(int clientLimit) { protected boolean requiresAdditionalChildren(int clientLimit) {
return !isSafeToAskForAllChildren() return !isSafeToAskForAllChildren()
&& (exprInfo.getChildCountLimit() < calculateNewLimit(clientLimit)); && (fExprInfo.getChildCountLimit() < calculateNewLimit(clientLimit));
} }
/** /**
@ -1728,12 +1726,12 @@ public class MIVariableManager implements ICommandControl {
* @since 4.0 * @since 4.0
*/ */
protected int updateLimit(int newLimit) { protected int updateLimit(int newLimit) {
exprInfo.setChildCountLimit(calculateNewLimit(newLimit)); fExprInfo.setChildCountLimit(calculateNewLimit(newLimit));
return exprInfo.getChildCountLimit(); return fExprInfo.getChildCountLimit();
} }
private int calculateNewLimit(int clientLimit) { private int calculateNewLimit(int clientLimit) {
int limit = exprInfo.getChildCountLimit(); int limit = fExprInfo.getChildCountLimit();
if (!isSafeToAskForAllChildren() && clientLimit != IMIExpressions.CHILD_COUNT_LIMIT_UNSPECIFIED) { if (!isSafeToAskForAllChildren() && clientLimit != IMIExpressions.CHILD_COUNT_LIMIT_UNSPECIFIED) {
if (limit == IMIExpressions.CHILD_COUNT_LIMIT_UNSPECIFIED) { if (limit == IMIExpressions.CHILD_COUNT_LIMIT_UNSPECIFIED) {
@ -1762,7 +1760,7 @@ public class MIVariableManager implements ICommandControl {
final RequestMonitor rm) { final RequestMonitor rm) {
MIExpressionDMC fakeExprCtx = createExpressionCtx(frameCtxProvider, MIExpressionDMC fakeExprCtx = createExpressionCtx(frameCtxProvider,
fakeChild.exprInfo); fakeChild.fExprInfo);
// This is just a qualifier level of C++, and we must get the // This is just a qualifier level of C++, and we must get the
// children of this child to get the real children // children of this child to get the real children
@ -1826,14 +1824,14 @@ public class MIVariableManager implements ICommandControl {
// If the current varObj is a fake object, we obtain the proper parent // If the current varObj is a fake object, we obtain the proper parent
// expression from the parent of the varObj. // expression from the parent of the varObj.
if (isAccessQualifier(exprInfo.getRelExpr())) { if (isAccessQualifier(fExprInfo.getRelExpr())) {
parentExp = getParent().getExpression(); parentExp = getParent().getExpression();
} }
// For pointers, the child expression is already contained in the parent, // For pointers, the child expression is already contained in the parent,
// so we must simply prefix with * // so we must simply prefix with *
// See Bug219179 for more information. // See Bug219179 for more information.
if (!isDynamic() && !exprInfo.hasDynamicAncestor() && isPointer()) { if (!isDynamic() && !fExprInfo.hasDynamicAncestor() && isPointer()) {
childFullExpression = "*("+parentExp+")"; //$NON-NLS-1$//$NON-NLS-2$ childFullExpression = "*("+parentExp+")"; //$NON-NLS-1$//$NON-NLS-2$
} else { } else {
// We must surround the parentExp with parentheses because it // We must surround the parentExp with parentheses because it
@ -1916,14 +1914,20 @@ public class MIVariableManager implements ICommandControl {
// we need to know the type of the variable, which we don't have yet. // we need to know the type of the variable, which we don't have yet.
if (formatId.equals(IFormattedValues.HEX_FORMAT)) { if (formatId.equals(IFormattedValues.HEX_FORMAT)) {
if (!value.startsWith("0x")) value = "0x" + value; //$NON-NLS-1$ //$NON-NLS-2$ if (!value.startsWith("0x")) { //$NON-NLS-1$
value = "0x" + value; //$NON-NLS-1$
}
} }
else if (formatId.equals(IFormattedValues.OCTAL_FORMAT)) { else if (formatId.equals(IFormattedValues.OCTAL_FORMAT)) {
if (!value.startsWith("0")) value = "0" + value; //$NON-NLS-1$ //$NON-NLS-2$ if (!value.startsWith("0")) { //$NON-NLS-1$
value = "0" + value; //$NON-NLS-1$
}
} }
else if (formatId.equals(IFormattedValues.BINARY_FORMAT)) { else if (formatId.equals(IFormattedValues.BINARY_FORMAT)) {
// convert from binary to decimal // convert from binary to decimal
if (value.startsWith("0b")) value = value.substring(2, value.length()); //$NON-NLS-1$ if (value.startsWith("0b")) { //$NON-NLS-1$
value = value.substring(2, value.length());
}
try { try {
value = new BigInteger(value, 2).toString(); value = new BigInteger(value, 2).toString();
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
@ -1992,7 +1996,9 @@ public class MIVariableManager implements ICommandControl {
* a -var-update MI command. * a -var-update MI command.
*/ */
public boolean isModifiable() { public boolean isModifiable() {
if (!isComplex() || isDynamic()) return true; if (!isComplex() || isDynamic()) {
return true;
}
return false; return false;
} }
@ -2027,12 +2033,12 @@ public class MIVariableManager implements ICommandControl {
initFrom(miVar, localExprInfo); initFrom(miVar, localExprInfo);
if (exprInfo.isDynamic() if (fExprInfo.isDynamic()
&& (exprInfo.getChildCountLimit() != IMIExpressions.CHILD_COUNT_LIMIT_UNSPECIFIED)) { && (fExprInfo.getChildCountLimit() != IMIExpressions.CHILD_COUNT_LIMIT_UNSPECIFIED)) {
// Restore the original update range. // Restore the original update range.
fCommandControl.queueCommand(fCommandFactory.createMIVarSetUpdateRange( fCommandControl.queueCommand(fCommandFactory.createMIVarSetUpdateRange(
getRootToUpdate().getControlDMContext(), getRootToUpdate().getControlDMContext(),
getGdbName(), 0, exprInfo.getChildCountLimit()), getGdbName(), 0, fExprInfo.getChildCountLimit()),
new DataRequestMonitor<MIInfo>(fSession.getExecutor(), rm)); new DataRequestMonitor<MIInfo>(fSession.getExecutor(), rm));
} else { } else {
rm.done(); rm.done();
@ -2057,7 +2063,7 @@ public class MIVariableManager implements ICommandControl {
|| (miVar.isDynamic() && (miVar.getNumChild() == 0)); || (miVar.isDynamic() && (miVar.getNumChild() == 0));
assert miVar.getRawFields() != null; assert miVar.getRawFields() != null;
raw = miVar.getRawFields(); fRaw = miVar.getRawFields();
setGdbName(miVar.getVarName()); setGdbName(miVar.getVarName());
setDisplayHint(miVar.getDisplayHint()); setDisplayHint(miVar.getDisplayHint());
@ -2247,7 +2253,7 @@ public class MIVariableManager implements ICommandControl {
// Object is not fully created or is being updated // Object is not fully created or is being updated
// so add RequestMonitor to pending queue // so add RequestMonitor to pending queue
updatesPending.add(rm); updatesPending.add(rm);
} else if (getOutOfDate() == false) { } else if (!getOutOfDate()) {
rm.setData(false); rm.setData(false);
rm.done(); rm.done();
} else { } else {
@ -2278,7 +2284,7 @@ public class MIVariableManager implements ICommandControl {
setOutOfDate(false); setOutOfDate(false);
MIVarChange[] changes = getData().getMIVarChanges(); MIVarChange[] changes = getData().getMIVarChanges();
if (changes.length > 0 && changes[0].isInScope() == false) { if (changes.length > 0 && !changes[0].isInScope()) {
// Object is out-of-scope // Object is out-of-scope
currentState = STATE_READY; currentState = STATE_READY;
@ -2403,11 +2409,11 @@ public class MIVariableManager implements ICommandControl {
public class VariableObjectId { public class VariableObjectId {
// We don't use the expression context because it is not safe to compare them // We don't use the expression context because it is not safe to compare them
// See bug 187718. So we store the expression itself, and it's parent execution context. // See bug 187718. So we store the expression itself, and it's parent execution context.
String fExpression = null; private String fExpression = null;
IExecutionDMContext fExecContext = null; private IExecutionDMContext fExecContext = null;
// We need the depth of the frame. The frame level is not sufficient because // We need the depth of the frame. The frame level is not sufficient because
// the same frame will have a different level based on the current depth of the stack // the same frame will have a different level based on the current depth of the stack
Integer fFrameId = null; private Integer fFrameId = null;
public VariableObjectId() { public VariableObjectId() {
} }
@ -2453,7 +2459,7 @@ public class MIVariableManager implements ICommandControl {
new DataRequestMonitor<Integer>(fSession.getExecutor(), rm) { new DataRequestMonitor<Integer>(fSession.getExecutor(), rm) {
@Override @Override
protected void handleSuccess() { protected void handleSuccess() {
fFrameId = new Integer(getData() - frameCtx.getLevel()); fFrameId = Integer.valueOf(getData() - frameCtx.getLevel());
rm.done(); rm.done();
} }
}); });
@ -2491,7 +2497,7 @@ public class MIVariableManager implements ICommandControl {
* always be delete before their parents. * always be delete before their parents.
* *
*/ */
private class LRUVariableCache extends LinkedHashMap<VariableObjectId, MIVariableObject> { private static class LRUVariableCache extends LinkedHashMap<VariableObjectId, MIVariableObject> {
public static final long serialVersionUID = 0; public static final long serialVersionUID = 0;
// Maximum allowed concurrent variables // Maximum allowed concurrent variables
@ -2519,12 +2525,11 @@ public class MIVariableManager implements ICommandControl {
if (size() > MAX_VARIABLE_LIST) { if (size() > MAX_VARIABLE_LIST) {
Map.Entry<VariableObjectId, MIVariableObject> eldest = entrySet().iterator().next(); Map.Entry<VariableObjectId, MIVariableObject> eldest = entrySet().iterator().next();
// First make sure we are not deleting ourselves! // First make sure we are not deleting ourselves!
if (!eldest.getValue().equals(varObj)) { if (!eldest.getValue().equals(varObj) &&
if (eldest.getValue().currentState == MIVariableObject.STATE_READY) { eldest.getValue().currentState == MIVariableObject.STATE_READY) {
remove(eldest.getKey()); remove(eldest.getKey());
} }
} }
}
return varObj; return varObj;
} }
@ -2532,7 +2537,9 @@ public class MIVariableManager implements ICommandControl {
while (varObj != null) { while (varObj != null) {
varObj = varObj.getParent(); varObj = varObj.getParent();
// If there is a parent, touch it // If there is a parent, touch it
if (varObj != null) super.get(varObj.getInternalId()); if (varObj != null) {
super.get(varObj.getInternalId());
}
} }
} }