github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: cleanup macro usage

Browse Source
This commit is contained in:
deepak1556
2026-03-31 22:48:25 +09:00
parent 15416ef8e4
commit 26f169d9d1
5 changed files with 47 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/node/api_remove_deprecated_getisolate.patch
View File

@@ -133,10 +133,10 @@ index 6fe4f0492dc1f3eaf576c8ff7866080a54cb81c1..41e8e052ff81df78ece87163b0499966
// Recreate the buffer in the constructor.
InternalFieldInfo* casted_info = static_cast<InternalFieldInfo*>(info);
diff --git a/src/env.cc b/src/env.cc
index a0ea0d9c331086df688cb1fbcfe0071af0653548..e4b9f29ebfb7599a106c8e209950caf18b59d2a3 100644
index 57a46c8be2e052b298ed841eed6f291d62711750..e4ffaa465a4ffe21334496c52334fcb1404f67a9 100644
--- a/src/env.cc
+++ b/src/env.cc
@@ -1774,10 +1774,10 @@ void AsyncHooks::Deserialize(Local<Context> context) {
@@ -1764,10 +1764,10 @@ void AsyncHooks::Deserialize(Local<Context> context) {
context->GetDataFromSnapshotOnce<Array>(
info_->js_execution_async_resources).ToLocalChecked();
} else {
@@ -149,7 +149,7 @@ index a0ea0d9c331086df688cb1fbcfe0071af0653548..e4b9f29ebfb7599a106c8e209950caf1
// The native_execution_async_resources_ field requires v8::Local<> instances
// for async calls whose resources were on the stack as JS objects when they
@@ -1817,7 +1817,7 @@ AsyncHooks::SerializeInfo AsyncHooks::Serialize(Local<Context> context,
@@ -1807,7 +1807,7 @@ AsyncHooks::SerializeInfo AsyncHooks::Serialize(Local<Context> context,
info.async_id_fields = async_id_fields_.Serialize(context, creator);
if (!js_execution_async_resources_.IsEmpty()) {
info.js_execution_async_resources = creator->AddData(
@@ -458,7 +458,7 @@ index fea0426496978c0003fe1481afcf93fc9c23edca..c9588880d05435ab9f4e23fcff74c933
CHECK(
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
index d54ef53c9b58017673dc22c84d41ca9682b7a7cd..fe8e2ebed1e69cd947f48913787c99e58d56043d 100644
index 986a2d8da7fd04b5d4060d9c8d44c61a231dcce6..9f11d32c70366524cf3b7c1cfdfd24f31e438e7b 100644
--- a/src/node_contextify.cc
+++ b/src/node_contextify.cc
@@ -113,7 +113,7 @@ namespace {
@@ -479,7 +479,7 @@ index d54ef53c9b58017673dc22c84d41ca9682b7a7cd..fe8e2ebed1e69cd947f48913787c99e5
PropertyAttribute attributes = PropertyAttribute::None;
bool is_declared =
@@ -1670,7 +1670,7 @@ static MaybeLocal<Function> CompileFunctionForCJSLoader(
@@ -1665,7 +1665,7 @@ static MaybeLocal<Function> CompileFunctionForCJSLoader(
bool* cache_rejected,
bool is_cjs_scope,
ScriptCompiler::CachedData* cached_data) {
@@ -533,10 +533,10 @@ index 55a0c986c5b6989ee9ce277bb6a9778abb2ad2ee..809d88f21e5572807e38132d40ee7587
READONLY_PROPERTY(target, "exitCodes", exit_codes);
diff --git a/src/node_file.cc b/src/node_file.cc
index fed1a6754b3c636e0eb1150c3ef6a720d9b4a439..5619c1691fb3e14176c7e11a6d6f4f014dd86fb4 100644
index c7a9648b0f83e910190dc620f4b72577ffde6c44..46cd16b535d9bd651ef733ca52ea58db7d39b09f 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -3863,7 +3863,7 @@ void BindingData::Deserialize(Local<Context> context,
@@ -3857,7 +3857,7 @@ void BindingData::Deserialize(Local<Context> context,
int index,
InternalFieldInfoBase* info) {
DCHECK_IS_SNAPSHOT_SLOT(index);

90
patches/node/build_enable_perfetto.patch
View File

@@ -194,50 +194,41 @@ index f5cd416b5fe7a51084bc4af9a4427a8e62599fd8..b7072ce74354495bec49357f962f4ef2
'src/tracing/traced_value.h',
'src/timer_wrap.h',
diff --git a/src/async_wrap.cc b/src/async_wrap.cc
index 301f77c419f178c4eea258e0896327f69389dda7..ce68398fc2d071db10ac1aa2093f67da1586f1ae 100644
index 301f77c419f178c4eea258e0896327f69389dda7..d5068a18392a6128ceee7f0146f8f9c77f9924bb 100644
--- a/src/async_wrap.cc
+++ b/src/async_wrap.cc
@@ -110,8 +110,12 @@ void AsyncWrap::EmitPromiseResolve(Environment* env, double async_id) {
@@ -110,8 +110,7 @@ void AsyncWrap::EmitPromiseResolve(Environment* env, double async_id) {
}
void AsyncWrap::EmitTraceAsyncStart() const {
+#if defined(V8_USE_PERFETTO)
+ if (TRACE_EVENT_CATEGORY_ENABLED(TRACING_CATEGORY_NODE1(async_hooks))) {
+#else
if (*TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
TRACING_CATEGORY_NODE1(async_hooks))) {
+#endif
- if (*TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
- TRACING_CATEGORY_NODE1(async_hooks))) {
+ if (NODE_TRACE_CATEGORY_ENABLED(TRACING_CATEGORY_NODE1(async_hooks))) {
tracing::AsyncWrapArgs data(env()->execution_async_id(),
get_trigger_async_id());
TRACE_EVENT_NESTABLE_ASYNC_BEGIN1(TRACING_CATEGORY_NODE1(async_hooks),
diff --git a/src/env.cc b/src/env.cc
index fdabe48dd7776c59298f7d972286d0d2ed062752..6610147d21df510e5badbc6f83d506abc807c4eb 100644
index fdabe48dd7776c59298f7d972286d0d2ed062752..c185d822b29c0b691bbf5f724f71f59638c6184d 100644
--- a/src/env.cc
+++ b/src/env.cc
@@ -650,8 +650,13 @@ void TrackingTraceStateObserver::UpdateTraceCategoryState() {
@@ -650,8 +650,8 @@ void TrackingTraceStateObserver::UpdateTraceCategoryState() {
return;
}
+#if defined(V8_USE_PERFETTO)
- bool async_hooks_enabled = (*(TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
- TRACING_CATEGORY_NODE1(async_hooks)))) != 0;
+ bool async_hooks_enabled =
+ TRACE_EVENT_CATEGORY_ENABLED(TRACING_CATEGORY_NODE1(async_hooks));
+#else
bool async_hooks_enabled = (*(TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
TRACING_CATEGORY_NODE1(async_hooks)))) != 0;
+#endif
+ NODE_TRACE_CATEGORY_ENABLED(TRACING_CATEGORY_NODE1(async_hooks));
Isolate* isolate = env_->isolate();
HandleScope handle_scope(isolate);
@@ -893,8 +898,12 @@ Environment::Environment(IsolateData* isolate_data,
@@ -893,8 +893,7 @@ Environment::Environment(IsolateData* isolate_data,
time_origin_timestamp_,
MAYBE_FIELD_PTR(env_info, performance_state));
+#if defined(V8_USE_PERFETTO)
+ if (TRACE_EVENT_CATEGORY_ENABLED(TRACING_CATEGORY_NODE1(environment))) {
+#else
if (*TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
TRACING_CATEGORY_NODE1(environment)) != 0) {
+#endif
- if (*TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
- TRACING_CATEGORY_NODE1(environment)) != 0) {
+ if (NODE_TRACE_CATEGORY_ENABLED(TRACING_CATEGORY_NODE1(environment))) {
tracing::EnvironmentArgs traced_value(args, exec_args);
TRACE_EVENT_NESTABLE_ASYNC_BEGIN1(TRACING_CATEGORY_NODE1(environment),
"Environment",
@@ -294,38 +285,30 @@ index 0bc086ccd1ff449c0f3fb08a972a0c45d3178f1c..ca74e83ef6f7b0e8b8496457af3813f0
bool use_wasm_trap_handler =
!per_process::cli_options->disable_wasm_trap_handler;
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
index 3c234205e89be7e976dae5c3fcc73ca67953e034..d54ef53c9b58017673dc22c84d41ca9682b7a7cd 100644
index 3c234205e89be7e976dae5c3fcc73ca67953e034..986a2d8da7fd04b5d4060d9c8d44c61a231dcce6 100644
--- a/src/node_contextify.cc
+++ b/src/node_contextify.cc
@@ -1026,8 +1026,12 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
@@ -1026,8 +1026,7 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
ContextifyScript* contextify_script = New(env, args.This());
+#if defined(V8_USE_PERFETTO)
+ if (TRACE_EVENT_CATEGORY_ENABLED(TRACING_CATEGORY_NODE2(vm, script))) {
+#else
if (*TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
TRACING_CATEGORY_NODE2(vm, script)) != 0) {
+#endif
- if (*TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
- TRACING_CATEGORY_NODE2(vm, script)) != 0) {
+ if (NODE_TRACE_CATEGORY_ENABLED(TRACING_CATEGORY_NODE2(vm, script))) {
Utf8Value fn(isolate, filename);
TRACE_EVENT_BEGIN1(TRACING_CATEGORY_NODE2(vm, script),
"ContextifyScript::New",
diff --git a/src/node_dir.cc b/src/node_dir.cc
index c9173d404c79a69743fc75ddb6bba0ac9579c1ef..39963ed01cd8c86a9524a2ef87768c9256116d55 100644
index c9173d404c79a69743fc75ddb6bba0ac9579c1ef..8ffac047a69b3900f37d712334c504a1c65c83fd 100644
--- a/src/node_dir.cc
+++ b/src/node_dir.cc
@@ -60,19 +60,32 @@ static const char* get_dir_func_name_by_type(uv_fs_type req_type) {
}
@@ -61,18 +61,25 @@ static const char* get_dir_func_name_by_type(uv_fs_type req_type) {
#define TRACE_NAME(name) "fs_dir.sync." #name
+#if defined(V8_USE_PERFETTO)
+#define GET_TRACE_ENABLED \
+ TRACE_EVENT_CATEGORY_ENABLED(TRACING_CATEGORY_NODE2(fs_dir, sync))
+#else
#define GET_TRACE_ENABLED \
(*TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED( \
TRACING_CATEGORY_NODE2(fs_dir, sync)) != 0)
+#endif
- (*TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED( \
- TRACING_CATEGORY_NODE2(fs_dir, sync)) != 0)
+ NODE_TRACE_CATEGORY_ENABLED(TRACING_CATEGORY_NODE2(fs_dir, sync))
#define FS_DIR_SYNC_TRACE_BEGIN(syscall, ...) \
if (GET_TRACE_ENABLED) \
TRACE_EVENT_BEGIN(TRACING_CATEGORY_NODE2(fs_dir, sync), \
@@ -348,21 +331,16 @@ index c9173d404c79a69743fc75ddb6bba0ac9579c1ef..39963ed01cd8c86a9524a2ef87768c92
#define FS_DIR_ASYNC_TRACE_BEGIN0(fs_type, id) \
TRACE_EVENT_NESTABLE_ASYNC_BEGIN0(TRACING_CATEGORY_NODE2(fs_dir, async), \
diff --git a/src/node_file.cc b/src/node_file.cc
index 96aac2d86695732bf6805f2ad2168a62241b5045..fed1a6754b3c636e0eb1150c3ef6a720d9b4a439 100644
index 96aac2d86695732bf6805f2ad2168a62241b5045..c7a9648b0f83e910190dc620f4b72577ffde6c44 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -146,17 +146,30 @@ static const char* get_fs_func_name_by_type(uv_fs_type req_type) {
}
@@ -147,16 +147,23 @@ static const char* get_fs_func_name_by_type(uv_fs_type req_type) {
#define TRACE_NAME(name) "fs.sync." #name
+#if defined(V8_USE_PERFETTO)
+#define GET_TRACE_ENABLED \
+ TRACE_EVENT_CATEGORY_ENABLED(TRACING_CATEGORY_NODE2(fs, sync))
+#else
#define GET_TRACE_ENABLED \
(*TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED( \
TRACING_CATEGORY_NODE2(fs, sync)) != 0)
+#endif
- (*TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED( \
- TRACING_CATEGORY_NODE2(fs, sync)) != 0)
+ NODE_TRACE_CATEGORY_ENABLED(TRACING_CATEGORY_NODE2(fs, sync))
#define FS_SYNC_TRACE_BEGIN(syscall, ...) \
if (GET_TRACE_ENABLED) \
TRACE_EVENT_BEGIN( \
@@ -383,10 +361,10 @@ index 96aac2d86695732bf6805f2ad2168a62241b5045..fed1a6754b3c636e0eb1150c3ef6a720
#define FS_ASYNC_TRACE_BEGIN0(fs_type, id) \
TRACE_EVENT_NESTABLE_ASYNC_BEGIN0(TRACING_CATEGORY_NODE2(fs, async), \
diff --git a/src/node_internals.h b/src/node_internals.h
index 8e930a6fecd6589b858293d91b2454ea14ae7c73..d3eb6898bc7a2b6a17f5a529854ee8fb5e490d0a 100644
index 8e930a6fecd6589b858293d91b2454ea14ae7c73..a95dd02d4149a02ff40c759010e130c89ad1d848 100644
--- a/src/node_internals.h
+++ b/src/node_internals.h
@@ -315,6 +315,12 @@ class ThreadPoolWork {
@@ -315,6 +315,14 @@ class ThreadPoolWork {
const char* type_;
};
@@ -395,14 +373,18 @@ index 8e930a6fecd6589b858293d91b2454ea14ae7c73..d3eb6898bc7a2b6a17f5a529854ee8fb
+#define TRACING_CATEGORY_NODE "node"
+#define TRACING_CATEGORY_NODE1(one) "node." #one
+#define TRACING_CATEGORY_NODE2(one, two) "node." #one "." #two
+#define NODE_TRACE_CATEGORY_ENABLED(category) \
+ TRACE_EVENT_CATEGORY_ENABLED(category)
+#else
#define TRACING_CATEGORY_NODE "node"
#define TRACING_CATEGORY_NODE1(one) \
TRACING_CATEGORY_NODE "," \
@@ -323,6 +329,7 @@ class ThreadPoolWork {
@@ -323,6 +331,9 @@ class ThreadPoolWork {
TRACING_CATEGORY_NODE "," \
TRACING_CATEGORY_NODE "." #one "," \
TRACING_CATEGORY_NODE "." #one "." #two
+#define NODE_TRACE_CATEGORY_ENABLED(category) \
+ (*TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(category) != 0)
+#endif
// Functions defined in node.cc that are exposed via the bootstrapper object

4
patches/node/fix_suppress_nodiscard_warning_for_copy_options_operator.patch
View File

@@ -7,10 +7,10 @@ libc++ added [[nodiscard]] to std::filesystem::copy_options operator|=
which causes build failures with -Werror.
diff --git a/src/node_file.cc b/src/node_file.cc
index 5619c1691fb3e14176c7e11a6d6f4f014dd86fb4..6c37b11d907b479905bf51beea1ec7d039a8d7f4 100644
index 46cd16b535d9bd651ef733ca52ea58db7d39b09f..7a7c71a0fcbb71e1c3dfcac7a00da207c4c3bf56 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -3473,11 +3473,11 @@ static void CpSyncCopyDir(const FunctionCallbackInfo<Value>& args) {
@@ -3467,11 +3467,11 @@ static void CpSyncCopyDir(const FunctionCallbackInfo<Value>& args) {
auto file_copy_opts = std::filesystem::copy_options::recursive;
if (force) {

2
patches/node/refactor_attach_cppgc_heap_on_v8_isolate_creation.patch
View File

@@ -89,7 +89,7 @@ index fb2af584a4ae777022c9ef8c20ada1edcbbbefdc..fe6300a5d5d2d6602a84cbd33736c213
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
diff --git a/src/env.cc b/src/env.cc
index 6610147d21df510e5badbc6f83d506abc807c4eb..a0ea0d9c331086df688cb1fbcfe0071af0653548 100644
index c185d822b29c0b691bbf5f724f71f59638c6184d..57a46c8be2e052b298ed841eed6f291d62711750 100644
--- a/src/env.cc
+++ b/src/env.cc
@@ -611,7 +611,7 @@ IsolateData::~IsolateData() {}

2
patches/node/src_stop_using_v8_propertycallbackinfo_t_this.patch
View File

@@ -19,7 +19,7 @@ index 2c95ac99be70b0750372e9c858753bf519498e3d..5ab30502fd232196739ca2b450e35cc9
Local<Module> module = obj->module_.Get(isolate);
if (module->GetStatus() < Module::kInstantiated) {
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
index fe8e2ebed1e69cd947f48913787c99e58d56043d..daa4cb39a80ab298370bf0b91750f617bd6cc719 100644
index 9f11d32c70366524cf3b7c1cfdfd24f31e438e7b..3f1772b62aa0300540d25fb93012c49bce9d8134 100644
--- a/src/node_contextify.cc
+++ b/src/node_contextify.cc
@@ -460,7 +460,7 @@ ContextifyContext* ContextifyContext::Get(const PropertyCallbackInfo<T>& args) {