Skip to content

Commit

Permalink
debugger: introduce exec method for debugger
Browse files Browse the repository at this point in the history
In debugger, the usage of `repl` very ugly. I'd like there is a `p`
like gdb. So the `exec` is coming.

Usage:

```
$ ./iojs debug ~/git/node_research/server.js
< Debugger listening on port 5858
connecting to 127.0.0.1:5858 ... ok
break in /Users/jacksontian/git/node_research/server.js:1
> 1 var http = require('http');
  2
  3 http.createServer(function (req, res) {
debug> exec process.title
/Users/jacksontian/git/io.js/out/Release/iojs
debug>
```

And the `repl`:

```
debug> repl
Press Ctrl + C to leave debug repl
> process.title
'/Users/jacksontian/git/io.js/out/Release/iojs'
debug>
(^C again to quit)
```

The enter and leave debug repl is superfluous.

R-URL: #1491
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information
JacksonTian authored and rvagg committed Dec 5, 2015
1 parent 6c16c40 commit ce423f3
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 4 deletions.
1 change: 1 addition & 0 deletions doc/api/debugger.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ after)
* `watchers` - List all watchers and their values (automatically listed on each
breakpoint)
* `repl` - Open debugger's repl for evaluation in debugging script's context
* `exec expr` - Execute an expression in debugging script's context

### Execution control

Expand Down
26 changes: 23 additions & 3 deletions lib/_debugger.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Protocol.prototype.serialize = function(req) {
const NO_FRAME = -1;

function Client() {
net.Stream.call(this);
net.Socket.call(this);
var protocol = this.protocol = new Protocol(this);
this._reqCallbacks = [];
var socket = this;
Expand All @@ -161,7 +161,7 @@ function Client() {

protocol.onResponse = this._onResponse.bind(this);
}
inherits(Client, net.Stream);
inherits(Client, net.Socket);
exports.Client = Client;


Expand Down Expand Up @@ -657,6 +657,7 @@ const commands = [
'unwatch',
'watchers',
'repl',
'exec',
'restart',
'kill',
'list',
Expand Down Expand Up @@ -949,6 +950,12 @@ Interface.prototype.controlEval = function(code, context, filename, callback) {
}
}

// exec process.title => exec("process.title");
var match = code.match(/^\s*exec\s+([^\n]*)/);
if (match) {
code = 'exec(' + JSON.stringify(match[1]) + ')';
}

var result = vm.runInContext(code, context, filename);

// Repl should not ask for next command
Expand Down Expand Up @@ -1527,6 +1534,18 @@ Interface.prototype.pause_ = function() {
};


// execute expression
Interface.prototype.exec = function(code) {
this.debugEval(code, null, null, (err, result) => {
if (err) {
this.error(err);
} else {
this.print(util.inspect(result, {colors: true}));
}
});
};


// Kill child process
Interface.prototype.kill = function() {
if (!this.child) return;
Expand Down Expand Up @@ -1730,11 +1749,12 @@ Interface.prototype.trySpawn = function(cb) {
client.connect(port, host);
}

self.print('connecting to ' + host + ':' + port + ' ..', true);
if (isRemote) {
self.print('connecting to ' + host + ':' + port + ' ..', true);
attemptConnect();
} else {
this.child.stderr.once('data', function() {
self.print('connecting to ' + host + ':' + port + ' ..', true);
setImmediate(attemptConnect);
});
}
Expand Down
12 changes: 11 additions & 1 deletion test/debugger/test-debugger-repl.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,20 @@ addTest('sb("setInterval()", "!(setInterval.flag++)")', [

// Continue
addTest('c', [
/break in node.js:\d+/,
/break in timers.js:\d+/,
/\d/, /\d/, /\d/, /\d/, /\d/
]);

// Execute
addTest('exec process.title', [
/node/
]);

// Execute
addTest('exec exec process.title', [
/SyntaxError: Unexpected identifier/
]);

// REPL and process.env regression
addTest('repl', [
/Ctrl/
Expand Down

0 comments on commit ce423f3

Please sign in to comment.