Skip to content

Commit da67ab3

Browse files
committed
Backed out 'monitor exit' during shutdown. Causing issues with stlink
1 parent cf84183 commit da67ab3

4 files changed

Lines changed: 4 additions & 8 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# ChangeLog
22

33
# V1.13.0-pre9
4+
* Backed out change where we try "monitor exit". See [Issue #1185](https://github.com/Marus/cortex-debug/issues/1185)
5+
* Increased server temout to 10 mins
46
* Fix for https://github.com/Marus/cortex-debug/issues/1167 Race comdition in parallel reading of multiple symbol files
57

68
# V1.13.0-pre8

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.13.0-pre8",
2+
"version": "1.13.0-pre9",
33
"preview": false,
44
"activationEvents": [
55
"onDebugResolve:cortex-debug",

src/backend/mi2/mi2.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -441,12 +441,6 @@ export class MI2 extends EventEmitter implements IBackend {
441441
// program is in paused state
442442
try {
443443
startKillTimeout(500);
444-
try {
445-
await this.sendCommand('interpreter-exec console "monitor exit"');
446-
} catch (e) {
447-
// It is possible gdb server has not implemented this
448-
ServerConsoleLog('GDB "monitor exit" failed, continue to disconnect anyway', this.pid);
449-
}
450444
await new Promise(() => setTimeout(() => {}, 50)); // For some people delay was needed. Doesn't hurt I guess
451445
if (!this.exited) {
452446
await this.sendCommand('target-disconnect'); // Yes, this can fail

src/backend/server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export class GDBServer extends EventEmitter {
4545
protected consoleSocket: net.Socket = null;
4646
private initResolve: (result: boolean) => void;
4747
private initReject: (error: any) => void;
48-
public static readonly SERVER_TIMEOUT = 2 * 60 * 1000;
48+
public static readonly SERVER_TIMEOUT = 10 * 60 * 1000;
4949
public static readonly LOCALHOST = '0.0.0.0';
5050
public pid: number = -1;
5151

0 commit comments

Comments
 (0)