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

Wait until all threads are stopped before continuing test

Browse source 
These tests all had the same mistake, they had 5 x waitForEvent
with the comment "at this point all 5 threads should be stopped"
but there are actually 6 threads (5 spawned ones + main thread).
Most of the time all 6 threads would be stopped in time, but
sometimes one of them wouldn't be stopped, leading to a
"CoreException: Context is running" error in the test

This fixes the ThreadStackFrameSyncTest item

Part of #117
This commit is contained in:
Jonah Graham 2022-11-05 17:31:54 -04:00
parent 7673c856b6
commit 8c6f501250
1 changed files with 28 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/ThreadStackFrameSyncTest.java
View file

@ -65,6 +65,8 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase {
private IGDBFocusSynchronizer fGdbSync; private IGDBFocusSynchronizer fGdbSync;
private DsfSession fSession; private DsfSession fSession;
private static final int NUM_THREADS = 5; // Should match value in MultiThread.cc
// Breakpoint tags in MultiThread.cc // Breakpoint tags in MultiThread.cc
public static final String[] LINE_TAGS = new String[] { "LINE_MAIN_BEFORE_THREAD_START", // Just before StartThread public static final String[] LINE_TAGS = new String[] { "LINE_MAIN_BEFORE_THREAD_START", // Just before StartThread
"LINE_MAIN_AFTER_THREAD_START", // Just after StartThread "LINE_MAIN_AFTER_THREAD_START", // Just after StartThread
@ -112,6 +114,7 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase {
}; };
fSession.getExecutor().submit(runnable).get(); fSession.getExecutor().submit(runnable).get();
} }
@Override @Override
@ -141,23 +144,7 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void testChangingCurrentThreadCLINotification() throws Throwable { public void testChangingCurrentThreadCLINotification() throws Throwable {
ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fMultiRunControl.getSession(), runAndWaitUntilAllThreadsStopped();
MIStoppedEvent.class);
// add a breakpoint in main
SyncUtil.addBreakpoint(SOURCE_NAME + ":" + getLineForTag("LINE_MAIN_ALL_THREADS_STARTED"), false);
// add a breakpoint in thread code
SyncUtil.addBreakpoint("36", false);
// Run program
SyncUtil.resumeAll();
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000)); // Wait for first thread to stop
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000)); // Wait for second thread to stop
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000));
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000));
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000));
// *** at this point all 5 threads should be stopped
// Try some thread switching - SwitchThreadAndCaptureThreadSwitchedEvent will // Try some thread switching - SwitchThreadAndCaptureThreadSwitchedEvent will
// capture the "=thread-selected" event and return the newly selected thread // capture the "=thread-selected" event and return the newly selected thread
@ -177,23 +164,7 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void testChangingCurrentFrameCLINotification() throws Throwable { public void testChangingCurrentFrameCLINotification() throws Throwable {
ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fMultiRunControl.getSession(), runAndWaitUntilAllThreadsStopped();
MIStoppedEvent.class);
// add a breakpoint in main
SyncUtil.addBreakpoint(SOURCE_NAME + ":" + getLineForTag("LINE_MAIN_ALL_THREADS_STARTED"), false);
// add a breakpoint in thread code
SyncUtil.addBreakpoint(SOURCE_NAME + ":" + getLineForTag("LINE_THREAD_IN_HELLO"), false);
// Run program
SyncUtil.resumeAll();
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000)); // Wait for first thread to stop
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000)); // Wait for second thread to stop
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000));
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000));
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000));
// *** at this point all 5 threads should be stopped
// switch to a thread that has some stack frames // switch to a thread that has some stack frames
assertEquals("2", switchThreadAndCaptureThreadSwitchedEvent("2")); assertEquals("2", switchThreadAndCaptureThreadSwitchedEvent("2"));
@ -213,23 +184,7 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void testGdbSyncServiceCanSwitchGDBThread() throws Throwable { public void testGdbSyncServiceCanSwitchGDBThread() throws Throwable {
ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fMultiRunControl.getSession(), runAndWaitUntilAllThreadsStopped();
MIStoppedEvent.class);
// add a breakpoint in main
SyncUtil.addBreakpoint(SOURCE_NAME + ":" + getLineForTag("LINE_MAIN_ALL_THREADS_STARTED"), false);
// add a breakpoint in thread code
SyncUtil.addBreakpoint("36", false);
// Run program
SyncUtil.resumeAll();
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000)); // Wait for first thread to stop
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000)); // Wait for second thread to stop
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000));
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000));
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000));
// *** at this point all 5 threads should be stopped
// have the sync service set GDB current tid to thread 5 // have the sync service set GDB current tid to thread 5
IMIExecutionDMContext contextForThreadId5 = getContextForThreadId(5); IMIExecutionDMContext contextForThreadId5 = getContextForThreadId(5);
@ -264,23 +219,7 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase {
*/ */
@Test @Test
public void testGdbSyncServiceCanSwitchGDBStackFrame() throws Throwable { public void testGdbSyncServiceCanSwitchGDBStackFrame() throws Throwable {
ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fMultiRunControl.getSession(), runAndWaitUntilAllThreadsStopped();
MIStoppedEvent.class);
// add a breakpoint in main
SyncUtil.addBreakpoint(SOURCE_NAME + ":" + getLineForTag("LINE_MAIN_ALL_THREADS_STARTED"), false);
// add a breakpoint in thread code
SyncUtil.addBreakpoint("36", false);
// Run program
SyncUtil.resumeAll();
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000)); // Wait for first thread to stop
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000)); // Wait for second thread to stop
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000));
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000));
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000));
// *** at this point all 5 threads should be stopped
final IFrameDMContext frame1 = SyncUtil.getStackFrame(1, 1); final IFrameDMContext frame1 = SyncUtil.getStackFrame(1, 1);
final IFrameDMContext frame0 = SyncUtil.getStackFrame(1, 0); final IFrameDMContext frame0 = SyncUtil.getStackFrame(1, 0);
@ -315,6 +254,27 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase {
// End of tests // End of tests
////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////
/**
* Run the program and stop when all new threads + main thread are all stopped at known location.
*/
private void runAndWaitUntilAllThreadsStopped() throws Throwable {
ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fMultiRunControl.getSession(),
MIStoppedEvent.class);
// add a breakpoint in main
SyncUtil.addBreakpoint(SOURCE_NAME + ":" + getLineForTag("LINE_MAIN_ALL_THREADS_STARTED"), false);
// add a breakpoint in thread code
SyncUtil.addBreakpoint(SOURCE_NAME + ":" + getLineForTag("LINE_THREAD_IN_HELLO"), false);
// Run program
SyncUtil.resumeAll();
// We need NUM_THREADS + 1 to account for NUM_THREADS created by StartThread calls
// plus the main thread.
for (int i = 0; i < NUM_THREADS + 1; i++) {
eventWaitor.waitForEvent(TestsPlugin.massageTimeout(2000));
}
}
// SyncUtil.getExecutionContext() takes the index of the // SyncUtil.getExecutionContext() takes the index of the
// array of all threads, so it will return a thread off by one. // array of all threads, so it will return a thread off by one.
// We compensate for this in this method // We compensate for this in this method