mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-20 15:35:24 +02:00
Code Issues Wiki Activity

Bug 174988: thread switch while register view is open: redundant mi commands sent. Applied patch from Giuseppe Montalto (STMicroelectronics).

Browse source
This commit is contained in:
Mikhail Khodjaiants 2007-03-01 12:14:17 +00:00
parent b557d74590
commit 88b72e9a46
1 changed files with 49 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java
View file

@ -7,6 +7,7 @@
* *
* Contributors: * Contributors:
* QNX Software Systems - Initial API and implementation * QNX Software Systems - Initial API and implementation
* Giuseppe Montalto, STMicroelectronics - bug 174988
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.debug.mi.core.cdi; package org.eclipse.cdt.debug.mi.core.cdi;
@ -278,13 +279,58 @@ public class RegisterManager extends Manager {
} }
} }
} }
public MIVarChange[] updateMiVar(StackFrame frame, String varName) throws CDIException {
Target target = (Target)frame.getTarget();
Thread currentThread = (Thread)target.getCurrentThread();
StackFrame currentFrame = currentThread.getCurrentStackFrame();
target.lockTarget();
try {
target.setCurrentThread(frame.getThread(), false);
((Thread)frame.getThread()).setCurrentStackFrame(frame, false);
MISession mi = target.getMISession();
CommandFactory factory = mi.getCommandFactory();
MIVarUpdate var = factory.createMIVarUpdate(varName);
mi.postCommand(var);
MIVarUpdateInfo info = var.getMIVarUpdateInfo();
if (info == null) {
throw new CDIException(CdiResources.getString("cdi.Common.No_answer")); //$NON-NLS-1$
}
return info.getMIVarChanges();
} catch (MIException e) {
throw new MI2CDIException(e);
} finally {
try {
target.setCurrentThread(currentThread, false);
currentThread.setCurrentStackFrame(currentFrame, false);
} finally {
target.releaseTarget();
}
}
}
public Variable createShadowRegister(Register register, StackFrame frame, String regName) throws CDIException { public Variable createShadowRegister(Register register, StackFrame frame, String regName) throws CDIException {
Target target = (Target)frame.getTarget(); Target target = (Target)frame.getTarget();
MIVar miVar = createMiVar(frame, regName);
ShadowRegister variable = new ShadowRegister(register, frame, regName, miVar);
Map varMap = getVariableMap(target); Map varMap = getVariableMap(target);
varMap.put(miVar.getVarName(), variable); ShadowRegister variable = null;
if(varMap.containsKey(regName)) {
variable = (ShadowRegister)varMap.get(regName);
updateMiVar(frame,variable.getMIVar().getVarName());
}
else {
MIVar miVar = createMiVar(frame, regName);
variable = new ShadowRegister(register, frame, regName, miVar);
/* varMap seems to be unused, so I changed it...
* now it helds the register name, instead of the variable name;
* it now can be used to retrieve existing variables, thus avoiding
* variable prolification and also reducing the number of mi commands
* to be sent to the target.
*/
varMap.put(regName, variable);
}
return variable; return variable;
} }