Silently pause target before reset if running

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## Unreleased
+
+- Fixes [`463`](https://github.com/eclipse-cdt-cloud/cdt-gdb-adapter/issues/463): Cannot use custom reset while CPU is running.
+
 ## 1.4.1
 
 - Fixes [`400`](https://github.com/eclipse-cdt-cloud/cdt-gdb-adapter/issues/400): Evaluation of variables to support RTOS Views extension.

src/gdb/GDBDebugSessionBase.ts

@@ -277,16 +277,27 @@ export abstract class GDBDebugSessionBase extends LoggingDebugSession {
      */
     protected customResetRequest(response: DebugProtocol.Response) {
         if (this.customResetCommands) {
-            this.gdb
-                .sendCommands(this.customResetCommands)
-                .then(() => this.sendResponse(response))
-                .catch(() =>
+            this.pauseIfNeeded()
+                .then(() => {
+                    // Behavior after reset very much depends on the commands used.
+                    // So, hard to make assumptions when expected state is reached.
+                    // Hence, implement stop-after-reset behavior unless commands
+                    // set running. Achieved by decrementing pause count (no recursion
+                    // expected, this reset is not called as part of connection).
+                    if (this.pauseCount > 0) {
+                        this.pauseCount--;
+                    }
+                    this.gdb.sendCommands(this.customResetCommands).then(() => {
+                        this.sendResponse(response);
+                    });
+                })
+                .catch(() => {
                     this.sendErrorResponse(
                         response,
                         1,
                         'The custom reset command failed'
-                    )
-                );
+                    );
+                });
         }
     }
 

src/integration-tests/custom-reset.spec.ts

@@ -13,22 +13,23 @@ import { TargetLaunchRequestArguments } from '../types/session';
 import { CdtDebugClient } from './debugClient';
 import {
     fillDefaults,
+    gdbAsync,
     isRemoteTest,
     standardBeforeEach,
     testProgramsDir,
 } from './utils';
 
 describe('custom reset', function () {
     let dc: CdtDebugClient;
-    const emptyProgram = path.join(testProgramsDir, 'empty');
+    const loopForeverProgram = path.join(testProgramsDir, 'loopforever');
     const commands = ['print 42'];
     const expectedResult = '$1 = 42\n';
 
     beforeEach(async function () {
         dc = await standardBeforeEach('debugTargetAdapter.js');
         await dc.launchRequest(
             fillDefaults(this.currentTest, {
-                program: emptyProgram,
+                program: loopForeverProgram,
                 customResetCommands: commands,
             } as TargetLaunchRequestArguments)
         );
@@ -45,8 +46,36 @@ describe('custom reset', function () {
             this.skip();
         }
 
-        const event = dc.waitForOutputEvent('stdout', expectedResult);
-        await dc.customRequest('cdt-gdb-adapter/customReset');
-        await event;
+        await Promise.all([
+            dc.waitForOutputEvent('stdout', expectedResult),
+            dc.customRequest('cdt-gdb-adapter/customReset'),
+        ]);
+    });
+
+    it('stops the target if necessary before sending custom reset commands', async function () {
+        if (!isRemoteTest || !gdbAsync) {
+            // This test is pointless if async mode is off. It stops anyway.
+            this.skip();
+        }
+
+        await dc.setFunctionBreakpointsRequest({
+            breakpoints: [{ name: 'main' }],
+        });
+        const [stoppedEvent] = await Promise.all([
+            dc.waitForEvent('stopped'),
+            dc.configurationDoneRequest(),
+        ]);
+        await dc.setFunctionBreakpointsRequest({ breakpoints: [] }); // remove function breakpoints
+
+        // Let the program run
+        await dc.continueRequest({ threadId: stoppedEvent.body.threadId });
+
+        await Promise.all([
+            dc.waitForOutputEvent('stdout', expectedResult), // wait stdout event
+            dc.customRequest('cdt-gdb-adapter/customReset'),
+        ]);
+
+        // Would throw if it wasn't stopped
+        await dc.stepInRequest({ threadId: stoppedEvent.body.threadId });
     });
 });