JLink RTT with no decoders support

Author: haneefdm

src/backend/mi2/mi2.ts

@@ -259,7 +259,6 @@ export class MI2 extends EventEmitter implements IBackend {
             this.log('stderr', 'stop');
         }
         if (!this.exited) {
-            const proc = this.process;
             const to = setTimeout(() => { this.tryKill(); }, 500);
             this.process.on('exit', (code) => { clearTimeout(to); });
             // Disconnect first. Not doing so and exiting will cause an unwanted detach if the

src/backend/server.ts

@@ -67,17 +67,19 @@ export class GDBServer extends EventEmitter {
     public exit(): void {
         if (this.process) {
             try {
-                console.log('GDBServer: forcing an exit with SIGNINT');
-                // A log of gdb-servers want to recieve an Control-C equivalent first, so try that for
+                console.log('GDBServer: requesting an exit with SIGNINT');
+                // Some of gdb-servers want to recieve an Control-C equivalent first, so try that for
                 // a bit more graceful exit
+                this.process.once('SIGINT', () => {
+                    console.log('Server got SIGINT');
+                })
                 this.process.kill('SIGINT');
                 setTimeout(() => {
-                    if (process != null) {      // Still not dead?
-                        console.log('GDBServer: forcing an exit with SIGTERM');
+                    if (this.process != null) {      // Still not dead?
+                        console.log('GDBServer: forcing an exit with kill()');
                         this.process.kill();
                     }
-                    this.process = null;
-                } , 1000);
+                }, 100);
             }
             catch (e) {
                 console.log(`Tring to force and exit failed ${e}`);

src/jlink.ts

@@ -165,7 +165,13 @@ export class JLinkServerController extends EventEmitter implements GDBServerCont
                 // If we are getting here, we will need some serious re-factoring
                 throw new Error('Asynchronous timing error. Could not allocate all the ports needed in time.');
             }
-            cmdargs.push('-rtttelnetport', this.rttHelper.rttLocalPortMap[0] || this.defaultRttPort.toString());
+            const keys = Object.keys(this.rttHelper.rttLocalPortMap);
+            let tcpPort = this.defaultRttPort.toString();
+            if (keys && (keys.length > 0)) {
+                // We only support one port because JLink gdb-server only supports one port
+                tcpPort = this.rttHelper.rttLocalPortMap[keys[0]];
+            }
+            cmdargs.push('-rtttelnetport', tcpPort);
         }
 
         if (this.args.serialNumber) {