diff --git a/common.gypi b/common.gypi index 0ffa5b137195..704eacfc1862 100644 --- a/common.gypi +++ b/common.gypi @@ -38,7 +38,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.56', + 'v8_embedder_string': '-node.57', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/logging/code-events.h b/deps/v8/src/logging/code-events.h index 8aceb3d7d32c..f702e393cf7e 100644 --- a/deps/v8/src/logging/code-events.h +++ b/deps/v8/src/logging/code-events.h @@ -125,7 +125,7 @@ class Logger { Logger& operator=(const Logger&) = delete; bool AddListener(LogEventListener* listener) { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); auto position = std::find(listeners_.begin(), listeners_.end(), listener); if (position != listeners_.end()) return false; // Add the listener to the end and update the element @@ -134,7 +134,7 @@ class Logger { } bool RemoveListener(LogEventListener* listener) { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); auto position = std::find(listeners_.begin(), listeners_.end(), listener); if (position == listeners_.end()) return false; listeners_.erase(position); @@ -142,7 +142,7 @@ class Logger { } bool is_listening_to_code_events() { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { if (listener->is_listening_to_code_events()) return true; } @@ -150,7 +150,7 @@ class Logger { } bool allows_code_compaction() { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { if (!listener->allows_code_compaction()) return false; } @@ -159,7 +159,7 @@ class Logger { void CodeCreateEvent(CodeTag tag, Handle code, const char* comment) { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { listener->CodeCreateEvent(tag, code, comment); } @@ -167,7 +167,7 @@ class Logger { void CodeCreateEvent(CodeTag tag, Handle code, Handle name) { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { listener->CodeCreateEvent(tag, code, name); } @@ -175,7 +175,7 @@ class Logger { void CodeCreateEvent(CodeTag tag, Handle code, Handle shared, Handle name) { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { listener->CodeCreateEvent(tag, code, shared, name); } @@ -184,7 +184,7 @@ class Logger { void CodeCreateEvent(CodeTag tag, Handle code, Handle shared, Handle source, int line, int column) { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { listener->CodeCreateEvent(tag, code, shared, source, line, column); } @@ -194,7 +194,7 @@ class Logger { void CodeCreateEvent(CodeTag tag, const wasm::WasmCode* code, wasm::WasmName name, const char* source_url, int code_offset, int script_id) { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { listener->CodeCreateEvent(tag, code, name, source_url, code_offset, script_id); @@ -203,28 +203,28 @@ class Logger { #endif // V8_ENABLE_WEBASSEMBLY void CallbackEvent(Handle name, Address entry_point) { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { listener->CallbackEvent(name, entry_point); } } void GetterCallbackEvent(Handle name, Address entry_point) { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { listener->GetterCallbackEvent(name, entry_point); } } void SetterCallbackEvent(Handle name, Address entry_point) { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { listener->SetterCallbackEvent(name, entry_point); } } void RegExpCodeCreateEvent(Handle code, Handle source) { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { listener->RegExpCodeCreateEvent(code, source); } @@ -232,35 +232,35 @@ class Logger { void CodeMoveEvent(Tagged from, Tagged to) { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { listener->CodeMoveEvent(from, to); } } void BytecodeMoveEvent(Tagged from, Tagged to) { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { listener->BytecodeMoveEvent(from, to); } } void SharedFunctionInfoMoveEvent(Address from, Address to) { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { listener->SharedFunctionInfoMoveEvent(from, to); } } void NativeContextMoveEvent(Address from, Address to) { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { listener->NativeContextMoveEvent(from, to); } } void CodeMovingGCEvent() { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { listener->CodeMovingGCEvent(); } @@ -268,7 +268,7 @@ class Logger { void CodeDisableOptEvent(Handle code, Handle shared) { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { listener->CodeDisableOptEvent(code, shared); } @@ -276,7 +276,7 @@ class Logger { void CodeDeoptEvent(Handle code, DeoptimizeKind kind, Address pc, int fp_to_sp_delta) { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { listener->CodeDeoptEvent(code, kind, pc, fp_to_sp_delta); } @@ -285,14 +285,14 @@ class Logger { void CodeDependencyChangeEvent(Handle code, Handle sfi, const char* reason) { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { listener->CodeDependencyChangeEvent(code, sfi, reason); } } void WeakCodeClearEvent() { - base::MutexGuard guard(&mutex_); + base::RecursiveMutexGuard guard(&mutex_); for (auto listener : listeners_) { listener->WeakCodeClearEvent(); } @@ -300,7 +300,7 @@ class Logger { private: std::vector listeners_; - base::Mutex mutex_; + base::RecursiveMutex mutex_; }; } // namespace internal