RTT timestamp and other minor changes

Author: haneefdm

package-lock.json

@@ -673,6 +673,11 @@
                                                             "type": "string",
                                                             "default": ""
                                                         },
+                                                        "timestamp": {
+                                                            "description": "Add timestamps while printing for 'console' type. 'binary' type always prints timestamps",
+                                                            "type": "boolean",
+                                                            "default": false
+                                                        },
                                                         "encoding": {
                                                             "type": "string",
                                                             "description": "How binary data bytes are converted into a number. All little-endian",
@@ -1507,6 +1512,11 @@
                                                             "type": "string",
                                                             "default": ""
                                                         },
+                                                        "timestamp": {
+                                                            "description": "Add timestamps while printing for 'console' type. 'binary' type always prints timestamps",
+                                                            "type": "boolean",
+                                                            "default": false
+                                                        },
                                                         "encoding": {
                                                             "type": "string",
                                                             "description": "How binary data bytes are converted into a number. All little-endian",

package.json

@@ -147,6 +147,8 @@ export class MI2 extends EventEmitter implements IBackend {
                         this.handlers[parsed.token](parsed);
                         delete this.handlers[parsed.token];
                         handled = true;
+                    } else {
+                        this.log('stderr', `Internal Error? Multiple results or no handler for query token '${parsed.token}''`);
                     }
                 }
                 if (!handled && parsed.resultRecords && parsed.resultRecords.resultClass === 'error') {

src/backend/mi2/mi2.ts

@@ -63,17 +63,35 @@ export class GDBServer extends EventEmitter {
         });
     }
 
+    private exitTimeout: NodeJS.Timeout = null;
     public exit(): void {
         if (this.process) {
-            console.log('GDBServer: forcing an exit')
-            this.process.kill();
-            this.process = null;
+            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
+                // a bit more graceful exit
+                this.process.kill('SIGINT');
+                setTimeout(() => {
+                    if (process != null) {      // Still not dead?
+                        console.log('GDBServer: forcing an exit with SIGTERM');
+                        this.process.kill();
+                    }
+                    this.process = null;
+                } , 1000);
+            }
+            catch (e) {
+                console.log(`Tring to force and exit failed ${e}`);
+            }
         }
     }
 
     private onExit(code, signal) {
         console.log(`GDBServer: exited ${code} ${signal}`);
         this.process = null;
+        if (this.exitTimeout) {
+            clearTimeout(this.exitTimeout);
+            this.exitTimeout = null;
+        }
         this.emit('exit', code, signal);
         this.disconnectConsole();
     }

src/backend/server.ts

@@ -105,6 +105,7 @@ export interface RTTConsoleDecoderOpts extends RTTCommonDecoderOpts {
     logfile: string;    // log IO to file
     inputmode: TerminalInputMode;
     iencoding: TextEncoding;       // Encoding used for input
+    timestamp: boolean;
     // Binary only options
     scale: number;
     encoding: BinaryEncoding;

src/common.ts

@@ -347,7 +347,7 @@ export class GDBDebugSession extends DebugSession {
             }
 
             if (executable) {
-                this.handleMsg('log', `Please check OUTPUT tab (Adapter Output) for output from ${executable}` + '\n');
+                this.handleMsg('log', `Please check TERMINAL tab (gdb-server) for output from ${executable}` + '\n');
                 const dbgMsg = `Launching server: "${executable}" ` + args.map((s) => {
                     return '"' + s.replace(/"/g, '\\"') + '"';
                 }).join(' ') + '\n';
@@ -1326,8 +1326,7 @@ export class GDBDebugSession extends DebugSession {
                         if (brkp instanceof MIError) {
                             /* Failed breakpoints should be reported with
                              * verified: false, so they can be greyed out
-                             * in the UI. The attached message will be
-                             * presented as a tooltip.
+                             * in the UI.
                              */
                             return {
                                 verified: false,

src/gdb.ts

@@ -1,5 +1,5 @@
 import { DebugProtocol } from 'vscode-debugprotocol';
-import { GDBServerController, ConfigurationArguments, calculatePortMask, createPortName,SWOConfigureEvent, getAnyFreePort, parseHexOrDecInt, RTTConfigureEvent, RTTServerHelper } from './common';
+import { GDBServerController, ConfigurationArguments, calculatePortMask, createPortName,SWOConfigureEvent, parseHexOrDecInt, RTTServerHelper } from './common';
 import * as os from 'os';
 import { EventEmitter } from 'events';
 
@@ -28,7 +28,16 @@ export class JLinkServerController extends EventEmitter implements GDBServerCont
 
         // JLink only support one TCP port and that too for channel 0 only. The config provider
         // makes sure that the rttConfig conforms.
-        this.rttHelper.allocateRTTPorts(args.rttConfig, this.defaultRttPort);
+        if (args.rttConfig && args.rttConfig.enabled && (!args.rttConfig.decoders || (args.rttConfig.decoders.length === 0))) {
+            // We do the RTT setup and pass the right args to JLink but not actually use the TCP Port ourselves. Decided
+            // Not to allocate a free port in this case either.
+
+            // getAnyFreePort(this.defaultRttPort).then((p) => {
+            //     this.defaultRttPort = p;
+            // });
+        } else {
+            this.rttHelper.allocateRTTPorts(args.rttConfig, this.defaultRttPort);
+        }
     }
 
     public customRequest(command: string, response: DebugProtocol.Response, args: any): boolean {
@@ -156,7 +165,7 @@ 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]);
+            cmdargs.push('-rtttelnetport', this.rttHelper.rttLocalPortMap[0] || this.defaultRttPort.toString());
         }
 
         if (this.args.serialNumber) {