chore: bump Node.js to v22.9.0 (#44281)
* chore: bump Node.js to v22.9.0
* build: drop base64 dep in GN build
https://github.com/nodejs/node/pull/52856
* build,tools: make addons tests work with GN
https://github.com/nodejs/node/pull/50737
* fs: add fast api for InternalModuleStat
https://github.com/nodejs/node/pull/51344
* src: move package_json_reader cache to c++
https://github.com/nodejs/node/pull/50322
* crypto: disable PKCS#1 padding for privateDecrypt
https://github.com/nodejs-private/node-private/pull/525
* src: move more crypto code to ncrypto
https://github.com/nodejs/node/pull/54320
* crypto: ensure valid point on elliptic curve in SubtleCrypto.importKey
https://github.com/nodejs/node/pull/50234
* src: shift more crypto impl details to ncrypto
https://github.com/nodejs/node/pull/54028
* src: switch crypto APIs to use Maybe<void>
https://github.com/nodejs/node/pull/54775
* crypto: remove DEFAULT_ENCODING
https://github.com/nodejs/node/pull/47182
* deps: update libuv to 1.47.0
https://github.com/nodejs/node/pull/50650
* build: fix conflict gyp configs
https://github.com/nodejs/node/pull/53605
* lib,src: drop --experimental-network-imports
https://github.com/nodejs/node/pull/53822
* esm: align sync and async load implementations
https://github.com/nodejs/node/pull/49152
* esm: remove unnecessary toNamespacedPath calls
https://github.com/nodejs/node/pull/53656
* module: detect ESM syntax by trying to recompile as SourceTextModule
https://github.com/nodejs/node/pull/52413
* test: adapt debugger tests to V8 11.4
https://github.com/nodejs/node/pull/49639
* lib: update usage of always on Atomics API
https://github.com/nodejs/node/pull/49639
* test: adapt test-fs-write to V8 internal changes
https://github.com/nodejs/node/pull/49639
* test: adapt to new V8 trusted memory spaces
https://github.com/nodejs/node/pull/50115
* deps: update libuv to 1.47.0
https://github.com/nodejs/node/pull/50650
* src: use non-deprecated v8::Uint8Array::kMaxLength
https://github.com/nodejs/node/pull/50115
* src: update default V8 platform to override functions with location
https://github.com/nodejs/node/pull/51362
* src: add missing TryCatch
https://github.com/nodejs/node/pull/51362
* lib,test: handle new Iterator global
https://github.com/nodejs/node/pull/51362
* src: use non-deprecated version of CreateSyntheticModule
https://github.com/nodejs/node/pull/50115
* src: remove calls to recently deprecated V8 APIs
https://github.com/nodejs/node/pull/52996
* src: use new V8 API to define stream accessor
https://github.com/nodejs/node/pull/53084
* src: do not use deprecated V8 API
https://github.com/nodejs/node/pull/53084
* src: do not use soon-to-be-deprecated V8 API
https://github.com/nodejs/node/pull/53174
* src: migrate to new V8 interceptors API
https://github.com/nodejs/node/pull/52745
* src: use supported API to get stalled TLA messages
https://github.com/nodejs/node/pull/51362
* module: print location of unsettled top-level await in entry points
https://github.com/nodejs/node/pull/51999
* test: make snapshot comparison more flexible
https://github.com/nodejs/node/pull/54375
* test: do not set concurrency on parallelized runs
https://github.com/nodejs/node/pull/52177
* src: move FromNamespacedPath to path.cc
https://github.com/nodejs/node/pull/53540
* test: adapt to new V8 trusted memory spaces
https://github.com/nodejs/node/pull/50115
* build: add option to enable clang-cl on Windows
https://github.com/nodejs/node/pull/52870
* chore: fixup patch indices
* chore: add/remove changed files
* esm: drop support for import assertions
https://github.com/nodejs/node/pull/54890
* build: compile with C++20 support
https://github.com/nodejs/node/pull/52838
* deps: update nghttp2 to 1.62.1
https://github.com/nodejs/node/pull/52966
* src: parse inspector profiles with simdjson
https://github.com/nodejs/node/pull/51783
* build: add GN build files
https://github.com/nodejs/node/pull/47637
* deps,lib,src: add experimental web storage
https://github.com/nodejs/node/pull/52435
* build: add missing BoringSSL dep
* src: rewrite task runner in c++
https://github.com/nodejs/node/pull/52609
* fixup! build: add GN build files
* src: stop using deprecated fields of v8::FastApiCallbackOptions
https://github.com/nodejs/node/pull/54077
* fix: shadow variable
* build: add back incorrectly removed SetAccessor patch
* fixup! fixup! build: add GN build files
* crypto: fix integer comparison in crypto for BoringSSL
* src,lib: reducing C++ calls of esm legacy main resolve
https://github.com/nodejs/node/pull/48325
* src: move more crypto_dh.cc code to ncrypto
https://github.com/nodejs/node/pull/54459
* chore: fixup GN files for previous commit
* src: move more crypto code to ncrypto
https://github.com/nodejs/node/pull/54320
* Fixup Perfetto ifdef guards
* fix: missing electron_natives dep
* fix: node_use_node_platform = false
* fix: include src/node_snapshot_stub.cc in libnode
* 5507047: [import-attributes] Remove support for import assertions
5507047
* fix: restore v8-sandbox.h in filenames.json
* fix: re-add original-fs generation logic
* fix: ngtcp2 openssl dep
* test: try removing NAPI_VERSION undef
* chore(deps): bump @types/node
* src: move more crypto_dh.cc code to ncrypto
https://github.com/nodejs/node/pull/54459
* esm: remove unnecessary toNamespacedPath calls
https://github.com/nodejs/node/pull/53656
* buffer: fix out of range for toString
https://github.com/nodejs/node/pull/54553
* lib: rewrite AsyncLocalStorage without async_hooks
https://github.com/nodejs/node/pull/48528
* module: print amount of load time of a cjs module
https://github.com/nodejs/node/pull/52213
* test: skip reproducible snapshot test on 32-bit
https://github.com/nodejs/node/pull/53592
* fixup! src: move more crypto_dh.cc code to ncrypto
* test: adjust emittedUntil return type
* chore: remove redundant wpt streams patch
* fixup! chore(deps): bump @types/node
* fix: gn executable name on Windows
* fix: build on Windows
* fix: rename conflicting win32 symbols in //third_party/sqlite
On Windows otherwise we get:
lld-link: error: duplicate symbol: sqlite3_win32_write_debug
>>> defined at .\..\..\third_party\electron_node\deps\sqlite\sqlite3.c:47987
>>> obj/third_party/electron_node/deps/sqlite/sqlite/sqlite3.obj
>>> defined at obj/third_party/sqlite\chromium_sqlite3/sqlite3_shim.obj
lld-link: error: duplicate symbol: sqlite3_win32_sleep
>>> defined at .\..\..\third_party\electron_node\deps\sqlite\sqlite3.c:48042
>>> obj/third_party/electron_node/deps/sqlite/sqlite/sqlite3.obj
>>> defined at obj/third_party/sqlite\chromium_sqlite3/sqlite3_shim.obj
lld-link: error: duplicate symbol: sqlite3_win32_is_nt
>>> defined at .\..\..\third_party\electron_node\deps\sqlite\sqlite3.c:48113
>>> obj/third_party/electron_node/deps/sqlite/sqlite/sqlite3.obj
>>> defined at obj/third_party/sqlite\chromium_sqlite3/sqlite3_shim.obj
lld-link: error: duplicate symbol: sqlite3_win32_utf8_to_unicode
>>> defined at .\..\..\third_party\electron_node\deps\sqlite\sqlite3.c:48470
>>> obj/third_party/electron_node/deps/sqlite/sqlite/sqlite3.obj
>>> defined at obj/third_party/sqlite\chromium_sqlite3/sqlite3_shim.obj
lld-link: error: duplicate symbol: sqlite3_win32_unicode_to_utf8
>>> defined at .\..\..\third_party\electron_node\deps\sqlite\sqlite3.c:48486
>>> obj/third_party/electron_node/deps/sqlite/sqlite/sqlite3.obj
>>> defined at obj/third_party/sqlite\chromium_sqlite3/sqlite3_shim.obj
lld-link: error: duplicate symbol: sqlite3_win32_mbcs_to_utf8
>>> defined at .\..\..\third_party\electron_node\deps\sqlite\sqlite3.c:48502
>>> obj/third_party/electron_node/deps/sqlite/sqlite/sqlite3.obj
>>> defined at obj/third_party/sqlite\chromium_sqlite3/sqlite3_shim.obj
lld-link: error: duplicate symbol: sqlite3_win32_mbcs_to_utf8_v2
>>> defined at .\..\..\third_party\electron_node\deps\sqlite\sqlite3.c:48518
>>> obj/third_party/electron_node/deps/sqlite/sqlite/sqlite3.obj
>>> defined at obj/third_party/sqlite\chromium_sqlite3/sqlite3_shim.obj
lld-link: error: duplicate symbol: sqlite3_win32_utf8_to_mbcs
>>> defined at .\..\..\third_party\electron_node\deps\sqlite\sqlite3.c:48534
>>> obj/third_party/electron_node/deps/sqlite/sqlite/sqlite3.obj
>>> defined at obj/third_party/sqlite\chromium_sqlite3/sqlite3_shim.obj
lld-link: error: duplicate symbol: sqlite3_win32_utf8_to_mbcs_v2
>>> defined at .\..\..\third_party\electron_node\deps\sqlite\sqlite3.c:48550
>>> obj/third_party/electron_node/deps/sqlite/sqlite/sqlite3.obj
>>> defined at obj/third_party/sqlite\chromium_sqlite3/sqlite3_shim.obj
* docs: remove unnecessary ts-expect-error after types bump
* src: move package resolver to c++
https://github.com/nodejs/node/pull/50322
* build: set ASAN detect_container_overflow=0
https://github.com/nodejs/node/issues/55584
* chore: fixup rebase
* test: disable failing ASAN test
* win: almost fix race detecting ESRCH in uv_kill
https://github.com/libuv/libuv/pull/4341
This commit is contained in:
parent
e3f2ca1425
commit
c63d0d61e7
73 changed files with 1378 additions and 3997 deletions
|
@ -12,6 +12,19 @@ adding associated guards there should be relatively small.
|
|||
|
||||
We should upstream this as it will eventually impact Node.js as well.
|
||||
|
||||
diff --git a/filenames.json b/filenames.json
|
||||
index 5af3886d8d3d74d31249a4d79030a8373b8dad52..8ab04d0b1b58454c6ea21f33870f9557f3a57b56 100644
|
||||
--- a/filenames.json
|
||||
+++ b/filenames.json
|
||||
@@ -739,8 +739,6 @@
|
||||
"src/tcp_wrap.h",
|
||||
"src/timers.h",
|
||||
"src/tracing/agent.h",
|
||||
- "src/tracing/node_trace_buffer.h",
|
||||
- "src/tracing/node_trace_writer.h",
|
||||
"src/tracing/trace_event.h",
|
||||
"src/tracing/trace_event_common.h",
|
||||
"src/tracing/traced_value.h",
|
||||
diff --git a/lib/internal/constants.js b/lib/internal/constants.js
|
||||
index 8d7204f6cb48f783adc4d1c1eb2de0c83b7fffe2..a154559a56bf383d3c26af523c9bb07b564ef600 100644
|
||||
--- a/lib/internal/constants.js
|
||||
|
@ -63,11 +76,62 @@ index 251f51ec454f9cba4023b8b6729241ee753aac13..1de8cac6e3953ce9cab9db03530da327
|
|||
}
|
||||
|
||||
module.exports = {
|
||||
diff --git a/node.gyp b/node.gyp
|
||||
index 11474953b186c7b3ec2edb0539f34572e6c551b7..eeaaef8a06cdc2d17e89f9c719f9922e6e04ce92 100644
|
||||
--- a/node.gyp
|
||||
+++ b/node.gyp
|
||||
@@ -174,7 +174,6 @@
|
||||
'src/timers.cc',
|
||||
'src/timer_wrap.cc',
|
||||
'src/tracing/agent.cc',
|
||||
- 'src/tracing/node_trace_buffer.cc',
|
||||
'src/tracing/node_trace_writer.cc',
|
||||
'src/tracing/trace_event.cc',
|
||||
'src/tracing/traced_value.cc',
|
||||
@@ -302,7 +301,6 @@
|
||||
'src/tcp_wrap.h',
|
||||
'src/timers.h',
|
||||
'src/tracing/agent.h',
|
||||
- 'src/tracing/node_trace_buffer.h',
|
||||
'src/tracing/node_trace_writer.h',
|
||||
'src/tracing/trace_event.h',
|
||||
'src/tracing/trace_event_common.h',
|
||||
diff --git a/src/inspector/tracing_agent.cc b/src/inspector/tracing_agent.cc
|
||||
index e7b6d3b3ea63bdc80e569f56209e958b4fcde328..b52d5b1c7293539315626cd67f794cce4cfd1760 100644
|
||||
--- a/src/inspector/tracing_agent.cc
|
||||
+++ b/src/inspector/tracing_agent.cc
|
||||
@@ -84,14 +84,14 @@ class InspectorTraceWriter : public node::tracing::AsyncTraceWriter {
|
||||
explicit InspectorTraceWriter(int frontend_object_id,
|
||||
std::shared_ptr<MainThreadHandle> main_thread)
|
||||
: frontend_object_id_(frontend_object_id), main_thread_(main_thread) {}
|
||||
-
|
||||
+#ifndef V8_USE_PERFETTO
|
||||
void AppendTraceEvent(
|
||||
v8::platform::tracing::TraceObject* trace_event) override {
|
||||
if (!json_writer_)
|
||||
json_writer_.reset(TraceWriter::CreateJSONTraceWriter(stream_, "value"));
|
||||
json_writer_->AppendTraceEvent(trace_event);
|
||||
}
|
||||
-
|
||||
+#endif
|
||||
void Flush(bool) override {
|
||||
if (!json_writer_)
|
||||
return;
|
||||
diff --git a/src/tracing/agent.cc b/src/tracing/agent.cc
|
||||
index 7ce59674356f9743438350949be42fa7ead2afbe..c5fedc3be86a77730c57321b9c73cc8e94a001d7 100644
|
||||
index 7ce59674356f9743438350949be42fa7ead2afbe..30bff4272ed8eb5146e3b73a4849c187177fc3bd 100644
|
||||
--- a/src/tracing/agent.cc
|
||||
+++ b/src/tracing/agent.cc
|
||||
@@ -50,7 +50,9 @@ using v8::platform::tracing::TraceWriter;
|
||||
@@ -2,7 +2,9 @@
|
||||
|
||||
#include <string>
|
||||
#include "trace_event.h"
|
||||
+#ifndef V8_USE_PERFETTO
|
||||
#include "tracing/node_trace_buffer.h"
|
||||
+#endif
|
||||
#include "debug_utils-inl.h"
|
||||
#include "env-inl.h"
|
||||
|
||||
@@ -50,7 +52,9 @@ using v8::platform::tracing::TraceWriter;
|
||||
using std::string;
|
||||
|
||||
Agent::Agent() : tracing_controller_(new TracingController()) {
|
||||
|
@ -77,7 +141,7 @@ index 7ce59674356f9743438350949be42fa7ead2afbe..c5fedc3be86a77730c57321b9c73cc8e
|
|||
|
||||
CHECK_EQ(uv_loop_init(&tracing_loop_), 0);
|
||||
CHECK_EQ(uv_async_init(&tracing_loop_,
|
||||
@@ -86,10 +88,14 @@ Agent::~Agent() {
|
||||
@@ -86,10 +90,14 @@ Agent::~Agent() {
|
||||
void Agent::Start() {
|
||||
if (started_)
|
||||
return;
|
||||
|
@ -93,7 +157,7 @@ index 7ce59674356f9743438350949be42fa7ead2afbe..c5fedc3be86a77730c57321b9c73cc8e
|
|||
|
||||
// This thread should be created *after* async handles are created
|
||||
// (within NodeTraceWriter and NodeTraceBuffer constructors).
|
||||
@@ -143,8 +149,10 @@ void Agent::StopTracing() {
|
||||
@@ -143,8 +151,10 @@ void Agent::StopTracing() {
|
||||
return;
|
||||
// Perform final Flush on TraceBuffer. We don't want the tracing controller
|
||||
// to flush the buffer again on destruction of the V8::Platform.
|
||||
|
@ -105,7 +169,7 @@ index 7ce59674356f9743438350949be42fa7ead2afbe..c5fedc3be86a77730c57321b9c73cc8e
|
|||
started_ = false;
|
||||
|
||||
// Thread should finish when the tracing loop is stopped.
|
||||
@@ -202,6 +210,7 @@ std::string Agent::GetEnabledCategories() const {
|
||||
@@ -202,6 +212,7 @@ std::string Agent::GetEnabledCategories() const {
|
||||
return categories;
|
||||
}
|
||||
|
||||
|
@ -113,7 +177,7 @@ index 7ce59674356f9743438350949be42fa7ead2afbe..c5fedc3be86a77730c57321b9c73cc8e
|
|||
void Agent::AppendTraceEvent(TraceObject* trace_event) {
|
||||
for (const auto& id_writer : writers_)
|
||||
id_writer.second->AppendTraceEvent(trace_event);
|
||||
@@ -211,18 +220,21 @@ void Agent::AddMetadataEvent(std::unique_ptr<TraceObject> event) {
|
||||
@@ -211,18 +222,21 @@ void Agent::AddMetadataEvent(std::unique_ptr<TraceObject> event) {
|
||||
Mutex::ScopedLock lock(metadata_events_mutex_);
|
||||
metadata_events_.push_back(std::move(event));
|
||||
}
|
||||
|
@ -136,7 +200,7 @@ index 7ce59674356f9743438350949be42fa7ead2afbe..c5fedc3be86a77730c57321b9c73cc8e
|
|||
void TracingController::AddMetadataEvent(
|
||||
const unsigned char* category_group_enabled,
|
||||
const char* name,
|
||||
@@ -246,6 +258,6 @@ void TracingController::AddMetadataEvent(
|
||||
@@ -246,6 +260,6 @@ void TracingController::AddMetadataEvent(
|
||||
if (node_agent != nullptr)
|
||||
node_agent->AddMetadataEvent(std::move(trace_event));
|
||||
}
|
||||
|
@ -198,26 +262,20 @@ index b542a849fe8da7e8bbbcca7067b73dc32b18d6d3..059ce6f6ea17199ead09c6c13bcc680f
|
|||
};
|
||||
|
||||
void AgentWriterHandle::reset() {
|
||||
diff --git a/src/tracing/node_trace_buffer.cc b/src/tracing/node_trace_buffer.cc
|
||||
index e187a1d78c81972b69cd4e03f7079cdb727956ad..3256c6326a08c6cafd83f1e49e3350193e813b51 100644
|
||||
--- a/src/tracing/node_trace_buffer.cc
|
||||
+++ b/src/tracing/node_trace_buffer.cc
|
||||
@@ -55,6 +55,7 @@ TraceObject* InternalTraceBuffer::GetEventByHandle(uint64_t handle) {
|
||||
}
|
||||
|
||||
void InternalTraceBuffer::Flush(bool blocking) {
|
||||
diff --git a/src/tracing/node_trace_buffer.h b/src/tracing/node_trace_buffer.h
|
||||
index 18e4f43efaae3a60b924e697918867e604513194..7cbaf01235750138c680c8ec2ed5d206d638f8b6 100644
|
||||
--- a/src/tracing/node_trace_buffer.h
|
||||
+++ b/src/tracing/node_trace_buffer.h
|
||||
@@ -42,7 +42,9 @@ class InternalTraceBuffer {
|
||||
bool flushing_;
|
||||
size_t max_chunks_;
|
||||
Agent* agent_;
|
||||
+#ifndef V8_USE_PERFETTO
|
||||
{
|
||||
Mutex::ScopedLock scoped_lock(mutex_);
|
||||
if (total_chunks_ > 0) {
|
||||
@@ -75,6 +76,7 @@ void InternalTraceBuffer::Flush(bool blocking) {
|
||||
flushing_ = false;
|
||||
}
|
||||
}
|
||||
std::vector<std::unique_ptr<TraceBufferChunk>> chunks_;
|
||||
+#endif
|
||||
agent_->Flush(blocking);
|
||||
}
|
||||
|
||||
size_t total_chunks_ = 0;
|
||||
uint32_t current_chunk_seq_ = 1;
|
||||
uint32_t id_;
|
||||
diff --git a/src/tracing/node_trace_writer.cc b/src/tracing/node_trace_writer.cc
|
||||
index 8f053efe93324b9acbb4e85f7b974b4f7712e200..e331ed5567caa39ade90ce28cea69f1d10533812 100644
|
||||
--- a/src/tracing/node_trace_writer.cc
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue