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
src: refactor tracing_agent into v8_platform 
Move tracing_agent global into the v8_platform struct, renaming it to
tracing_agent_; CHECK(tracing_agent_ == nullptr) in StartTracingAgent()
to detect double calls; and relace another tracing_agent->Stop() call
with a call to StopTracingAgent().
  • Loading branch information
@mykmelez
mykmelez committed Feb 2, 2017
commit b93584b6e32cd137ec32f0e90085991b1fcfa0ff
11 changes: 6 additions & 5 deletions src/node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ static uv_async_t dispatch_debug_messages_async;

static Mutex node_isolate_mutex;
static v8::Isolate* node_isolate;
static tracing::Agent* tracing_agent;

static node::DebugOptions debug_options;

Expand Down Expand Up @@ -229,15 +228,17 @@ static struct {
#endif // HAVE_INSPECTOR

void StartTracingAgent() {
tracing_agent = new tracing::Agent();
tracing_agent->Start(platform_, trace_enabled_categories);
CHECK(tracing_agent_ == nullptr);
tracing_agent_ = new tracing::Agent();
tracing_agent_->Start(platform_, trace_enabled_categories);
}

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

v8::Platform* platform_;
tracing::Agent* tracing_agent_;
#else // !NODE_USE_V8_PLATFORM
void Initialize(int thread_pool_size) {}
void PumpMessageLoop(Isolate* isolate) {}
Expand Down Expand Up @@ -3401,7 +3402,7 @@ void SetupProcessObject(Environment* env,
void SignalExit(int signo) {
uv_tty_reset_mode();
if (trace_enabled) {
tracing_agent->Stop();
v8_platform.StopTracingAgent();
}
#ifdef __FreeBSD__
// FreeBSD has a nasty bug, see RegisterSignalHandler for details
Expand Down