debugger: Disable/Enable raw mode for child

diff --git a/benchmark/http_simple.js b/benchmark/http_simple.js
index 8d66190e0fb9a45df89a1bace7b6cff81e09b691..6d6b0d39c46eba6f1b7e303c72d729c46fd3da21 100644 (file)
--- a/benchmark/http_simple.js
+++ b/benchmark/http_simple.js
@@ -43,6 +43,7 @@ var server = http.createServer(function (req, res) {
 
   if (command == "bytes") {
     var n = parseInt(arg, 10)
+    debugger;
     if (n <= 0)
       throw "bytes called with n <= 0"
     if (stored[n] === undefined) {

diff --git a/lib/_debugger.js b/lib/_debugger.js
index a9818be8bc4fafdce6591c9838a15bf6edc5717d..4f95293a444f63fdc9848d147a422fb40f7d2ce1 100644 (file)
--- a/lib/_debugger.js
+++ b/lib/_debugger.js
@@ -310,6 +310,7 @@ function SourceUnderline(sourceText, position) {
   return sourceText + '\n' + underline;
 }
 
+
 function SourceInfo(body) {
   var result = '';
 
@@ -340,8 +341,8 @@ function Interface() {
     self.killChild();
   });
 
-  var stdin = process.openStdin();
-  stdin.addListener('data', function(chunk) {
+  this.stdin = process.openStdin();
+  this.stdin.addListener('data', function(chunk) {
     term.write(chunk);
   });
 
@@ -350,12 +351,14 @@ function Interface() {
 
   this.quitTried = false;
 
+  process.on('SIGINT', function () {
+    self.handleSIGINT();
+  });
 
   term.on('SIGINT', function () {
-    self.tryQuit();
+    self.handleSIGINT();
   });
 
-
   term.on('close', function () {
     self.tryQuit();
   });
@@ -374,6 +377,15 @@ function Interface() {
 }
 
 
+Interface.prototype.handleSIGINT = function() {
+  if (this.paused) {
+    this.child.kill('SIGINT');
+  } else {
+    this.tryQuit();
+  }
+};
+
+
 Interface.prototype.tryQuit = function() {
   if (this.quitTried) return;
   this.quitTried = true;
@@ -383,6 +395,23 @@ Interface.prototype.tryQuit = function() {
 };
 
 
+Interface.prototype.pause = function() {
+  this.paused = true;
+  this.stdin.pause();
+  this.term.pause();
+};
+
+
+Interface.prototype.resume = function() {
+  if (!this.paused) return false
+  this.paused = false;
+  this.stdin.resume();
+  this.term.resume();
+  this.term.prompt();
+  return true;
+};
+
+
 Interface.prototype.handleBreak = function(r) {
   var result = '';
   if (r.breakpoints) {
@@ -413,7 +442,7 @@ Interface.prototype.handleBreak = function(r) {
 
   console.log(result);
 
-  this.term.prompt();
+  if(!this.resume()) this.term.prompt();
 };
 
 
@@ -504,7 +533,11 @@ Interface.prototype.handleCommand = function(cmd) {
       self.printNotConnected();
       return;
     }
-    client.reqContinue();
+
+    self.pause();
+    client.reqContinue(function () {
+      self.resume();
+    });
 
   } else if (/^k(ill)?/.test(cmd)) {
     if (!client) {
@@ -611,15 +644,21 @@ Interface.prototype.killChild = function() {
     this.client.destroy();
     this.client = null;
   }
+
+  this.resume();
 };
 
 
 Interface.prototype.trySpawn = function(cb) {
+  var self = this;
+
   this.killChild();
 
   this.child = spawn(process.execPath, args, { customFds: [0, 1, 2] });
 
-  var self = this;
+
+  this.pause();
+
   setTimeout(function () {
     process.stdout.write("connecting...");
     var client = self.client = new Client();
@@ -630,15 +669,16 @@ Interface.prototype.trySpawn = function(cb) {
 
       // since we did debug-brk, we're hitting a break point immediately
       // continue before anything else.
-      client.reqContinue();
-
-      if (cb) cb();
+      client.reqContinue(function () {
+        if (cb) cb();
+      });
     });
 
     client.on('close', function () {
       console.log("\nprogram terminated");
       self.client = null;
       self.killChild();
+      self.term.prompt();
     });
 
     client.on('unhandledResponse', function (res) {

diff --git a/lib/readline.js b/lib/readline.js
index 4a0565a40ab76456cd2faae677f9efc4defc15ea..474e227e5d7ed697168b6a08fc2972d664740c27 100644 (file)
--- a/lib/readline.js
+++ b/lib/readline.js
@@ -154,6 +154,20 @@ Interface.prototype.close = function(d) {
 };
 
 
+Interface.prototype.pause = function() {
+  if (this.enabled) {
+    tty.setRawMode(false);
+  }
+};
+
+
+Interface.prototype.resume = function() {
+  if (this.enabled) {
+    tty.setRawMode(true);
+  }
+};
+
+
 Interface.prototype.write = function(d) {
   if (this._closed) return;
   return this.enabled ? this._ttyWrite(d) : this._normalWrite(d);