Clear stackframe cache if the thread state has changed (microsoft#439)

testforstephen · web-flow · commit a5bbebc66141 · 2022-09-01T14:02:44.000+08:00
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/IStackFrameManager.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/IStackFrameManager.java
@@ -41,4 +41,11 @@ public interface IStackFrameManager {
      * @return the refreshed stackframes
      */
     StackFrame[] reloadStackFrames(ThreadReference thread, int start, int length);
+
+    /**
+     * Clear the stackframes cache from the specified thread.
+     *
+     * @param thread the jdi thread
+     */
+    void clearStackFrames(ThreadReference thread);
 }
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/StackFrameManager.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/StackFrameManager.java
@@ -66,4 +66,9 @@ public synchronized StackFrame[] reloadStackFrames(ThreadReference thread, int s
             return new StackFrame[0];
         }
     }
+
+    @Override
+    public synchronized void clearStackFrames(ThreadReference thread) {
+        threadStackFrameMap.remove(thread.uniqueID());
+    }
 }
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/StackTraceRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/StackTraceRequestHandler.java
@@ -70,6 +70,11 @@ public CompletableFuture<Response> handle(Command command, Arguments arguments,
         int totalFrames = 0;
         if (thread != null) {
             try {
+                // Thread state has changed and then invalidate the stack frame cache.
+                if (stacktraceArgs.startFrame == 0) {
+                    context.getStackFrameManager().clearStackFrames(thread);
+                }
+
                 totalFrames = thread.frameCount();
                 int count = stacktraceArgs.levels == 0 ? totalFrames - stacktraceArgs.startFrame
                         : Math.min(totalFrames - stacktraceArgs.startFrame, stacktraceArgs.levels);
@@ -80,10 +85,10 @@ public CompletableFuture<Response> handle(Command command, Arguments arguments,
 
                 StackFrame[] frames = context.getStackFrameManager().reloadStackFrames(thread, stacktraceArgs.startFrame, count);
                 List<StackFrameInfo> jdiFrames = resolveStackFrameInfos(frames, context.asyncJDWP());
-                for (int i = stacktraceArgs.startFrame; i < jdiFrames.size() && count-- > 0; i++) {
-                    StackFrameReference stackframe = new StackFrameReference(thread, i);
+                for (int i = 0; i < count; i++) {
+                    StackFrameReference stackframe = new StackFrameReference(thread, stacktraceArgs.startFrame + i);
                     int frameId = context.getRecyclableIdPool().addObject(stacktraceArgs.threadId, stackframe);
-                    StackFrameInfo jdiFrame = jdiFrames.get(i - stacktraceArgs.startFrame);
+                    StackFrameInfo jdiFrame = jdiFrames.get(i);
                     result.add(convertDebuggerStackFrameToClient(jdiFrame, frameId, context));
                 }
             } catch (IncompatibleThreadStateException | IndexOutOfBoundsException | URISyntaxException

Original file line number	Diff line number	Diff line change
`@@ -66,4 +66,9 @@ public synchronized StackFrame[] reloadStackFrames(ThreadReference thread, int s`
`66`	`66`	`return new StackFrame[0];`
`67`	`67`	`}`
`68`	`68`	`}`
	`69`	`+`
	`70`	`+ @Override`
	`71`	`+ public synchronized void clearStackFrames(ThreadReference thread) {`
	`72`	`+ threadStackFrameMap.remove(thread.uniqueID());`
	`73`	`+ }`
`69`	`74`	`}`