diff options
| author | Kelvin Jin <kelvinjin@google.com> | 2018-12-10 20:44:18 +0000 |
|---|---|---|
| committer | Ali Ijaz Sheikh <ofrobots@google.com> | 2019-02-14 12:10:09 -0800 |
| commit | 582c0d5a092b04616fef4b11b0fd893c181356f1 (patch) | |
| tree | 9b81e3e3d701e561f957c09adb200ca95198865d /src/tracing | |
| parent | 7d60b6b21b7d47d22ac7a321eb5b47cf90d63ecf (diff) | |
| download | android-node-v8-582c0d5a092b04616fef4b11b0fd893c181356f1.tar.gz android-node-v8-582c0d5a092b04616fef4b11b0fd893c181356f1.tar.bz2 android-node-v8-582c0d5a092b04616fef4b11b0fd893c181356f1.zip | |
trace_events: fix trace events JS API writing
The Trace Events JS API isn't functional if none of
--trace-events-enabled or --trace-event-categories is passed as a CLI
argument. This commit fixes that.
In addition, we currently don't test the trace_events JS API in the
casewhere no CLI args are provided. This commit adds that test.
Fixes https://github.com/nodejs/node/issues/24944
PR-URL: https://github.com/nodejs/node/pull/24945
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Diffstat (limited to 'src/tracing')
| -rw-r--r-- | src/tracing/agent.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/tracing/agent.h b/src/tracing/agent.h index 2e95e38582..0039cc3679 100644 --- a/src/tracing/agent.h +++ b/src/tracing/agent.h @@ -59,6 +59,8 @@ class AgentWriterHandle { inline void Enable(const std::set<std::string>& categories); inline void Disable(const std::set<std::string>& categories); + inline bool IsDefaultHandle(); + inline Agent* agent() { return agent_; } inline v8::TracingController* GetTracingController(); @@ -175,6 +177,10 @@ void AgentWriterHandle::Disable(const std::set<std::string>& categories) { if (agent_ != nullptr) agent_->Disable(id_, categories); } +bool AgentWriterHandle::IsDefaultHandle() { + return agent_ != nullptr && id_ == Agent::kDefaultHandleId; +} + inline v8::TracingController* AgentWriterHandle::GetTracingController() { return agent_ != nullptr ? agent_->GetTracingController() : nullptr; } |