require async mode for pausing before exiting

Luke-zhang-mchp · Nov 12, 2024 · f611a68 · f611a68
1 parent eef8427
commit f611a68
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/desktop/GDBTargetDebugSession.ts b/src/desktop/GDBTargetDebugSession.ts
@@ -472,7 +472,7 @@ export class GDBTargetDebugSession extends GDBDebugSession {
 
             if (this.targetType === 'remote') {
                 // Need to pause first, then disconnect and exit
-                await this.pauseIfNeeded();
+                await this.pauseIfNeeded(true);
                 await this.gdb.sendCommand('disconnect');
             }
 

diff --git a/src/gdb/GDBDebugSessionBase.ts b/src/gdb/GDBDebugSessionBase.ts
@@ -331,9 +331,12 @@ export abstract class GDBDebugSessionBase extends LoggingDebugSession {
     /**
      * Sends a pause command to GDBBackend, and resolves when the debugger is
      * actually paused. The paused thread ID is saved to `this.waitPausedThreadId`.
+     *
+     * @param requireAsync - require gdb to be in async mode to pause
      */
-    protected async pauseIfNeeded(): Promise<void> {
-        this.waitPausedNeeded = this.isRunning;
+    protected async pauseIfNeeded(requireAsync = false): Promise<void> {
+        this.waitPausedNeeded =
+            this.isRunning && (!requireAsync || this.gdb.getAsyncMode());
 
         if (this.waitPausedNeeded) {
             const waitPromise = new Promise<void>((resolve) => {

diff --git a/src/web/GDBTargetDebugSession.ts b/src/web/GDBTargetDebugSession.ts
@@ -327,7 +327,7 @@ export class GDBTargetDebugSession extends GDBDebugSession {
         try {
             if (this.targetType === 'remote') {
                 // Need to pause first, then disconnect and exit
-                await this.pauseIfNeeded();
+                await this.pauseIfNeeded(true);
                 await this.gdb.sendCommand('disconnect');
             }