Skip to content

src: fix building --without-v8-platform #11088

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
mykmelez wants to merge 4 commits into from
Closed

src: fix building --without-v8-platform #11088

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c95606
src: declare v8_platform.platform_ unconditionally
mykmelez Jan 31, 2017
e619725
src: update v8_platform.StartInspector signature
mykmelez Jan 31, 2017
0e9c0cb
src: don't call tracing_agent->Start w/nullptr
mykmelez Feb 1, 2017
b93584b
src: refactor tracing_agent into v8_platform
mykmelez Feb 2, 2017
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
src: don't call tracing_agent->Start w/nullptr 
node::tracing::Agent::Start can't accept a nullptr argument
to its platform parameter, so don't call it when Node is compiled
with NODE_USE_V8_PLATFORM=0.
  • Loading branch information
@mykmelez
mykmelez committed Feb 1, 2017
commit 0e9c0cb7fa3ec9994724a991db8d067e70cb22fb
23 changes: 18 additions & 5 deletions src/node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,16 @@ static struct {
}
#endif // HAVE_INSPECTOR

void StartTracingAgent() {
tracing_agent = new tracing::Agent();
Copy link
Member

@bnoordhuis bnoordhuis Feb 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you make this a property of v8_platform while you're here (and call it tracing_agent_)? Maybe also insert a CHECK(tracing_agent_ == nullptr) to detect double calls.

Copy link
Contributor Author

@mykmelez mykmelez Feb 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I've done both of these things in b93584b. In the process, I also spotted another direct call to tracing_agent->Stop() and replaced it with a call to v8_platform.StopTracingAgent().

tracing_agent->Start(platform_, trace_enabled_categories);
}

void StopTracingAgent() {
tracing_agent->Stop();
}

v8::Platform* platform_;
#else // !NODE_USE_V8_PLATFORM
void Initialize(int thread_pool_size) {}
void PumpMessageLoop(Isolate* isolate) {}
Expand All @@ -237,9 +247,13 @@ static struct {
env->ThrowError("Node compiled with NODE_USE_V8_PLATFORM=0");
return false; // make compiler happy
}
#endif // !NODE_USE_V8_PLATFORM

v8::Platform* platform_;
void StartTracingAgent() {
fprintf(stderr, "Node compiled with NODE_USE_V8_PLATFORM=0, "
"so event tracing is not available.\n");
}
void StopTracingAgent() {}
#endif // !NODE_USE_V8_PLATFORM
} v8_platform;

#ifdef __POSIX__
Expand Down Expand Up @@ -4534,15 +4548,14 @@ int Start(int argc, char** argv) {
if (trace_enabled) {
fprintf(stderr, "Warning: Trace event is an experimental feature "
"and could change at any time.\n");
tracing_agent = new tracing::Agent();
tracing_agent->Start(v8_platform.platform_, trace_enabled_categories);
v8_platform.StartTracingAgent();
}
V8::Initialize();
v8_initialized = true;
const int exit_code =
Start(uv_default_loop(), argc, argv, exec_argc, exec_argv);
if (trace_enabled) {
tracing_agent->Stop();
v8_platform.StopTracingAgent();
}
v8_initialized = false;
V8::Dispose();
Expand Down