Await thread suspended state before returning from jdwp suspendAll co…

…mmand
xjjdlut · Feb 23, 2021 · 3f59410 · 3f59410
1 parent b70d900
commit 3f59410
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/...e.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerController.java b/...e.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerController.java
@@ -363,9 +363,9 @@ public boolean resume(Object thread, boolean sessionClosed) {
                 suspendedInfos.put(thread, null);
 
                 JDWPLogger.log("Waking up thread: %s", JDWPLogger.LogLevel.THREAD, getThreadName(thread));
+                threadSuspension.removeHardSuspendedThread(thread);
                 lock.release();
                 lock.notifyAll();
-                threadSuspension.removeHardSuspendedThread(thread);
                 return true;
             } else {
                 JDWPLogger.log("Not resuming thread: %s with suspension count: %d", JDWPLogger.LogLevel.THREAD, getThreadName(thread), threadSuspension.getSuspensionCount(thread));
@@ -423,8 +423,7 @@ public void suspend(Object guestThread) {
 
                 // quite often the Debug API will not call back the onSuspend method in time,
                 // even if the guestThread is executing. If the guestThread is blocked or waiting we
-                // still need
-                // to suspend it, thus we manage this with a hard suspend mechanism
+                // still need to suspend it, thus we manage this with a hard suspend mechanism
                 threadSuspension.addHardSuspendedThread(guestThread);
                 if (suspendedInfos.get(guestThread) == null) {
                     // if already set, we have captured a blocking suspendedInfo already

diff --git a/.../src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java b/.../src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
@@ -195,6 +195,14 @@ static CommandResult createReply(Packet packet, DebuggerController controller) {
 
                 PacketStream reply = new PacketStream().replyPacket().id(packet.id);
                 controller.suspendAll();
+
+                // give threads time to suspend before returning
+                for (Object guestThread : controller.getContext().getAllGuestThreads()) {
+                    SuspendedInfo info = controller.getSuspendedInfo(guestThread);
+                    if (info instanceof UnknownSuspendedInfo) {
+                        awaitSuspendedInfo(controller, guestThread, info);
+                    }
+                }
                 return new CommandResult(reply);
             }
         }