Skip to content

vm,trace_events: add node.vm trace events category #20728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jasnell wants to merge 3 commits into from
Closed

vm,trace_events: add node.vm trace events category #20728

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6023cc0
vm,trace_events: add node.vm trace events category
jasnell May 14, 2018
0cb02f2
[Squash] rename event
jasnell May 14, 2018
2a9679a
update doc
jasnell May 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[Squash] rename event
  • Loading branch information
@jasnell
jasnell committed May 16, 2018
commit 0cb02f28c4acc02c36cf3a83bd514cca6954287d
16 changes: 8 additions & 8 deletions src/node_contextify.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,10 +667,10 @@ class ContextifyScript : public BaseObject {
new ContextifyScript(env, args.This());

if (*TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
TRACING_CATEGORY_NODE1(vm)) != 0) {
TRACING_CATEGORY_NODE2(vm, script)) != 0) {
Utf8Value fn(isolate, filename);
TRACE_EVENT_NESTABLE_ASYNC_BEGIN1(
TRACING_CATEGORY_NODE1(vm),
TRACING_CATEGORY_NODE2(vm, script),
"ContextifyScript::New",
contextify_script,
"filename", TRACE_STR_COPY(*fn));
Expand Down Expand Up @@ -706,7 +706,7 @@ class ContextifyScript : public BaseObject {
no_abort_scope.Close();
try_catch.ReThrow();
TRACE_EVENT_NESTABLE_ASYNC_END0(
TRACING_CATEGORY_NODE1(vm),
TRACING_CATEGORY_NODE2(vm, script),
"ContextifyScript::New",
contextify_script);
return;
Expand All @@ -733,7 +733,7 @@ class ContextifyScript : public BaseObject {
Boolean::New(isolate, cached_data_produced));
}
TRACE_EVENT_NESTABLE_ASYNC_END0(
TRACING_CATEGORY_NODE1(vm),
TRACING_CATEGORY_NODE2(vm, script),
"ContextifyScript::New",
contextify_script);
}
Expand All @@ -752,7 +752,7 @@ class ContextifyScript : public BaseObject {
ASSIGN_OR_RETURN_UNWRAP(&wrapped_script, args.Holder());

TRACE_EVENT_NESTABLE_ASYNC_BEGIN0(
TRACING_CATEGORY_NODE1(vm), "RunInThisContext", wrapped_script);
TRACING_CATEGORY_NODE2(vm, script), "RunInThisContext", wrapped_script);

CHECK_EQ(args.Length(), 3);

Expand All @@ -769,7 +769,7 @@ class ContextifyScript : public BaseObject {
EvalMachine(env, timeout, display_errors, break_on_sigint, args);

TRACE_EVENT_NESTABLE_ASYNC_END0(
TRACING_CATEGORY_NODE1(vm), "RunInThisContext", wrapped_script);
TRACING_CATEGORY_NODE2(vm, script), "RunInThisContext", wrapped_script);
}

static void RunInContext(const FunctionCallbackInfo<Value>& args) {
Expand All @@ -791,7 +791,7 @@ class ContextifyScript : public BaseObject {
return;

TRACE_EVENT_NESTABLE_ASYNC_BEGIN0(
TRACING_CATEGORY_NODE1(vm), "RunInContext", wrapped_script);
TRACING_CATEGORY_NODE2(vm, script), "RunInContext", wrapped_script);

CHECK(args[1]->IsNumber());
int64_t timeout = args[1]->IntegerValue(env->context()).FromJust();
Expand All @@ -811,7 +811,7 @@ class ContextifyScript : public BaseObject {
args);

TRACE_EVENT_NESTABLE_ASYNC_END0(
TRACING_CATEGORY_NODE1(vm), "RunInContext", wrapped_script);
TRACING_CATEGORY_NODE2(vm, script), "RunInContext", wrapped_script);
}

static void DecorateErrorStack(Environment* env, const TryCatch& try_catch) {
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-trace-events-vm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if (process.argv[2] === 'child') {
[ 'child' ], {
execArgv: [
'--trace-event-categories',
'node.vm'
'node.vm.script'
]
});

Expand Down