From 69a54045089fbe48177daa9a9d50483bedba6d57 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 19 May 2021 21:06:23 +0200 Subject: [PATCH] src: clean up embedder API https://github.com/nodejs/node/pull/35897 --- ...use_tracing_tracingcontroller_instead.patch | 6 +++--- ..._to_provide_a_custom_pageallocator_to.patch | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch b/patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch index 5993ef263f023..b5ffb975429f9 100644 --- a/patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch +++ b/patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch @@ -33,12 +33,12 @@ index 34a16feaed229a59181e1b2e48b0e111d5b0b2a6..a649f52403659fd18898e1e813f97e32 class TracingController; } -@@ -522,6 +523,8 @@ NODE_DEPRECATED("Use GetMultiIsolatePlatform(env) instead", +@@ -484,6 +484,8 @@ NODE_EXTERN v8::MaybeLocal PrepareStackTraceCallback( NODE_EXTERN MultiIsolatePlatform* GetMultiIsolatePlatform(Environment* env); NODE_EXTERN MultiIsolatePlatform* GetMultiIsolatePlatform(IsolateData* env); +NODE_EXTERN node::tracing::Agent* CreateAgent(); + - // Legacy variants of MultiIsolatePlatform::Create(). - NODE_DEPRECATED("Use variant taking a v8::TracingController* pointer instead", + NODE_DEPRECATED("Use MultiIsolatePlatform::Create() instead", NODE_EXTERN MultiIsolatePlatform* CreatePlatform( + int thread_pool_size, diff --git a/patches/node/src_allow_embedders_to_provide_a_custom_pageallocator_to.patch b/patches/node/src_allow_embedders_to_provide_a_custom_pageallocator_to.patch index 45ee02c33857e..97dc71f40886a 100644 --- a/patches/node/src_allow_embedders_to_provide_a_custom_pageallocator_to.patch +++ b/patches/node/src_allow_embedders_to_provide_a_custom_pageallocator_to.patch @@ -48,16 +48,16 @@ index b646fdda58ebcbf2dd92ee4fc9cb0d9c039174d1..14893ad605b9f8c64b0b8fc28625e235 }; enum IsolateSettingsFlags { -@@ -536,7 +537,8 @@ NODE_DEPRECATED("Use variant taking a v8::TracingController* pointer instead", - node::tracing::TracingController* tracing_controller)); - NODE_EXTERN MultiIsolatePlatform* CreatePlatform( - int thread_pool_size, -- v8::TracingController* tracing_controller); -+ v8::TracingController* tracing_controller, -+ v8::PageAllocator* = nullptr); - NODE_EXTERN void FreePlatform(MultiIsolatePlatform* platform); +@@ -490,7 +490,8 @@ NODE_EXTERN node::tracing::Agent* CreateAgent(); + NODE_DEPRECATED("Use MultiIsolatePlatform::Create() instead", + NODE_EXTERN MultiIsolatePlatform* CreatePlatform( + int thread_pool_size, +- v8::TracingController* tracing_controller)); ++ v8::TracingController* tracing_controller, ++ v8::PageAllocator* = nullptr)); + NODE_DEPRECATED("Use MultiIsolatePlatform::Create() instead", + NODE_EXTERN void FreePlatform(MultiIsolatePlatform* platform)); - // Get/set the currently active tracing controller. Using CreatePlatform() diff --git a/src/node_platform.cc b/src/node_platform.cc index aac0682670fcffd235fcf450bc5e2b0d45985b47..96be2281b562c44b276483970c06862250ea8941 100644 --- a/src/node_platform.cc