Commit 967fbeb
deps: cherry-pick 2363cdf from upstream V8
Original commit message:
[tracing] do not add traces when disabled
#21038
Change-Id: Ic4c9f403b5e54a97d3170b2311dd5aab8c8357c8
Reviewed-on: https://chromium-review.googlesource.com/1217726
Commit-Queue: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-by: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#55809}
Refs: v8/v8@2363cdf
PR-URL: #22812
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Eugene Ostroukhov <eostroukhov@google.com>1 parent 0c39fa4 commit 967fbeb
2 files changed
Lines changed: 19 additions & 15 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -29,7 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | 30 | # Reset this number to 0 on major V8 upgrades. | |
| 31 | 31 | # Increment by one for each non-official patch applied to deps/v8. | |
| 32 | - 'v8_embedder_string': '-node.25', | ||
| 32 | + 'v8_embedder_string': '-node.26', | ||
| 33 | 33 | ||
| 34 | 34 | # Enable disassembler for `--print-code` v8 options | |
| 35 | 35 | 'v8_enable_disassembler': 1, | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -63,13 +63,15 @@ uint64_t TracingController::AddTraceEvent( | |||
| 63 | 63 | const uint64_t* arg_values, | |
| 64 | 64 | std::unique_ptr<v8::ConvertableToTraceFormat>* arg_convertables, | |
| 65 | 65 | unsigned int flags) { | |
| 66 | - uint64_t handle; | ||
| 67 | - TraceObject* trace_object = trace_buffer_->AddTraceEvent(&handle); | ||
| 68 | - if (trace_object) { | ||
| 69 | - trace_object->Initialize( | ||
| 70 | - phase, category_enabled_flag, name, scope, id, bind_id, num_args, | ||
| 71 | - arg_names, arg_types, arg_values, arg_convertables, flags, | ||
| 72 | - CurrentTimestampMicroseconds(), CurrentCpuTimestampMicroseconds()); | ||
| 66 | + uint64_t handle = 0; | ||
| 67 | + if (mode_ != DISABLED) { | ||
| 68 | + TraceObject* trace_object = trace_buffer_->AddTraceEvent(&handle); | ||
| 69 | + if (trace_object) { | ||
| 70 | + trace_object->Initialize( | ||
| 71 | + phase, category_enabled_flag, name, scope, id, bind_id, num_args, | ||
| 72 | + arg_names, arg_types, arg_values, arg_convertables, flags, | ||
| 73 | + CurrentTimestampMicroseconds(), CurrentCpuTimestampMicroseconds()); | ||
| 74 | + } | ||
| 73 | 75 | } | |
| 74 | 76 | return handle; | |
| 75 | 77 | } | |
@@ -81,13 +83,15 @@ uint64_t TracingController::AddTraceEventWithTimestamp( | |||
| 81 | 83 | const uint64_t* arg_values, | |
| 82 | 84 | std::unique_ptr<v8::ConvertableToTraceFormat>* arg_convertables, | |
| 83 | 85 | unsigned int flags, int64_t timestamp) { | |
| 84 | - uint64_t handle; | ||
| 85 | - TraceObject* trace_object = trace_buffer_->AddTraceEvent(&handle); | ||
| 86 | - if (trace_object) { | ||
| 87 | - trace_object->Initialize(phase, category_enabled_flag, name, scope, id, | ||
| 88 | - bind_id, num_args, arg_names, arg_types, | ||
| 89 | - arg_values, arg_convertables, flags, timestamp, | ||
| 90 | - CurrentCpuTimestampMicroseconds()); | ||
| 86 | + uint64_t handle = 0; | ||
| 87 | + if (mode_ != DISABLED) { | ||
| 88 | + TraceObject* trace_object = trace_buffer_->AddTraceEvent(&handle); | ||
| 89 | + if (trace_object) { | ||
| 90 | + trace_object->Initialize(phase, category_enabled_flag, name, scope, id, | ||
| 91 | + bind_id, num_args, arg_names, arg_types, | ||
| 92 | + arg_values, arg_convertables, flags, timestamp, | ||
| 93 | + CurrentCpuTimestampMicroseconds()); | ||
| 94 | + } | ||
| 91 | 95 | } | |
| 92 | 96 | return handle; | |
| 93 | 97 | } | |
0 commit comments