Skip to content

Commit fc1770b

Browse files
committed
deps: cherry-pick bf5ea81 from upstream V8
Original commit message: [tracing] allow dynamic control of tracing If the trace_buffer_ was null, we were returning a pointer to a static flag back that permanently disabled that particular trace point. This implied an assumption that tracing will be statically enabled at process startup, and once it is disabled, it will never be enabled again. On Node.js side we want to dynamically enable/disable tracing as per programmer intent. Change-Id: Ic7a7839b8450ab5c356d85e8e0826f42824907f4 Reviewed-on: https://chromium-review.googlesource.com/1161518 Reviewed-by: Yang Guo <yangguo@chromium.org> Commit-Queue: Ali Ijaz Sheikh <ofrobots@google.com> Cr-Commit-Position: refs/heads/master@{#54903} Refs: v8/v8@bf5ea81 PR-URL: #21983 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 7766baf commit fc1770b

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
# Reset this number to 0 on major V8 upgrades.
3131
# Increment by one for each non-official patch applied to deps/v8.
32-
'v8_embedder_string': '-node.6',
32+
'v8_embedder_string': '-node.7',
3333

3434
# Enable disassembler for `--print-code` v8 options
3535
'v8_enable_disassembler': 1,

deps/v8/src/libplatform/tracing/tracing-controller.cc

+4-9
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,17 @@ namespace tracing {
2424
// convert internally to determine the category name from the char enabled
2525
// pointer.
2626
const char* g_category_groups[MAX_CATEGORY_GROUPS] = {
27-
"toplevel", "tracing already shutdown",
27+
"toplevel",
2828
"tracing categories exhausted; must increase MAX_CATEGORY_GROUPS",
2929
"__metadata"};
3030

3131
// The enabled flag is char instead of bool so that the API can be used from C.
3232
unsigned char g_category_group_enabled[MAX_CATEGORY_GROUPS] = {0};
3333
// Indexes here have to match the g_category_groups array indexes above.
34-
const int g_category_already_shutdown = 1;
35-
const int g_category_categories_exhausted = 2;
34+
const int g_category_categories_exhausted = 1;
3635
// Metadata category not used in V8.
37-
// const int g_category_metadata = 3;
38-
const int g_num_builtin_categories = 4;
36+
// const int g_category_metadata = 2;
37+
const int g_num_builtin_categories = 3;
3938

4039
// Skip default categories.
4140
v8::base::AtomicWord g_category_index = g_num_builtin_categories;
@@ -103,10 +102,6 @@ void TracingController::UpdateTraceEventDuration(
103102

104103
const uint8_t* TracingController::GetCategoryGroupEnabled(
105104
const char* category_group) {
106-
if (!trace_buffer_) {
107-
DCHECK(!g_category_group_enabled[g_category_already_shutdown]);
108-
return &g_category_group_enabled[g_category_already_shutdown];
109-
}
110105
return GetCategoryGroupEnabledInternal(category_group);
111106
}
112107

0 commit comments

Comments
 (0)