diff options
| author | Ujjwal Sharma <usharma1998@gmail.com> | 2019-03-15 18:35:06 +0530 |
|---|---|---|
| committer | Refael Ackermann <refack@gmail.com> | 2019-03-28 16:36:18 -0400 |
| commit | f579e1194046c50f2e6bb54348d48c8e7d1a53cf (patch) | |
| tree | 9125787c758358365f74f9fd9673c14f57e67870 /deps/v8/src/tracing/trace-event.h | |
| parent | 2c73868b0471fbd4038f500d076df056cbf697fe (diff) | |
| download | node-new-f579e1194046c50f2e6bb54348d48c8e7d1a53cf.tar.gz | |
deps: update V8 to 7.4.288.13
PR-URL: https://github.com/nodejs/node/pull/26685
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Diffstat (limited to 'deps/v8/src/tracing/trace-event.h')
| -rw-r--r-- | deps/v8/src/tracing/trace-event.h | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/deps/v8/src/tracing/trace-event.h b/deps/v8/src/tracing/trace-event.h index 2f530f9279..3d4375e384 100644 --- a/deps/v8/src/tracing/trace-event.h +++ b/deps/v8/src/tracing/trace-event.h @@ -270,27 +270,6 @@ enum CategoryGroupEnabledFlags { INTERNAL_TRACE_EVENT_ADD_WITH_ID_AND_TIMESTAMP( \ phase, category_group, name, id, timestamp, flags, ##__VA_ARGS__) -// Enter and leave a context based on the current scope. -#define INTERNAL_TRACE_EVENT_SCOPED_CONTEXT(category_group, name, context) \ - struct INTERNAL_TRACE_EVENT_UID(ScopedContext) { \ - public: \ - INTERNAL_TRACE_EVENT_UID(ScopedContext)(uint64_t cid) : cid_(cid) { \ - TRACE_EVENT_ENTER_CONTEXT(category_group, name, cid_); \ - } \ - ~INTERNAL_TRACE_EVENT_UID(ScopedContext)() { \ - TRACE_EVENT_LEAVE_CONTEXT(category_group, name, cid_); \ - } \ - \ - private: \ - /* Local class friendly DISALLOW_COPY_AND_ASSIGN */ \ - INTERNAL_TRACE_EVENT_UID(ScopedContext) \ - (const INTERNAL_TRACE_EVENT_UID(ScopedContext)&) {} \ - void operator=(const INTERNAL_TRACE_EVENT_UID(ScopedContext)&) {} \ - uint64_t cid_; \ - }; \ - INTERNAL_TRACE_EVENT_UID(ScopedContext) \ - INTERNAL_TRACE_EVENT_UID(scoped_context)(context); - #define TRACE_EVENT_CALL_STATS_SCOPED(isolate, category_group, name) \ INTERNAL_TRACE_EVENT_CALL_STATS_SCOPED(isolate, category_group, name) @@ -646,9 +625,11 @@ class ScopedTracer { ScopedTracer() : p_data_(nullptr) {} ~ScopedTracer() { - if (p_data_ && *data_.category_group_enabled) + if (p_data_ && base::Relaxed_Load(reinterpret_cast<const base::Atomic8*>( + data_.category_group_enabled))) { TRACE_EVENT_API_UPDATE_TRACE_EVENT_DURATION( data_.category_group_enabled, data_.name, data_.event_handle); + } } void Initialize(const uint8_t* category_group_enabled, const char* name, |