1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

inspector: report default context

Browse Source 
Fixes: https://github.com/nodejs/node/issues/8426
PR-URL: https://github.com/nodejs/node/pull/8502
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
Eugene Ostroukhov 2016-09-12 11:58:26 -07:00 committed by Ali Ijaz Sheikh
parent 57b7e85a59
commit efe4d19240
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/inspector_agent.cc
View File

@ -328,7 +328,7 @@ class V8NodeInspector : public v8_inspector::V8InspectorClient {
V8NodeInspector(AgentImpl* agent, node::Environment* env, V8NodeInspector(AgentImpl* agent, node::Environment* env,
v8::Platform* platform) v8::Platform* platform)
: agent_(agent), : agent_(agent),
isolate_(env->isolate()), env_(env),
platform_(platform), platform_(platform),
terminated_(false), terminated_(false),
running_nested_loop_(false), running_nested_loop_(false),
@ -348,7 +348,7 @@ class V8NodeInspector : public v8_inspector::V8InspectorClient {
Mutex::ScopedLock scoped_lock(agent_->pause_lock_); Mutex::ScopedLock scoped_lock(agent_->pause_lock_);
agent_->pause_cond_.Wait(scoped_lock); agent_->pause_cond_.Wait(scoped_lock);
} }
while (v8::platform::PumpMessageLoop(platform_, isolate_)) while (v8::platform::PumpMessageLoop(platform_, env_->isolate()))
{} {}
} while (!terminated_); } while (!terminated_);
terminated_ = false; terminated_ = false;
@ -376,13 +376,18 @@ class V8NodeInspector : public v8_inspector::V8InspectorClient {
session_->dispatchProtocolMessage(message); session_->dispatchProtocolMessage(message);
} }
v8::Local<v8::Context> ensureDefaultContextInGroup(int contextGroupId)
override {
return env_->context();
}
V8Inspector* inspector() { V8Inspector* inspector() {
return inspector_.get(); return inspector_.get();
} }
private: private:
AgentImpl* agent_; AgentImpl* agent_;
v8::Isolate* isolate_; node::Environment* env_;
v8::Platform* platform_; v8::Platform* platform_;
bool terminated_; bool terminated_;
bool running_nested_loop_; bool running_nested_loop_;

7
test/inspector/test-inspector.js
View File

@ -141,6 +141,13 @@ function testInspectScope(session) {
} }
}, setupExpectValue(1002) }, setupExpectValue(1002)
], ],
[
{
'method': 'Runtime.evaluate', 'params': {
'expression': '5 * 5'
}
}, (message) => assert.strictEqual(25, message['result']['value'])
],
]); ]);
} }