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

src: simplify InspectorConsoleCall

Browse Source 
Instead of a JS object, set the is-in-console-call flag as
a boolean in C++.

PR-URL: https://github.com/nodejs/node/pull/26168
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Eugene Ostroukhov <eostroukhov@google.com>
This commit is contained in:
Anna Henningsen 2019-02-17 18:05:55 +01:00
parent 49a2e40632
commit a34a84d281
No known key found for this signature in database
GPG Key ID: 9C63F3A6CD2AD8F9
4 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/internal/util/inspector.js
View File

@ -33,7 +33,6 @@ function installConsoleExtensions(commandLineApi) {
// Wrap a console implemented by Node.js with features from the VM inspector
function wrapConsole(consoleFromNode, consoleFromVM) {
const config = {};
const { consoleCall } = internalBinding('inspector');
for (const key of Object.keys(consoleFromVM)) {
// If global console has the same method as inspector console,
@ -42,8 +41,7 @@ function wrapConsole(consoleFromNode, consoleFromVM) {
if (consoleFromNode.hasOwnProperty(key)) {
consoleFromNode[key] = consoleCall.bind(consoleFromNode,
consoleFromVM[key],
consoleFromNode[key],
config);
consoleFromNode[key]);
} else {
// Add additional console APIs from the inspector
consoleFromNode[key] = consoleFromVM[key];

10
src/env-inl.h
View File

@ -404,6 +404,16 @@ inline void Environment::TryLoadAddon(
}
}
#if HAVE_INSPECTOR
inline bool Environment::is_in_inspector_console_call() const {
return is_in_inspector_console_call_;
}
inline void Environment::set_is_in_inspector_console_call(bool value) {
is_in_inspector_console_call_ = value;
}
#endif
inline Environment::AsyncHooks* Environment::async_hooks() {
return &async_hooks_;
}

4
src/env.h
View File

@ -870,6 +870,9 @@ class Environment {
inline inspector::Agent* inspector_agent() const {
return inspector_agent_.get();
}
inline bool is_in_inspector_console_call() const;
inline void set_is_in_inspector_console_call(bool value);
#endif
typedef ListHead<HandleWrap, &HandleWrap::handle_wrap_queue_> HandleWrapQueue;
@ -1039,6 +1042,7 @@ class Environment {
#if HAVE_INSPECTOR
std::unique_ptr<inspector::Agent> inspector_agent_;
bool is_in_inspector_console_call_ = false;
#endif
// handle_wrap_queue_ and req_wrap_queue_ needs to be at a fixed offset from

25
src/inspector_js_api.cc
View File

@ -149,31 +149,22 @@ void InspectorConsoleCall(const FunctionCallbackInfo<Value>& info) {
Environment* env = Environment::GetCurrent(info);
Isolate* isolate = env->isolate();
Local<Context> context = isolate->GetCurrentContext();
CHECK_LT(2, info.Length());
SlicedArguments call_args(info, /* start */ 3);
CHECK_GE(info.Length(), 2);
SlicedArguments call_args(info, /* start */ 2);
if (InspectorEnabled(env)) {
Local<Value> inspector_method = info[0];
CHECK(inspector_method->IsFunction());
Local<Value> config_value = info[2];
CHECK(config_value->IsObject());
Local<Object> config_object = config_value.As<Object>();
Local<String> in_call_key = FIXED_ONE_BYTE_STRING(isolate, "in_call");
bool has_in_call;
if (!config_object->Has(context, in_call_key).To(&has_in_call))
return;
if (!has_in_call) {
if (config_object->Set(context,
in_call_key,
v8::True(isolate)).IsNothing() ||
if (!env->is_in_inspector_console_call()) {
env->set_is_in_inspector_console_call(true);
MaybeLocal<Value> ret =
inspector_method.As<Function>()->Call(context,
info.Holder(),
call_args.length(),
call_args.out()).IsEmpty()) {
call_args.out());
env->set_is_in_inspector_console_call(false);
if (ret.IsEmpty())
return;
}
}
if (config_object->Delete(context, in_call_key).IsNothing())
return;
}
Local<Value> node_method = info[1];