mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 06:02:11 +02:00
Code Issues Wiki Activity

Use MIInfoThreads instead MIThreadListIds.

Browse source
This commit is contained in:
Alain Magloire 2002-08-30 04:56:06 +00:00
parent 3e7f291e64
commit b5478f02b4
1 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CTarget.java
View file

@ -19,7 +19,6 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIThread;
import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; import org.eclipse.cdt.debug.core.cdi.model.ICDIValue;
import org.eclipse.cdt.debug.mi.core.MIException; import org.eclipse.cdt.debug.mi.core.MIException;
import org.eclipse.cdt.debug.mi.core.MISession; import org.eclipse.cdt.debug.mi.core.MISession;
import org.eclipse.cdt.debug.mi.core.command.CLICommand;
import org.eclipse.cdt.debug.mi.core.command.CommandFactory; import org.eclipse.cdt.debug.mi.core.command.CommandFactory;
import org.eclipse.cdt.debug.mi.core.command.MIDataEvaluateExpression; import org.eclipse.cdt.debug.mi.core.command.MIDataEvaluateExpression;
import org.eclipse.cdt.debug.mi.core.command.MIDataListRegisterNames; import org.eclipse.cdt.debug.mi.core.command.MIDataListRegisterNames;
@ -31,14 +30,14 @@ import org.eclipse.cdt.debug.mi.core.command.MIExecNextInstruction;
import org.eclipse.cdt.debug.mi.core.command.MIExecRun; import org.eclipse.cdt.debug.mi.core.command.MIExecRun;
import org.eclipse.cdt.debug.mi.core.command.MIExecStep; import org.eclipse.cdt.debug.mi.core.command.MIExecStep;
import org.eclipse.cdt.debug.mi.core.command.MIExecStepInstruction; import org.eclipse.cdt.debug.mi.core.command.MIExecStepInstruction;
import org.eclipse.cdt.debug.mi.core.command.MIInfoThreads;
import org.eclipse.cdt.debug.mi.core.command.MITargetDetach; import org.eclipse.cdt.debug.mi.core.command.MITargetDetach;
import org.eclipse.cdt.debug.mi.core.command.MIThreadListIds;
import org.eclipse.cdt.debug.mi.core.command.MIThreadSelect; import org.eclipse.cdt.debug.mi.core.command.MIThreadSelect;
import org.eclipse.cdt.debug.mi.core.event.MIThreadExitEvent; import org.eclipse.cdt.debug.mi.core.event.MIThreadExitEvent;
import org.eclipse.cdt.debug.mi.core.output.MIDataEvaluateExpressionInfo; import org.eclipse.cdt.debug.mi.core.output.MIDataEvaluateExpressionInfo;
import org.eclipse.cdt.debug.mi.core.output.MIDataListRegisterNamesInfo; import org.eclipse.cdt.debug.mi.core.output.MIDataListRegisterNamesInfo;
import org.eclipse.cdt.debug.mi.core.output.MIInfo; import org.eclipse.cdt.debug.mi.core.output.MIInfo;
import org.eclipse.cdt.debug.mi.core.output.MIThreadListIdsInfo; import org.eclipse.cdt.debug.mi.core.output.MIInfoThreadsInfo;
import org.eclipse.cdt.debug.mi.core.output.MIThreadSelectInfo; import org.eclipse.cdt.debug.mi.core.output.MIThreadSelectInfo;
/** /**
@ -92,7 +91,7 @@ public class CTarget implements ICDITarget {
MIThreadSelectInfo info = select.getMIThreadSelectInfo(); MIThreadSelectInfo info = select.getMIThreadSelectInfo();
currentThreadId = info.getNewThreadId(); currentThreadId = info.getNewThreadId();
} catch (MIException e) { } catch (MIException e) {
throw new CDIException(e.toString()); throw new CDIException(e.getMessage());
} }
} }
@ -129,7 +128,13 @@ public class CTarget implements ICDITarget {
} }
} }
if (!dList.isEmpty()) { if (!dList.isEmpty()) {
// FIXME: Fire destroyed events. MIThreadExitEvent[] events = new MIThreadExitEvent[dList.size()];
for (int j = 0; j < events.length; j++) {
int id = ((Integer)dList.get(j)).intValue();
events[j] = new MIThreadExitEvent(id);
}
MISession miSession = session.getMISession();
miSession.fireEvents(events);
} }
} }
currentThreads = newThreads; currentThreads = newThreads;
@ -143,18 +148,15 @@ public class CTarget implements ICDITarget {
CThread[] cthreads = noThreads; CThread[] cthreads = noThreads;
MISession mi = session.getMISession(); MISession mi = session.getMISession();
CommandFactory factory = mi.getCommandFactory(); CommandFactory factory = mi.getCommandFactory();
MIThreadListIds tids = factory.createMIThreadListIds(); MIInfoThreads tids = factory.createMIInfoThreads();
try { try {
// HACK/FIXME: gdb/mi thread-list-ids does not // HACK/FIXME: gdb/mi thread-list-ids does not
// show any newly create thread, we workaround by // show any newly create thread, we workaround by
// issuing "info threads" before to force it. // issuing "info threads" instead.
//* //MIThreadListIds tids = factory.createMIThreadListIds();
//if (currentThreads == null || currentThreads.length == 0) { //MIThreadListIdsInfo info = tids.getMIThreadListIdsInfo();
mi.postCommand(new CLICommand("info threads"));
//}
//*/
mi.postCommand(tids); mi.postCommand(tids);
MIThreadListIdsInfo info = tids.getMIThreadListIdsInfo(); MIInfoThreadsInfo info = tids.getMIInfoThreadsInfo();
int[] ids = info.getThreadIds(); int[] ids = info.getThreadIds();
if (ids != null && ids.length > 0) { if (ids != null && ids.length > 0) {
cthreads = new CThread[ids.length]; cthreads = new CThread[ids.length];
@ -166,8 +168,10 @@ public class CTarget implements ICDITarget {
// Provide a dummy. // Provide a dummy.
cthreads = new CThread[]{new CThread(this, 0)}; cthreads = new CThread[]{new CThread(this, 0)};
} }
currentThreadId = info.getCurrentThread();
} catch (MIException e) { } catch (MIException e) {
//throw new CDIException(e.toString()); // Do not throw anything in this case.
//throw new CDIException(e.getMessage());
} }
return cthreads; return cthreads;
} }
@ -210,7 +214,7 @@ public class CTarget implements ICDITarget {
throw new CDIException("No answer"); throw new CDIException("No answer");
} }
} catch (MIException e) { } catch (MIException e) {
throw new CDIException(e.toString()); throw new CDIException(e.getMessage());
} }
} }
@ -231,7 +235,7 @@ public class CTarget implements ICDITarget {
throw new CDIException("No answer"); throw new CDIException("No answer");
} }
} catch (MIException e) { } catch (MIException e) {
throw new CDIException(e.toString()); throw new CDIException(e.getMessage());
} }
} else if (mi.getMIInferior().isTerminated()) { } else if (mi.getMIInferior().isTerminated()) {
restart(); restart();
@ -255,7 +259,7 @@ public class CTarget implements ICDITarget {
throw new CDIException("No answer"); throw new CDIException("No answer");
} }
} catch (MIException e) { } catch (MIException e) {
throw new CDIException(e.toString()); throw new CDIException(e.getMessage());
} }
} }
@ -273,7 +277,7 @@ public class CTarget implements ICDITarget {
throw new CDIException("No answer"); throw new CDIException("No answer");
} }
} catch (MIException e) { } catch (MIException e) {
throw new CDIException(e.toString()); throw new CDIException(e.getMessage());
} }
} }
@ -291,7 +295,7 @@ public class CTarget implements ICDITarget {
throw new CDIException("No answer"); throw new CDIException("No answer");
} }
} catch (MIException e) { } catch (MIException e) {
throw new CDIException(e.toString()); throw new CDIException(e.getMessage());
} }
} }
@ -309,7 +313,7 @@ public class CTarget implements ICDITarget {
throw new CDIException("No answer"); throw new CDIException("No answer");
} }
} catch (MIException e) { } catch (MIException e) {
throw new CDIException(e.toString()); throw new CDIException(e.getMessage());
} }
} }
@ -327,7 +331,7 @@ public class CTarget implements ICDITarget {
throw new CDIException("No answer"); throw new CDIException("No answer");
} }
} catch (MIException e) { } catch (MIException e) {
throw new CDIException(e.toString()); throw new CDIException(e.getMessage());
} }
} }
@ -345,7 +349,7 @@ public class CTarget implements ICDITarget {
throw new CDIException("No answer"); throw new CDIException("No answer");
} }
} catch (MIException e) { } catch (MIException e) {
throw new CDIException(e.toString()); throw new CDIException(e.getMessage());
} }
} }
@ -363,7 +367,7 @@ public class CTarget implements ICDITarget {
throw new CDIException("No answer"); throw new CDIException("No answer");
} }
} catch (MIException e) { } catch (MIException e) {
throw new CDIException(e.toString()); throw new CDIException(e.getMessage());
} }
} }
@ -381,7 +385,7 @@ public class CTarget implements ICDITarget {
throw new CDIException("No answer"); throw new CDIException("No answer");
} }
} catch (MIException e) { } catch (MIException e) {
throw new CDIException(e.toString()); throw new CDIException(e.getMessage());
} }
} }
@ -403,7 +407,7 @@ public class CTarget implements ICDITarget {
} }
return info.getExpression(); return info.getExpression();
} catch (MIException e) { } catch (MIException e) {
throw new CDIException(e.toString()); throw new CDIException(e.getMessage());
} }
} }
@ -464,7 +468,7 @@ public class CTarget implements ICDITarget {
} }
return regs; return regs;
} catch (MIException e) { } catch (MIException e) {
throw new CDIException(e.toString()); throw new CDIException(e.getMessage());
} }
} }