Skip to content

build,win: fix Perfetto #66876

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

Open
aduh95 wants to merge 2 commits into
base: main
Choose a base branch
from
+20 −2
Open

build,win: fix Perfetto #66876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4da6378
deps: V8: cherry-pick 785a2ea88a90
aduh95 Oct 16, 2026
a38fb73
build,win: fix Perfetto
StefanStojanovic Sep 9, 2026
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
2 changes: 1 addition & 1 deletion common.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.9',
'v8_embedder_string': '-node.10',

##### V8 defaults for Node.js #####

Expand Down
8 changes: 8 additions & 0 deletions deps/perfetto/perfetto.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
'sources': [
'<@(perfetto_sdk_sources)',
],
'conditions': [
['OS=="win"', {
'defines': [
'WIN32_LEAN_AND_MEAN',
'NOMINMAX',
],
}],
],
},
]
}
2 changes: 2 additions & 0 deletions deps/v8/include/libplatform/v8-tracing.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class TraceEventListener;

const int kTraceMaxNumArgs = 2;

#if !defined(V8_USE_PERFETTO)
class V8_PLATFORM_EXPORT TraceObject {
public:
union ArgValue {
Expand Down Expand Up @@ -176,6 +177,7 @@ class V8_PLATFORM_EXPORT TraceBuffer {
TraceBuffer(const TraceBuffer&) = delete;
void operator=(const TraceBuffer&) = delete;
};
#endif // !defined(V8_USE_PERFETTO)

// Options determines how the trace buffer stores data.
enum TraceRecordMode {
Expand Down
1 change: 1 addition & 0 deletions deps/v8/test/benchmarks/cpp/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ if (v8_enable_google_benchmark) {
"//:v8",
"//:v8_internal_headers",
"//:v8_libbase",
"//:v8_tracing",
"//third_party/google_benchmark_chrome:google_benchmark",
]
}
Expand Down
4 changes: 3 additions & 1 deletion deps/v8/test/cctest/test-cpu-profiler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2955,9 +2955,11 @@ TEST(DeoptUntrackedFunction) {
iprofiler->DeleteProfile(iprofile);
}

using v8::platform::tracing::TraceBuffer;
using v8::platform::tracing::TraceConfig;
#if !defined(V8_USE_PERFETTO)
using v8::platform::tracing::TraceBuffer;
using v8::platform::tracing::TraceObject;
#endif // !defined(V8_USE_PERFETTO)

namespace {

Expand Down
5 changes: 5 additions & 0 deletions node.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@
[ 'OS=="linux" and target_arch=="s390x"', {
'cflags': [ '-march=z14' ],
}],
[ 'v8_use_perfetto==1 and node_shared_perfetto=="false"', {
'dependencies': [
'deps/perfetto/perfetto.gyp:perfetto_sdk',
],
}],
[ 'node_enable_d8=="true"', {
'dependencies': [ 'tools/v8_gypfiles/d8.gyp:d8' ],
}],
Expand Down
Loading