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

Bug 409965 - [visualizer] Allow all-stop mode for multicore visualizer

Browse source 
Change-Id: Ieb553caa7e123068f3a6137b69b00ac97f645af5
Signed-off-by: Marc Dumais <marc.dumais@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/14118
Reviewed-by: Marc Khouzam <marc.khouzam@ericsson.com>
IP-Clean: Marc Khouzam <marc.khouzam@ericsson.com>
Tested-by: Marc Khouzam <marc.khouzam@ericsson.com>
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
IP-Clean: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
This commit is contained in:
Marc Dumais 2013-06-27 14:41:04 -04:00 • committed by Marc-Andre Laperle
parent b849c30a5d
commit c7150fd184
3 changed files with 103 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerThread.java
View file

@ -10,6 +10,7 @@
* Marc Khouzam (Ericsson) - Added knowledge about execution
* state and os/gdb thread ids
* Marc Dumais (Ericsson) - Bug 405390
* Marc Dumais (Ericsson) - Bug 409965
*******************************************************************************/
package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model;
@ -114,11 +115,16 @@ public class VisualizerThread
public int getTID() {
return m_tid;
}
/** Sets thread id (tid). */
public void setTID(int tid) {
m_tid = tid;
}
/** Gets thread id (tid). */
/** Gets thread id (gdbtid). */
@Override
public int getID() {
return getTID();
return getGDBTID();
}
/** Return core the thread is on */
@ -160,10 +166,10 @@ public class VisualizerThread
else if (m_pid > o.m_pid) {
result = 1;
}
else if (m_tid < o.m_tid) {
else if (getID() < o.getID()) {
result = -1;
}
else if (m_tid > o.m_tid) {
else if (getID() > o.getID()) {
result = 1;
}
}

11
dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizer.java
View file

@ -15,6 +15,7 @@
* Marc Dumais (Ericsson) - Bug 409006
* Marc Dumais (Ericsson) - Bug 407321
* Marc-Andre Laperle (Ericsson) - Bug 411634
* Marc Dumais (Ericsson) - Bug 409965
*******************************************************************************/
package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view;
@ -1178,9 +1179,17 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer
// add thread if not already there - there is a potential race condition where a
// thread can be added twice to the model: once at model creation and once more
// through the listener. Checking at both places to prevent this.
if (model.getThread(tid) == null) {
VisualizerThread t = model.getThread(tid);
if (t == null) {
model.addThread(new VisualizerThread(core, pid, osTid, tid, state));
}
// if the thread is already in the model, update it's parameters.
else {
t.setCore(core);
t.setTID(osTid);
t.setState(state);
}
// keep track of threads visited
done(1, model);

84
dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerEventListener.java
View file

@ -12,10 +12,13 @@
* Marc Dumais (Ericsson) - Bug 405390
* Marc Dumais (Ericsson) - Bug 396269
* Marc Dumais (Ericsson) - Bug 409512
* Marc Dumais (Ericsson) - Bug 409965
*******************************************************************************/
package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view;
import java.util.List;
import org.eclipse.cdt.dsf.concurrent.ImmediateDataRequestMonitor;
import org.eclipse.cdt.dsf.datamodel.DMContexts;
import org.eclipse.cdt.dsf.datamodel.DataModelInitializedEvent;
@ -32,11 +35,14 @@ import org.eclipse.cdt.dsf.debug.service.IRunControl.StateChangeReason;
import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.MulticoreVisualizerUIPlugin;
import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerCore;
import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerExecutionState;
import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerModel;
import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerThread;
import org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.utils.DSFDebugModel;
import org.eclipse.cdt.dsf.gdb.service.IGDBProcesses.IGdbThreadDMData;
import org.eclipse.cdt.dsf.mi.service.IMIExecutionDMContext;
import org.eclipse.cdt.dsf.mi.service.IMIProcessDMContext;
import org.eclipse.cdt.dsf.mi.service.IMIRunControl;
import org.eclipse.cdt.dsf.mi.service.IMIRunControl.MIRunMode;
import org.eclipse.cdt.dsf.mi.service.command.events.IMIDMEvent;
import org.eclipse.cdt.dsf.mi.service.command.events.MISignalEvent;
import org.eclipse.cdt.dsf.service.DsfServiceEventHandler;
@ -73,6 +79,15 @@ public class MulticoreVisualizerEventListener {
@DsfServiceEventHandler
public void handleEvent(final ISuspendedDMEvent event) {
IDMContext context = event.getDMContext();
// all-stop mode? If so, we take the opportunity, now that GDB has suspended
// execution, to re-create the model so that we synchronize with the debug session
if (context != null && isSessionAllStop(context.getSessionId()) ) {
fVisualizer.update();
return;
}
// non-stop mode
if (context instanceof IContainerDMContext) {
// We don't deal with processes
} else if (context instanceof IMIExecutionDMContext) {
@ -139,6 +154,18 @@ public class MulticoreVisualizerEventListener {
@DsfServiceEventHandler
public void handleEvent(IResumedDMEvent event) {
IDMContext context = event.getDMContext();
// in all-stop mode... : update all threads states to "running"
if (context != null && isSessionAllStop(context.getSessionId()) ) {
List<VisualizerThread> tList = fVisualizer.getModel().getThreads();
for(VisualizerThread t : tList) {
t.setState(VisualizerExecutionState.RUNNING);
}
fVisualizer.getMulticoreVisualizerCanvas().requestUpdate();
return;
}
// Non-stop mode
if (context instanceof IContainerDMContext) {
// We don't deal with processes
} else if (context instanceof IMIExecutionDMContext) {
@ -161,6 +188,42 @@ public class MulticoreVisualizerEventListener {
@DsfServiceEventHandler
public void handleEvent(IStartedDMEvent event) {
IDMContext context = event.getDMContext();
if (context == null) return;
final String sessionId = context.getSessionId();
// all-stop mode?
// If so we can't ask GDB for more info about the new thread at this moment.
// So we still add it to the model, on core zero and with a OS thread id of
// zero. The next time the execution is stopped, the model will be re-created
// and show the correct thread ids and cores.
if (isSessionAllStop(sessionId) && context instanceof IMIExecutionDMContext ) {
final IMIExecutionDMContext execDmc = (IMIExecutionDMContext)context;
final IMIProcessDMContext processContext =
DMContexts.getAncestorOfType(execDmc, IMIProcessDMContext.class);
VisualizerModel model = fVisualizer.getModel();
if (model == null) return;
// put it on core zero
VisualizerCore vCore = fVisualizer.getModel().getCore(0);
if (vCore == null) return;
int pid = Integer.parseInt(processContext.getProcId());
int tid = execDmc.getThreadId();
int osTid = 0;
// add thread if not already there - there is a potential race condition where a
// thread can be added twice to the model: once at model creation and once more
// through the listener. Checking at both places to prevent this.
if (fVisualizer.getModel().getThread(tid) == null ) {
fVisualizer.getModel().addThread(new VisualizerThread(vCore, pid, osTid, tid, VisualizerExecutionState.RUNNING));
fVisualizer.getMulticoreVisualizerCanvas().requestUpdate();
}
return;
}
// non-stop mode
if (context instanceof IContainerDMContext) {
// We don't deal with processes
} else if (context instanceof IMIExecutionDMContext) {
@ -173,7 +236,7 @@ public class MulticoreVisualizerEventListener {
DsfServicesTracker tracker =
new DsfServicesTracker(MulticoreVisualizerUIPlugin.getBundleContext(),
execDmc.getSessionId());
sessionId);
IProcesses procService = tracker.getService(IProcesses.class);
tracker.dispose();
@ -264,6 +327,11 @@ public class MulticoreVisualizerEventListener {
canvas.requestUpdate();
}
}
@Override
protected void handleFailure() {
// we are overriding handleFailure() to avoid an error message
// in the log, in the all-stop mode.
}
});
@ -286,6 +354,20 @@ public class MulticoreVisualizerEventListener {
// re-create the visualizer model now that CPU and core info is available
fVisualizer.update();
}
// helper functions
/** Returns whether the session is the "all-stop" kind */
private boolean isSessionAllStop(String sessionId) {
DsfServicesTracker servicesTracker = new DsfServicesTracker(MulticoreVisualizerUIPlugin.getBundleContext(), sessionId);
IMIRunControl runCtrlService = servicesTracker.getService(IMIRunControl.class);
servicesTracker.dispose();
if (runCtrlService != null && runCtrlService.getRunMode() == MIRunMode.ALL_STOP ) {
return true;
}
return false;
}
}