Commit 3376e27

Browse files
camillobrunijuanarbol
camillobruni
authored and
juanarbol
committed
deps: V8: cherry-pick a6eaf7574109
Original commit message: [logging] Use RecursiveMutex for Logger Logger::allows_code_compaction might be called from within a CodeCreateEvent where initializing line script line ends might trigger a GC. During compaction we check if code compaction is allowed which calls back into the above Logger method. Bug: 41497149 Change-Id: Ifd1b740df8600584780341d8214e995832e663b4 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5572952 Reviewed-by: Victor Gomes <victorgomes@chromium.org> Commit-Queue: Camillo Bruni <cbruni@chromium.org> Cr-Commit-Position: refs/heads/main@{#94140} Refs: v8/v8@a6eaf75 PR-URL: #65402Fixes: #65140 Reviewed-By: Richard Lau <richard.lau@ibm.com>
1 parent b816fc8 commit 3376e27

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎common.gypi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.56',
41+
'v8_embedder_string': '-node.57',
4242

4343
##### V8 defaults for Node.js #####
4444

‎deps/v8/src/logging/code-events.h‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class Logger {
125125
Logger& operator=(const Logger&) = delete;
126126

127127
boolAddListener(LogEventListener* listener) {
128-
base::MutexGuardguard(&mutex_);
128+
base::RecursiveMutexGuardguard(&mutex_);
129129
auto position = std::find(listeners_.begin(), listeners_.end(), listener);
130130
if (position != listeners_.end()) returnfalse;
131131
// Add the listener to the end and update the element
@@ -134,23 +134,23 @@ class Logger {
134134
}
135135

136136
boolRemoveListener(LogEventListener* listener) {
137-
base::MutexGuardguard(&mutex_);
137+
base::RecursiveMutexGuardguard(&mutex_);
138138
auto position = std::find(listeners_.begin(), listeners_.end(), listener);
139139
if (position == listeners_.end()) returnfalse;
140140
listeners_.erase(position);
141141
returntrue;
142142
}
143143

144144
boolis_listening_to_code_events() {
145-
base::MutexGuardguard(&mutex_);
145+
base::RecursiveMutexGuardguard(&mutex_);
146146
for (auto listener : listeners_) {
147147
if (listener->is_listening_to_code_events()) returntrue;
148148
}
149149
returnfalse;
150150
}
151151

152152
boolallows_code_compaction() {
153-
base::MutexGuardguard(&mutex_);
153+
base::RecursiveMutexGuardguard(&mutex_);
154154
for (auto listener : listeners_) {
155155
if (!listener->allows_code_compaction()) returnfalse;
156156
}
@@ -159,23 +159,23 @@ class Logger {
159159

160160
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
161161
constchar* comment) {
162-
base::MutexGuardguard(&mutex_);
162+
base::RecursiveMutexGuardguard(&mutex_);
163163
for (auto listener : listeners_) {
164164
listener->CodeCreateEvent(tag, code, comment);
165165
}
166166
}
167167

168168
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
169169
Handle<Name> name) {
170-
base::MutexGuardguard(&mutex_);
170+
base::RecursiveMutexGuardguard(&mutex_);
171171
for (auto listener : listeners_) {
172172
listener->CodeCreateEvent(tag, code, name);
173173
}
174174
}
175175

176176
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
177177
Handle<SharedFunctionInfo> shared, Handle<Name> name) {
178-
base::MutexGuardguard(&mutex_);
178+
base::RecursiveMutexGuardguard(&mutex_);
179179
for (auto listener : listeners_) {
180180
listener->CodeCreateEvent(tag, code, shared, name);
181181
}
@@ -184,7 +184,7 @@ class Logger {
184184
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
185185
Handle<SharedFunctionInfo> shared, Handle<Name> source,
186186
int line, int column) {
187-
base::MutexGuardguard(&mutex_);
187+
base::RecursiveMutexGuardguard(&mutex_);
188188
for (auto listener : listeners_) {
189189
listener->CodeCreateEvent(tag, code, shared, source, line, column);
190190
}
@@ -194,7 +194,7 @@ class Logger {
194194
voidCodeCreateEvent(CodeTag tag, const wasm::WasmCode* code,
195195
wasm::WasmName name, constchar* source_url,
196196
int code_offset, int script_id) {
197-
base::MutexGuardguard(&mutex_);
197+
base::RecursiveMutexGuardguard(&mutex_);
198198
for (auto listener : listeners_) {
199199
listener->CodeCreateEvent(tag, code, name, source_url, code_offset,
200200
script_id);
@@ -203,80 +203,80 @@ class Logger {
203203
#endif// V8_ENABLE_WEBASSEMBLY
204204

205205
voidCallbackEvent(Handle<Name> name, Address entry_point) {
206-
base::MutexGuardguard(&mutex_);
206+
base::RecursiveMutexGuardguard(&mutex_);
207207
for (auto listener : listeners_) {
208208
listener->CallbackEvent(name, entry_point);
209209
}
210210
}
211211

212212
voidGetterCallbackEvent(Handle<Name> name, Address entry_point) {
213-
base::MutexGuardguard(&mutex_);
213+
base::RecursiveMutexGuardguard(&mutex_);
214214
for (auto listener : listeners_) {
215215
listener->GetterCallbackEvent(name, entry_point);
216216
}
217217
}
218218

219219
voidSetterCallbackEvent(Handle<Name> name, Address entry_point) {
220-
base::MutexGuardguard(&mutex_);
220+
base::RecursiveMutexGuardguard(&mutex_);
221221
for (auto listener : listeners_) {
222222
listener->SetterCallbackEvent(name, entry_point);
223223
}
224224
}
225225

226226
voidRegExpCodeCreateEvent(Handle<AbstractCode> code, Handle<String> source) {
227-
base::MutexGuardguard(&mutex_);
227+
base::RecursiveMutexGuardguard(&mutex_);
228228
for (auto listener : listeners_) {
229229
listener->RegExpCodeCreateEvent(code, source);
230230
}
231231
}
232232

233233
voidCodeMoveEvent(Tagged<InstructionStream> from,
234234
Tagged<InstructionStream> to) {
235-
base::MutexGuardguard(&mutex_);
235+
base::RecursiveMutexGuardguard(&mutex_);
236236
for (auto listener : listeners_) {
237237
listener->CodeMoveEvent(from, to);
238238
}
239239
}
240240

241241
voidBytecodeMoveEvent(Tagged<BytecodeArray> from, Tagged<BytecodeArray> to) {
242-
base::MutexGuardguard(&mutex_);
242+
base::RecursiveMutexGuardguard(&mutex_);
243243
for (auto listener : listeners_) {
244244
listener->BytecodeMoveEvent(from, to);
245245
}
246246
}
247247

248248
voidSharedFunctionInfoMoveEvent(Address from, Address to) {
249-
base::MutexGuardguard(&mutex_);
249+
base::RecursiveMutexGuardguard(&mutex_);
250250
for (auto listener : listeners_) {
251251
listener->SharedFunctionInfoMoveEvent(from, to);
252252
}
253253
}
254254

255255
voidNativeContextMoveEvent(Address from, Address to) {
256-
base::MutexGuardguard(&mutex_);
256+
base::RecursiveMutexGuardguard(&mutex_);
257257
for (auto listener : listeners_) {
258258
listener->NativeContextMoveEvent(from, to);
259259
}
260260
}
261261

262262
voidCodeMovingGCEvent() {
263-
base::MutexGuardguard(&mutex_);
263+
base::RecursiveMutexGuardguard(&mutex_);
264264
for (auto listener : listeners_) {
265265
listener->CodeMovingGCEvent();
266266
}
267267
}
268268

269269
voidCodeDisableOptEvent(Handle<AbstractCode> code,
270270
Handle<SharedFunctionInfo> shared) {
271-
base::MutexGuardguard(&mutex_);
271+
base::RecursiveMutexGuardguard(&mutex_);
272272
for (auto listener : listeners_) {
273273
listener->CodeDisableOptEvent(code, shared);
274274
}
275275
}
276276

277277
voidCodeDeoptEvent(Handle<Code> code, DeoptimizeKind kind, Address pc,
278278
int fp_to_sp_delta) {
279-
base::MutexGuardguard(&mutex_);
279+
base::RecursiveMutexGuardguard(&mutex_);
280280
for (auto listener : listeners_) {
281281
listener->CodeDeoptEvent(code, kind, pc, fp_to_sp_delta);
282282
}
@@ -285,22 +285,22 @@ class Logger {
285285
voidCodeDependencyChangeEvent(Handle<Code> code,
286286
Handle<SharedFunctionInfo> sfi,
287287
constchar* reason) {
288-
base::MutexGuardguard(&mutex_);
288+
base::RecursiveMutexGuardguard(&mutex_);
289289
for (auto listener : listeners_) {
290290
listener->CodeDependencyChangeEvent(code, sfi, reason);
291291
}
292292
}
293293

294294
voidWeakCodeClearEvent() {
295-
base::MutexGuardguard(&mutex_);
295+
base::RecursiveMutexGuardguard(&mutex_);
296296
for (auto listener : listeners_) {
297297
listener->WeakCodeClearEvent();
298298
}
299299
}
300300

301301
private:
302302
std::vector<LogEventListener*> listeners_;
303-
base::Mutex mutex_;
303+
base::RecursiveMutex mutex_;
304304
};
305305

306306
} // namespace internal

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 3376e27
Browse files
camillobrunijuanarbol
camillobruni
authored and
juanarbol
committed
deps: V8: cherry-pick a6eaf7574109
Original commit message:
[logging] Use RecursiveMutex for Logger
Logger::allows_code_compaction might be called from within a
CodeCreateEvent where initializing line script line ends might trigger
a GC. During compaction we check if code compaction is allowed which
calls back into the above Logger method.
Bug: 41497149
Change-Id: Ifd1b740df8600584780341d8214e995832e663b4
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5572952
Reviewed-by: Victor Gomes <victorgomes@chromium.org>
Commit-Queue: Camillo Bruni <cbruni@chromium.org>
Cr-Commit-Position: refs/heads/main@{#94140}
Refs: v8/v8@a6eaf75
PR-URL: #65402Fixes: #65140
Reviewed-By: Richard Lau <richard.lau@ibm.com>
1 parent b816fc8 commit 3376e27
2 files changed
Lines changed: 24 additions & 24 deletions
File tree
‎common.gypi‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.56',
41+
'v8_embedder_string': '-node.57',
4242

4343
##### V8 defaults for Node.js #####
4444

‎deps/v8/src/logging/code-events.h‎
Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class Logger {
125125
 Logger& operator=(const Logger&) = delete;
126126

127127
boolAddListener(LogEventListener* listener) {
128-
 base::MutexGuardguard(&mutex_);
128+
 base::RecursiveMutexGuardguard(&mutex_);
129129
auto position = std::find(listeners_.begin(), listeners_.end(), listener);
130130
if (position != listeners_.end()) returnfalse;
131131
// Add the listener to the end and update the element
@@ -134,23 +134,23 @@ class Logger {
134134
 }
135135

136136
boolRemoveListener(LogEventListener* listener) {
137-
 base::MutexGuardguard(&mutex_);
137+
 base::RecursiveMutexGuardguard(&mutex_);
138138
auto position = std::find(listeners_.begin(), listeners_.end(), listener);
139139
if (position == listeners_.end()) returnfalse;
140140
 listeners_.erase(position);
141141
returntrue;
142142
 }
143143

144144
boolis_listening_to_code_events() {
145-
 base::MutexGuardguard(&mutex_);
145+
 base::RecursiveMutexGuardguard(&mutex_);
146146
for (auto listener : listeners_) {
147147
if (listener->is_listening_to_code_events()) returntrue;
148148
 }
149149
returnfalse;
150150
 }
151151

152152
boolallows_code_compaction() {
153-
 base::MutexGuardguard(&mutex_);
153+
 base::RecursiveMutexGuardguard(&mutex_);
154154
for (auto listener : listeners_) {
155155
if (!listener->allows_code_compaction()) returnfalse;
156156
 }
@@ -159,23 +159,23 @@ class Logger {
159159

160160
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
161161
constchar* comment) {
162-
 base::MutexGuardguard(&mutex_);
162+
 base::RecursiveMutexGuardguard(&mutex_);
163163
for (auto listener : listeners_) {
164164
 listener->CodeCreateEvent(tag, code, comment);
165165
 }
166166
 }
167167

168168
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
169169
 Handle<Name> name) {
170-
 base::MutexGuardguard(&mutex_);
170+
 base::RecursiveMutexGuardguard(&mutex_);
171171
for (auto listener : listeners_) {
172172
 listener->CodeCreateEvent(tag, code, name);
173173
 }
174174
 }
175175

176176
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
177177
 Handle<SharedFunctionInfo> shared, Handle<Name> name) {
178-
 base::MutexGuardguard(&mutex_);
178+
 base::RecursiveMutexGuardguard(&mutex_);
179179
for (auto listener : listeners_) {
180180
 listener->CodeCreateEvent(tag, code, shared, name);
181181
 }
@@ -184,7 +184,7 @@ class Logger {
184184
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
185185
 Handle<SharedFunctionInfo> shared, Handle<Name> source,
186186
int line, int column) {
187-
 base::MutexGuardguard(&mutex_);
187+
 base::RecursiveMutexGuardguard(&mutex_);
188188
for (auto listener : listeners_) {
189189
 listener->CodeCreateEvent(tag, code, shared, source, line, column);
190190
 }
@@ -194,7 +194,7 @@ class Logger {
194194
voidCodeCreateEvent(CodeTag tag, const wasm::WasmCode* code,
195195
 wasm::WasmName name, constchar* source_url,
196196
int code_offset, int script_id) {
197-
 base::MutexGuardguard(&mutex_);
197+
 base::RecursiveMutexGuardguard(&mutex_);
198198
for (auto listener : listeners_) {
199199
 listener->CodeCreateEvent(tag, code, name, source_url, code_offset,
200200
 script_id);
@@ -203,80 +203,80 @@ class Logger {
203203
#endif// V8_ENABLE_WEBASSEMBLY
204204

205205
voidCallbackEvent(Handle<Name> name, Address entry_point) {
206-
 base::MutexGuardguard(&mutex_);
206+
 base::RecursiveMutexGuardguard(&mutex_);
207207
for (auto listener : listeners_) {
208208
 listener->CallbackEvent(name, entry_point);
209209
 }
210210
 }
211211

212212
voidGetterCallbackEvent(Handle<Name> name, Address entry_point) {
213-
 base::MutexGuardguard(&mutex_);
213+
 base::RecursiveMutexGuardguard(&mutex_);
214214
for (auto listener : listeners_) {
215215
 listener->GetterCallbackEvent(name, entry_point);
216216
 }
217217
 }
218218

219219
voidSetterCallbackEvent(Handle<Name> name, Address entry_point) {
220-
 base::MutexGuardguard(&mutex_);
220+
 base::RecursiveMutexGuardguard(&mutex_);
221221
for (auto listener : listeners_) {
222222
 listener->SetterCallbackEvent(name, entry_point);
223223
 }
224224
 }
225225

226226
voidRegExpCodeCreateEvent(Handle<AbstractCode> code, Handle<String> source) {
227-
 base::MutexGuardguard(&mutex_);
227+
 base::RecursiveMutexGuardguard(&mutex_);
228228
for (auto listener : listeners_) {
229229
 listener->RegExpCodeCreateEvent(code, source);
230230
 }
231231
 }
232232

233233
voidCodeMoveEvent(Tagged<InstructionStream> from,
234234
 Tagged<InstructionStream> to) {
235-
 base::MutexGuardguard(&mutex_);
235+
 base::RecursiveMutexGuardguard(&mutex_);
236236
for (auto listener : listeners_) {
237237
 listener->CodeMoveEvent(from, to);
238238
 }
239239
 }
240240

241241
voidBytecodeMoveEvent(Tagged<BytecodeArray> from, Tagged<BytecodeArray> to) {
242-
 base::MutexGuardguard(&mutex_);
242+
 base::RecursiveMutexGuardguard(&mutex_);
243243
for (auto listener : listeners_) {
244244
 listener->BytecodeMoveEvent(from, to);
245245
 }
246246
 }
247247

248248
voidSharedFunctionInfoMoveEvent(Address from, Address to) {
249-
 base::MutexGuardguard(&mutex_);
249+
 base::RecursiveMutexGuardguard(&mutex_);
250250
for (auto listener : listeners_) {
251251
 listener->SharedFunctionInfoMoveEvent(from, to);
252252
 }
253253
 }
254254

255255
voidNativeContextMoveEvent(Address from, Address to) {
256-
 base::MutexGuardguard(&mutex_);
256+
 base::RecursiveMutexGuardguard(&mutex_);
257257
for (auto listener : listeners_) {
258258
 listener->NativeContextMoveEvent(from, to);
259259
 }
260260
 }
261261

262262
voidCodeMovingGCEvent() {
263-
 base::MutexGuardguard(&mutex_);
263+
 base::RecursiveMutexGuardguard(&mutex_);
264264
for (auto listener : listeners_) {
265265
 listener->CodeMovingGCEvent();
266266
 }
267267
 }
268268

269269
voidCodeDisableOptEvent(Handle<AbstractCode> code,
270270
 Handle<SharedFunctionInfo> shared) {
271-
 base::MutexGuardguard(&mutex_);
271+
 base::RecursiveMutexGuardguard(&mutex_);
272272
for (auto listener : listeners_) {
273273
 listener->CodeDisableOptEvent(code, shared);
274274
 }
275275
 }
276276

277277
voidCodeDeoptEvent(Handle<Code> code, DeoptimizeKind kind, Address pc,
278278
int fp_to_sp_delta) {
279-
 base::MutexGuardguard(&mutex_);
279+
 base::RecursiveMutexGuardguard(&mutex_);
280280
for (auto listener : listeners_) {
281281
 listener->CodeDeoptEvent(code, kind, pc, fp_to_sp_delta);
282282
 }
@@ -285,22 +285,22 @@ class Logger {
285285
voidCodeDependencyChangeEvent(Handle<Code> code,
286286
 Handle<SharedFunctionInfo> sfi,
287287
constchar* reason) {
288-
 base::MutexGuardguard(&mutex_);
288+
 base::RecursiveMutexGuardguard(&mutex_);
289289
for (auto listener : listeners_) {
290290
 listener->CodeDependencyChangeEvent(code, sfi, reason);
291291
 }
292292
 }
293293

294294
voidWeakCodeClearEvent() {
295-
 base::MutexGuardguard(&mutex_);
295+
 base::RecursiveMutexGuardguard(&mutex_);
296296
for (auto listener : listeners_) {
297297
 listener->WeakCodeClearEvent();
298298
 }
299299
 }
300300

301301
private:
302302
 std::vector<LogEventListener*> listeners_;
303-
 base::Mutex mutex_;
303+
 base::RecursiveMutex mutex_;
304304
};
305305

306306
} // namespace internal
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 3376e27
Browse files
camillobrunijuanarbol
camillobruni
authored and
juanarbol
committed
deps: V8: cherry-pick a6eaf7574109
Original commit message:
[logging] Use RecursiveMutex for Logger
Logger::allows_code_compaction might be called from within a
CodeCreateEvent where initializing line script line ends might trigger
a GC. During compaction we check if code compaction is allowed which
calls back into the above Logger method.
Bug: 41497149
Change-Id: Ifd1b740df8600584780341d8214e995832e663b4
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5572952
Reviewed-by: Victor Gomes <victorgomes@chromium.org>
Commit-Queue: Camillo Bruni <cbruni@chromium.org>
Cr-Commit-Position: refs/heads/main@{#94140}
Refs: v8/v8@a6eaf75
PR-URL: #65402Fixes: #65140
Reviewed-By: Richard Lau <richard.lau@ibm.com>
1 parent b816fc8 commit 3376e27
2 files changed
Lines changed: 24 additions & 24 deletions
File tree
‎common.gypi‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.56',
41+
'v8_embedder_string': '-node.57',
4242

4343
##### V8 defaults for Node.js #####
4444

‎deps/v8/src/logging/code-events.h‎
Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class Logger {
125125
 Logger& operator=(const Logger&) = delete;
126126

127127
boolAddListener(LogEventListener* listener) {
128-
 base::MutexGuardguard(&mutex_);
128+
 base::RecursiveMutexGuardguard(&mutex_);
129129
auto position = std::find(listeners_.begin(), listeners_.end(), listener);
130130
if (position != listeners_.end()) returnfalse;
131131
// Add the listener to the end and update the element
@@ -134,23 +134,23 @@ class Logger {
134134
 }
135135

136136
boolRemoveListener(LogEventListener* listener) {
137-
 base::MutexGuardguard(&mutex_);
137+
 base::RecursiveMutexGuardguard(&mutex_);
138138
auto position = std::find(listeners_.begin(), listeners_.end(), listener);
139139
if (position == listeners_.end()) returnfalse;
140140
 listeners_.erase(position);
141141
returntrue;
142142
 }
143143

144144
boolis_listening_to_code_events() {
145-
 base::MutexGuardguard(&mutex_);
145+
 base::RecursiveMutexGuardguard(&mutex_);
146146
for (auto listener : listeners_) {
147147
if (listener->is_listening_to_code_events()) returntrue;
148148
 }
149149
returnfalse;
150150
 }
151151

152152
boolallows_code_compaction() {
153-
 base::MutexGuardguard(&mutex_);
153+
 base::RecursiveMutexGuardguard(&mutex_);
154154
for (auto listener : listeners_) {
155155
if (!listener->allows_code_compaction()) returnfalse;
156156
 }
@@ -159,23 +159,23 @@ class Logger {
159159

160160
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
161161
constchar* comment) {
162-
 base::MutexGuardguard(&mutex_);
162+
 base::RecursiveMutexGuardguard(&mutex_);
163163
for (auto listener : listeners_) {
164164
 listener->CodeCreateEvent(tag, code, comment);
165165
 }
166166
 }
167167

168168
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
169169
 Handle<Name> name) {
170-
 base::MutexGuardguard(&mutex_);
170+
 base::RecursiveMutexGuardguard(&mutex_);
171171
for (auto listener : listeners_) {
172172
 listener->CodeCreateEvent(tag, code, name);
173173
 }
174174
 }
175175

176176
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
177177
 Handle<SharedFunctionInfo> shared, Handle<Name> name) {
178-
 base::MutexGuardguard(&mutex_);
178+
 base::RecursiveMutexGuardguard(&mutex_);
179179
for (auto listener : listeners_) {
180180
 listener->CodeCreateEvent(tag, code, shared, name);
181181
 }
@@ -184,7 +184,7 @@ class Logger {
184184
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
185185
 Handle<SharedFunctionInfo> shared, Handle<Name> source,
186186
int line, int column) {
187-
 base::MutexGuardguard(&mutex_);
187+
 base::RecursiveMutexGuardguard(&mutex_);
188188
for (auto listener : listeners_) {
189189
 listener->CodeCreateEvent(tag, code, shared, source, line, column);
190190
 }
@@ -194,7 +194,7 @@ class Logger {
194194
voidCodeCreateEvent(CodeTag tag, const wasm::WasmCode* code,
195195
 wasm::WasmName name, constchar* source_url,
196196
int code_offset, int script_id) {
197-
 base::MutexGuardguard(&mutex_);
197+
 base::RecursiveMutexGuardguard(&mutex_);
198198
for (auto listener : listeners_) {
199199
 listener->CodeCreateEvent(tag, code, name, source_url, code_offset,
200200
 script_id);
@@ -203,80 +203,80 @@ class Logger {
203203
#endif// V8_ENABLE_WEBASSEMBLY
204204

205205
voidCallbackEvent(Handle<Name> name, Address entry_point) {
206-
 base::MutexGuardguard(&mutex_);
206+
 base::RecursiveMutexGuardguard(&mutex_);
207207
for (auto listener : listeners_) {
208208
 listener->CallbackEvent(name, entry_point);
209209
 }
210210
 }
211211

212212
voidGetterCallbackEvent(Handle<Name> name, Address entry_point) {
213-
 base::MutexGuardguard(&mutex_);
213+
 base::RecursiveMutexGuardguard(&mutex_);
214214
for (auto listener : listeners_) {
215215
 listener->GetterCallbackEvent(name, entry_point);
216216
 }
217217
 }
218218

219219
voidSetterCallbackEvent(Handle<Name> name, Address entry_point) {
220-
 base::MutexGuardguard(&mutex_);
220+
 base::RecursiveMutexGuardguard(&mutex_);
221221
for (auto listener : listeners_) {
222222
 listener->SetterCallbackEvent(name, entry_point);
223223
 }
224224
 }
225225

226226
voidRegExpCodeCreateEvent(Handle<AbstractCode> code, Handle<String> source) {
227-
 base::MutexGuardguard(&mutex_);
227+
 base::RecursiveMutexGuardguard(&mutex_);
228228
for (auto listener : listeners_) {
229229
 listener->RegExpCodeCreateEvent(code, source);
230230
 }
231231
 }
232232

233233
voidCodeMoveEvent(Tagged<InstructionStream> from,
234234
 Tagged<InstructionStream> to) {
235-
 base::MutexGuardguard(&mutex_);
235+
 base::RecursiveMutexGuardguard(&mutex_);
236236
for (auto listener : listeners_) {
237237
 listener->CodeMoveEvent(from, to);
238238
 }
239239
 }
240240

241241
voidBytecodeMoveEvent(Tagged<BytecodeArray> from, Tagged<BytecodeArray> to) {
242-
 base::MutexGuardguard(&mutex_);
242+
 base::RecursiveMutexGuardguard(&mutex_);
243243
for (auto listener : listeners_) {
244244
 listener->BytecodeMoveEvent(from, to);
245245
 }
246246
 }
247247

248248
voidSharedFunctionInfoMoveEvent(Address from, Address to) {
249-
 base::MutexGuardguard(&mutex_);
249+
 base::RecursiveMutexGuardguard(&mutex_);
250250
for (auto listener : listeners_) {
251251
 listener->SharedFunctionInfoMoveEvent(from, to);
252252
 }
253253
 }
254254

255255
voidNativeContextMoveEvent(Address from, Address to) {
256-
 base::MutexGuardguard(&mutex_);
256+
 base::RecursiveMutexGuardguard(&mutex_);
257257
for (auto listener : listeners_) {
258258
 listener->NativeContextMoveEvent(from, to);
259259
 }
260260
 }
261261

262262
voidCodeMovingGCEvent() {
263-
 base::MutexGuardguard(&mutex_);
263+
 base::RecursiveMutexGuardguard(&mutex_);
264264
for (auto listener : listeners_) {
265265
 listener->CodeMovingGCEvent();
266266
 }
267267
 }
268268

269269
voidCodeDisableOptEvent(Handle<AbstractCode> code,
270270
 Handle<SharedFunctionInfo> shared) {
271-
 base::MutexGuardguard(&mutex_);
271+
 base::RecursiveMutexGuardguard(&mutex_);
272272
for (auto listener : listeners_) {
273273
 listener->CodeDisableOptEvent(code, shared);
274274
 }
275275
 }
276276

277277
voidCodeDeoptEvent(Handle<Code> code, DeoptimizeKind kind, Address pc,
278278
int fp_to_sp_delta) {
279-
 base::MutexGuardguard(&mutex_);
279+
 base::RecursiveMutexGuardguard(&mutex_);
280280
for (auto listener : listeners_) {
281281
 listener->CodeDeoptEvent(code, kind, pc, fp_to_sp_delta);
282282
 }
@@ -285,22 +285,22 @@ class Logger {
285285
voidCodeDependencyChangeEvent(Handle<Code> code,
286286
 Handle<SharedFunctionInfo> sfi,
287287
constchar* reason) {
288-
 base::MutexGuardguard(&mutex_);
288+
 base::RecursiveMutexGuardguard(&mutex_);
289289
for (auto listener : listeners_) {
290290
 listener->CodeDependencyChangeEvent(code, sfi, reason);
291291
 }
292292
 }
293293

294294
voidWeakCodeClearEvent() {
295-
 base::MutexGuardguard(&mutex_);
295+
 base::RecursiveMutexGuardguard(&mutex_);
296296
for (auto listener : listeners_) {
297297
 listener->WeakCodeClearEvent();
298298
 }
299299
 }
300300

301301
private:
302302
 std::vector<LogEventListener*> listeners_;
303-
 base::Mutex mutex_;
303+
 base::RecursiveMutex mutex_;
304304
};
305305

306306
} // namespace internal
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 3376e27
Browse files
camillobrunijuanarbol
camillobruni
authored and
juanarbol
committed
deps: V8: cherry-pick a6eaf7574109
Original commit message:
[logging] Use RecursiveMutex for Logger
Logger::allows_code_compaction might be called from within a
CodeCreateEvent where initializing line script line ends might trigger
a GC. During compaction we check if code compaction is allowed which
calls back into the above Logger method.
Bug: 41497149
Change-Id: Ifd1b740df8600584780341d8214e995832e663b4
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5572952
Reviewed-by: Victor Gomes <victorgomes@chromium.org>
Commit-Queue: Camillo Bruni <cbruni@chromium.org>
Cr-Commit-Position: refs/heads/main@{#94140}
Refs: v8/v8@a6eaf75
PR-URL: #65402Fixes: #65140
Reviewed-By: Richard Lau <richard.lau@ibm.com>
1 parent b816fc8 commit 3376e27
2 files changed
Lines changed: 24 additions & 24 deletions
File tree
‎common.gypi‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.56',
41+
'v8_embedder_string': '-node.57',
4242

4343
##### V8 defaults for Node.js #####
4444

‎deps/v8/src/logging/code-events.h‎
Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class Logger {
125125
 Logger& operator=(const Logger&) = delete;
126126

127127
boolAddListener(LogEventListener* listener) {
128-
 base::MutexGuardguard(&mutex_);
128+
 base::RecursiveMutexGuardguard(&mutex_);
129129
auto position = std::find(listeners_.begin(), listeners_.end(), listener);
130130
if (position != listeners_.end()) returnfalse;
131131
// Add the listener to the end and update the element
@@ -134,23 +134,23 @@ class Logger {
134134
 }
135135

136136
boolRemoveListener(LogEventListener* listener) {
137-
 base::MutexGuardguard(&mutex_);
137+
 base::RecursiveMutexGuardguard(&mutex_);
138138
auto position = std::find(listeners_.begin(), listeners_.end(), listener);
139139
if (position == listeners_.end()) returnfalse;
140140
 listeners_.erase(position);
141141
returntrue;
142142
 }
143143

144144
boolis_listening_to_code_events() {
145-
 base::MutexGuardguard(&mutex_);
145+
 base::RecursiveMutexGuardguard(&mutex_);
146146
for (auto listener : listeners_) {
147147
if (listener->is_listening_to_code_events()) returntrue;
148148
 }
149149
returnfalse;
150150
 }
151151

152152
boolallows_code_compaction() {
153-
 base::MutexGuardguard(&mutex_);
153+
 base::RecursiveMutexGuardguard(&mutex_);
154154
for (auto listener : listeners_) {
155155
if (!listener->allows_code_compaction()) returnfalse;
156156
 }
@@ -159,23 +159,23 @@ class Logger {
159159

160160
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
161161
constchar* comment) {
162-
 base::MutexGuardguard(&mutex_);
162+
 base::RecursiveMutexGuardguard(&mutex_);
163163
for (auto listener : listeners_) {
164164
 listener->CodeCreateEvent(tag, code, comment);
165165
 }
166166
 }
167167

168168
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
169169
 Handle<Name> name) {
170-
 base::MutexGuardguard(&mutex_);
170+
 base::RecursiveMutexGuardguard(&mutex_);
171171
for (auto listener : listeners_) {
172172
 listener->CodeCreateEvent(tag, code, name);
173173
 }
174174
 }
175175

176176
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
177177
 Handle<SharedFunctionInfo> shared, Handle<Name> name) {
178-
 base::MutexGuardguard(&mutex_);
178+
 base::RecursiveMutexGuardguard(&mutex_);
179179
for (auto listener : listeners_) {
180180
 listener->CodeCreateEvent(tag, code, shared, name);
181181
 }
@@ -184,7 +184,7 @@ class Logger {
184184
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
185185
 Handle<SharedFunctionInfo> shared, Handle<Name> source,
186186
int line, int column) {
187-
 base::MutexGuardguard(&mutex_);
187+
 base::RecursiveMutexGuardguard(&mutex_);
188188
for (auto listener : listeners_) {
189189
 listener->CodeCreateEvent(tag, code, shared, source, line, column);
190190
 }
@@ -194,7 +194,7 @@ class Logger {
194194
voidCodeCreateEvent(CodeTag tag, const wasm::WasmCode* code,
195195
 wasm::WasmName name, constchar* source_url,
196196
int code_offset, int script_id) {
197-
 base::MutexGuardguard(&mutex_);
197+
 base::RecursiveMutexGuardguard(&mutex_);
198198
for (auto listener : listeners_) {
199199
 listener->CodeCreateEvent(tag, code, name, source_url, code_offset,
200200
 script_id);
@@ -203,80 +203,80 @@ class Logger {
203203
#endif// V8_ENABLE_WEBASSEMBLY
204204

205205
voidCallbackEvent(Handle<Name> name, Address entry_point) {
206-
 base::MutexGuardguard(&mutex_);
206+
 base::RecursiveMutexGuardguard(&mutex_);
207207
for (auto listener : listeners_) {
208208
 listener->CallbackEvent(name, entry_point);
209209
 }
210210
 }
211211

212212
voidGetterCallbackEvent(Handle<Name> name, Address entry_point) {
213-
 base::MutexGuardguard(&mutex_);
213+
 base::RecursiveMutexGuardguard(&mutex_);
214214
for (auto listener : listeners_) {
215215
 listener->GetterCallbackEvent(name, entry_point);
216216
 }
217217
 }
218218

219219
voidSetterCallbackEvent(Handle<Name> name, Address entry_point) {
220-
 base::MutexGuardguard(&mutex_);
220+
 base::RecursiveMutexGuardguard(&mutex_);
221221
for (auto listener : listeners_) {
222222
 listener->SetterCallbackEvent(name, entry_point);
223223
 }
224224
 }
225225

226226
voidRegExpCodeCreateEvent(Handle<AbstractCode> code, Handle<String> source) {
227-
 base::MutexGuardguard(&mutex_);
227+
 base::RecursiveMutexGuardguard(&mutex_);
228228
for (auto listener : listeners_) {
229229
 listener->RegExpCodeCreateEvent(code, source);
230230
 }
231231
 }
232232

233233
voidCodeMoveEvent(Tagged<InstructionStream> from,
234234
 Tagged<InstructionStream> to) {
235-
 base::MutexGuardguard(&mutex_);
235+
 base::RecursiveMutexGuardguard(&mutex_);
236236
for (auto listener : listeners_) {
237237
 listener->CodeMoveEvent(from, to);
238238
 }
239239
 }
240240

241241
voidBytecodeMoveEvent(Tagged<BytecodeArray> from, Tagged<BytecodeArray> to) {
242-
 base::MutexGuardguard(&mutex_);
242+
 base::RecursiveMutexGuardguard(&mutex_);
243243
for (auto listener : listeners_) {
244244
 listener->BytecodeMoveEvent(from, to);
245245
 }
246246
 }
247247

248248
voidSharedFunctionInfoMoveEvent(Address from, Address to) {
249-
 base::MutexGuardguard(&mutex_);
249+
 base::RecursiveMutexGuardguard(&mutex_);
250250
for (auto listener : listeners_) {
251251
 listener->SharedFunctionInfoMoveEvent(from, to);
252252
 }
253253
 }
254254

255255
voidNativeContextMoveEvent(Address from, Address to) {
256-
 base::MutexGuardguard(&mutex_);
256+
 base::RecursiveMutexGuardguard(&mutex_);
257257
for (auto listener : listeners_) {
258258
 listener->NativeContextMoveEvent(from, to);
259259
 }
260260
 }
261261

262262
voidCodeMovingGCEvent() {
263-
 base::MutexGuardguard(&mutex_);
263+
 base::RecursiveMutexGuardguard(&mutex_);
264264
for (auto listener : listeners_) {
265265
 listener->CodeMovingGCEvent();
266266
 }
267267
 }
268268

269269
voidCodeDisableOptEvent(Handle<AbstractCode> code,
270270
 Handle<SharedFunctionInfo> shared) {
271-
 base::MutexGuardguard(&mutex_);
271+
 base::RecursiveMutexGuardguard(&mutex_);
272272
for (auto listener : listeners_) {
273273
 listener->CodeDisableOptEvent(code, shared);
274274
 }
275275
 }
276276

277277
voidCodeDeoptEvent(Handle<Code> code, DeoptimizeKind kind, Address pc,
278278
int fp_to_sp_delta) {
279-
 base::MutexGuardguard(&mutex_);
279+
 base::RecursiveMutexGuardguard(&mutex_);
280280
for (auto listener : listeners_) {
281281
 listener->CodeDeoptEvent(code, kind, pc, fp_to_sp_delta);
282282
 }
@@ -285,22 +285,22 @@ class Logger {
285285
voidCodeDependencyChangeEvent(Handle<Code> code,
286286
 Handle<SharedFunctionInfo> sfi,
287287
constchar* reason) {
288-
 base::MutexGuardguard(&mutex_);
288+
 base::RecursiveMutexGuardguard(&mutex_);
289289
for (auto listener : listeners_) {
290290
 listener->CodeDependencyChangeEvent(code, sfi, reason);
291291
 }
292292
 }
293293

294294
voidWeakCodeClearEvent() {
295-
 base::MutexGuardguard(&mutex_);
295+
 base::RecursiveMutexGuardguard(&mutex_);
296296
for (auto listener : listeners_) {
297297
 listener->WeakCodeClearEvent();
298298
 }
299299
 }
300300

301301
private:
302302
 std::vector<LogEventListener*> listeners_;
303-
 base::Mutex mutex_;
303+
 base::RecursiveMutex mutex_;
304304
};
305305

306306
} // namespace internal
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 3376e27
Browse files
camillobrunijuanarbol
camillobruni
authored and
juanarbol
committed
deps: V8: cherry-pick a6eaf7574109
Original commit message:
[logging] Use RecursiveMutex for Logger
Logger::allows_code_compaction might be called from within a
CodeCreateEvent where initializing line script line ends might trigger
a GC. During compaction we check if code compaction is allowed which
calls back into the above Logger method.
Bug: 41497149
Change-Id: Ifd1b740df8600584780341d8214e995832e663b4
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5572952
Reviewed-by: Victor Gomes <victorgomes@chromium.org>
Commit-Queue: Camillo Bruni <cbruni@chromium.org>
Cr-Commit-Position: refs/heads/main@{#94140}
Refs: v8/v8@a6eaf75
PR-URL: #65402Fixes: #65140
Reviewed-By: Richard Lau <richard.lau@ibm.com>
1 parent b816fc8 commit 3376e27
2 files changed
Lines changed: 24 additions & 24 deletions
File tree
‎common.gypi‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.56',
41+
'v8_embedder_string': '-node.57',
4242

4343
##### V8 defaults for Node.js #####
4444

‎deps/v8/src/logging/code-events.h‎
Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class Logger {
125125
 Logger& operator=(const Logger&) = delete;
126126

127127
boolAddListener(LogEventListener* listener) {
128-
 base::MutexGuardguard(&mutex_);
128+
 base::RecursiveMutexGuardguard(&mutex_);
129129
auto position = std::find(listeners_.begin(), listeners_.end(), listener);
130130
if (position != listeners_.end()) returnfalse;
131131
// Add the listener to the end and update the element
@@ -134,23 +134,23 @@ class Logger {
134134
 }
135135

136136
boolRemoveListener(LogEventListener* listener) {
137-
 base::MutexGuardguard(&mutex_);
137+
 base::RecursiveMutexGuardguard(&mutex_);
138138
auto position = std::find(listeners_.begin(), listeners_.end(), listener);
139139
if (position == listeners_.end()) returnfalse;
140140
 listeners_.erase(position);
141141
returntrue;
142142
 }
143143

144144
boolis_listening_to_code_events() {
145-
 base::MutexGuardguard(&mutex_);
145+
 base::RecursiveMutexGuardguard(&mutex_);
146146
for (auto listener : listeners_) {
147147
if (listener->is_listening_to_code_events()) returntrue;
148148
 }
149149
returnfalse;
150150
 }
151151

152152
boolallows_code_compaction() {
153-
 base::MutexGuardguard(&mutex_);
153+
 base::RecursiveMutexGuardguard(&mutex_);
154154
for (auto listener : listeners_) {
155155
if (!listener->allows_code_compaction()) returnfalse;
156156
 }
@@ -159,23 +159,23 @@ class Logger {
159159

160160
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
161161
constchar* comment) {
162-
 base::MutexGuardguard(&mutex_);
162+
 base::RecursiveMutexGuardguard(&mutex_);
163163
for (auto listener : listeners_) {
164164
 listener->CodeCreateEvent(tag, code, comment);
165165
 }
166166
 }
167167

168168
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
169169
 Handle<Name> name) {
170-
 base::MutexGuardguard(&mutex_);
170+
 base::RecursiveMutexGuardguard(&mutex_);
171171
for (auto listener : listeners_) {
172172
 listener->CodeCreateEvent(tag, code, name);
173173
 }
174174
 }
175175

176176
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
177177
 Handle<SharedFunctionInfo> shared, Handle<Name> name) {
178-
 base::MutexGuardguard(&mutex_);
178+
 base::RecursiveMutexGuardguard(&mutex_);
179179
for (auto listener : listeners_) {
180180
 listener->CodeCreateEvent(tag, code, shared, name);
181181
 }
@@ -184,7 +184,7 @@ class Logger {
184184
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
185185
 Handle<SharedFunctionInfo> shared, Handle<Name> source,
186186
int line, int column) {
187-
 base::MutexGuardguard(&mutex_);
187+
 base::RecursiveMutexGuardguard(&mutex_);
188188
for (auto listener : listeners_) {
189189
 listener->CodeCreateEvent(tag, code, shared, source, line, column);
190190
 }
@@ -194,7 +194,7 @@ class Logger {
194194
voidCodeCreateEvent(CodeTag tag, const wasm::WasmCode* code,
195195
 wasm::WasmName name, constchar* source_url,
196196
int code_offset, int script_id) {
197-
 base::MutexGuardguard(&mutex_);
197+
 base::RecursiveMutexGuardguard(&mutex_);
198198
for (auto listener : listeners_) {
199199
 listener->CodeCreateEvent(tag, code, name, source_url, code_offset,
200200
 script_id);
@@ -203,80 +203,80 @@ class Logger {
203203
#endif// V8_ENABLE_WEBASSEMBLY
204204

205205
voidCallbackEvent(Handle<Name> name, Address entry_point) {
206-
 base::MutexGuardguard(&mutex_);
206+
 base::RecursiveMutexGuardguard(&mutex_);
207207
for (auto listener : listeners_) {
208208
 listener->CallbackEvent(name, entry_point);
209209
 }
210210
 }
211211

212212
voidGetterCallbackEvent(Handle<Name> name, Address entry_point) {
213-
 base::MutexGuardguard(&mutex_);
213+
 base::RecursiveMutexGuardguard(&mutex_);
214214
for (auto listener : listeners_) {
215215
 listener->GetterCallbackEvent(name, entry_point);
216216
 }
217217
 }
218218

219219
voidSetterCallbackEvent(Handle<Name> name, Address entry_point) {
220-
 base::MutexGuardguard(&mutex_);
220+
 base::RecursiveMutexGuardguard(&mutex_);
221221
for (auto listener : listeners_) {
222222
 listener->SetterCallbackEvent(name, entry_point);
223223
 }
224224
 }
225225

226226
voidRegExpCodeCreateEvent(Handle<AbstractCode> code, Handle<String> source) {
227-
 base::MutexGuardguard(&mutex_);
227+
 base::RecursiveMutexGuardguard(&mutex_);
228228
for (auto listener : listeners_) {
229229
 listener->RegExpCodeCreateEvent(code, source);
230230
 }
231231
 }
232232

233233
voidCodeMoveEvent(Tagged<InstructionStream> from,
234234
 Tagged<InstructionStream> to) {
235-
 base::MutexGuardguard(&mutex_);
235+
 base::RecursiveMutexGuardguard(&mutex_);
236236
for (auto listener : listeners_) {
237237
 listener->CodeMoveEvent(from, to);
238238
 }
239239
 }
240240

241241
voidBytecodeMoveEvent(Tagged<BytecodeArray> from, Tagged<BytecodeArray> to) {
242-
 base::MutexGuardguard(&mutex_);
242+
 base::RecursiveMutexGuardguard(&mutex_);
243243
for (auto listener : listeners_) {
244244
 listener->BytecodeMoveEvent(from, to);
245245
 }
246246
 }
247247

248248
voidSharedFunctionInfoMoveEvent(Address from, Address to) {
249-
 base::MutexGuardguard(&mutex_);
249+
 base::RecursiveMutexGuardguard(&mutex_);
250250
for (auto listener : listeners_) {
251251
 listener->SharedFunctionInfoMoveEvent(from, to);
252252
 }
253253
 }
254254

255255
voidNativeContextMoveEvent(Address from, Address to) {
256-
 base::MutexGuardguard(&mutex_);
256+
 base::RecursiveMutexGuardguard(&mutex_);
257257
for (auto listener : listeners_) {
258258
 listener->NativeContextMoveEvent(from, to);
259259
 }
260260
 }
261261

262262
voidCodeMovingGCEvent() {
263-
 base::MutexGuardguard(&mutex_);
263+
 base::RecursiveMutexGuardguard(&mutex_);
264264
for (auto listener : listeners_) {
265265
 listener->CodeMovingGCEvent();
266266
 }
267267
 }
268268

269269
voidCodeDisableOptEvent(Handle<AbstractCode> code,
270270
 Handle<SharedFunctionInfo> shared) {
271-
 base::MutexGuardguard(&mutex_);
271+
 base::RecursiveMutexGuardguard(&mutex_);
272272
for (auto listener : listeners_) {
273273
 listener->CodeDisableOptEvent(code, shared);
274274
 }
275275
 }
276276

277277
voidCodeDeoptEvent(Handle<Code> code, DeoptimizeKind kind, Address pc,
278278
int fp_to_sp_delta) {
279-
 base::MutexGuardguard(&mutex_);
279+
 base::RecursiveMutexGuardguard(&mutex_);
280280
for (auto listener : listeners_) {
281281
 listener->CodeDeoptEvent(code, kind, pc, fp_to_sp_delta);
282282
 }
@@ -285,22 +285,22 @@ class Logger {
285285
voidCodeDependencyChangeEvent(Handle<Code> code,
286286
 Handle<SharedFunctionInfo> sfi,
287287
constchar* reason) {
288-
 base::MutexGuardguard(&mutex_);
288+
 base::RecursiveMutexGuardguard(&mutex_);
289289
for (auto listener : listeners_) {
290290
 listener->CodeDependencyChangeEvent(code, sfi, reason);
291291
 }
292292
 }
293293

294294
voidWeakCodeClearEvent() {
295-
 base::MutexGuardguard(&mutex_);
295+
 base::RecursiveMutexGuardguard(&mutex_);
296296
for (auto listener : listeners_) {
297297
 listener->WeakCodeClearEvent();
298298
 }
299299
 }
300300

301301
private:
302302
 std::vector<LogEventListener*> listeners_;
303-
 base::Mutex mutex_;
303+
 base::RecursiveMutex mutex_;
304304
};
305305

306306
} // namespace internal
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 3376e27
Browse files
camillobrunijuanarbol
camillobruni
authored and
juanarbol
committed
deps: V8: cherry-pick a6eaf7574109
Original commit message:
[logging] Use RecursiveMutex for Logger
Logger::allows_code_compaction might be called from within a
CodeCreateEvent where initializing line script line ends might trigger
a GC. During compaction we check if code compaction is allowed which
calls back into the above Logger method.
Bug: 41497149
Change-Id: Ifd1b740df8600584780341d8214e995832e663b4
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5572952
Reviewed-by: Victor Gomes <victorgomes@chromium.org>
Commit-Queue: Camillo Bruni <cbruni@chromium.org>
Cr-Commit-Position: refs/heads/main@{#94140}
Refs: v8/v8@a6eaf75
PR-URL: #65402Fixes: #65140
Reviewed-By: Richard Lau <richard.lau@ibm.com>
1 parent b816fc8 commit 3376e27
2 files changed
Lines changed: 24 additions & 24 deletions
File tree
‎common.gypi‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.56',
41+
'v8_embedder_string': '-node.57',
4242

4343
##### V8 defaults for Node.js #####
4444

‎deps/v8/src/logging/code-events.h‎
Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class Logger {
125125
 Logger& operator=(const Logger&) = delete;
126126

127127
boolAddListener(LogEventListener* listener) {
128-
 base::MutexGuardguard(&mutex_);
128+
 base::RecursiveMutexGuardguard(&mutex_);
129129
auto position = std::find(listeners_.begin(), listeners_.end(), listener);
130130
if (position != listeners_.end()) returnfalse;
131131
// Add the listener to the end and update the element
@@ -134,23 +134,23 @@ class Logger {
134134
 }
135135

136136
boolRemoveListener(LogEventListener* listener) {
137-
 base::MutexGuardguard(&mutex_);
137+
 base::RecursiveMutexGuardguard(&mutex_);
138138
auto position = std::find(listeners_.begin(), listeners_.end(), listener);
139139
if (position == listeners_.end()) returnfalse;
140140
 listeners_.erase(position);
141141
returntrue;
142142
 }
143143

144144
boolis_listening_to_code_events() {
145-
 base::MutexGuardguard(&mutex_);
145+
 base::RecursiveMutexGuardguard(&mutex_);
146146
for (auto listener : listeners_) {
147147
if (listener->is_listening_to_code_events()) returntrue;
148148
 }
149149
returnfalse;
150150
 }
151151

152152
boolallows_code_compaction() {
153-
 base::MutexGuardguard(&mutex_);
153+
 base::RecursiveMutexGuardguard(&mutex_);
154154
for (auto listener : listeners_) {
155155
if (!listener->allows_code_compaction()) returnfalse;
156156
 }
@@ -159,23 +159,23 @@ class Logger {
159159

160160
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
161161
constchar* comment) {
162-
 base::MutexGuardguard(&mutex_);
162+
 base::RecursiveMutexGuardguard(&mutex_);
163163
for (auto listener : listeners_) {
164164
 listener->CodeCreateEvent(tag, code, comment);
165165
 }
166166
 }
167167

168168
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
169169
 Handle<Name> name) {
170-
 base::MutexGuardguard(&mutex_);
170+
 base::RecursiveMutexGuardguard(&mutex_);
171171
for (auto listener : listeners_) {
172172
 listener->CodeCreateEvent(tag, code, name);
173173
 }
174174
 }
175175

176176
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
177177
 Handle<SharedFunctionInfo> shared, Handle<Name> name) {
178-
 base::MutexGuardguard(&mutex_);
178+
 base::RecursiveMutexGuardguard(&mutex_);
179179
for (auto listener : listeners_) {
180180
 listener->CodeCreateEvent(tag, code, shared, name);
181181
 }
@@ -184,7 +184,7 @@ class Logger {
184184
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
185185
 Handle<SharedFunctionInfo> shared, Handle<Name> source,
186186
int line, int column) {
187-
 base::MutexGuardguard(&mutex_);
187+
 base::RecursiveMutexGuardguard(&mutex_);
188188
for (auto listener : listeners_) {
189189
 listener->CodeCreateEvent(tag, code, shared, source, line, column);
190190
 }
@@ -194,7 +194,7 @@ class Logger {
194194
voidCodeCreateEvent(CodeTag tag, const wasm::WasmCode* code,
195195
 wasm::WasmName name, constchar* source_url,
196196
int code_offset, int script_id) {
197-
 base::MutexGuardguard(&mutex_);
197+
 base::RecursiveMutexGuardguard(&mutex_);
198198
for (auto listener : listeners_) {
199199
 listener->CodeCreateEvent(tag, code, name, source_url, code_offset,
200200
 script_id);
@@ -203,80 +203,80 @@ class Logger {
203203
#endif// V8_ENABLE_WEBASSEMBLY
204204

205205
voidCallbackEvent(Handle<Name> name, Address entry_point) {
206-
 base::MutexGuardguard(&mutex_);
206+
 base::RecursiveMutexGuardguard(&mutex_);
207207
for (auto listener : listeners_) {
208208
 listener->CallbackEvent(name, entry_point);
209209
 }
210210
 }
211211

212212
voidGetterCallbackEvent(Handle<Name> name, Address entry_point) {
213-
 base::MutexGuardguard(&mutex_);
213+
 base::RecursiveMutexGuardguard(&mutex_);
214214
for (auto listener : listeners_) {
215215
 listener->GetterCallbackEvent(name, entry_point);
216216
 }
217217
 }
218218

219219
voidSetterCallbackEvent(Handle<Name> name, Address entry_point) {
220-
 base::MutexGuardguard(&mutex_);
220+
 base::RecursiveMutexGuardguard(&mutex_);
221221
for (auto listener : listeners_) {
222222
 listener->SetterCallbackEvent(name, entry_point);
223223
 }
224224
 }
225225

226226
voidRegExpCodeCreateEvent(Handle<AbstractCode> code, Handle<String> source) {
227-
 base::MutexGuardguard(&mutex_);
227+
 base::RecursiveMutexGuardguard(&mutex_);
228228
for (auto listener : listeners_) {
229229
 listener->RegExpCodeCreateEvent(code, source);
230230
 }
231231
 }
232232

233233
voidCodeMoveEvent(Tagged<InstructionStream> from,
234234
 Tagged<InstructionStream> to) {
235-
 base::MutexGuardguard(&mutex_);
235+
 base::RecursiveMutexGuardguard(&mutex_);
236236
for (auto listener : listeners_) {
237237
 listener->CodeMoveEvent(from, to);
238238
 }
239239
 }
240240

241241
voidBytecodeMoveEvent(Tagged<BytecodeArray> from, Tagged<BytecodeArray> to) {
242-
 base::MutexGuardguard(&mutex_);
242+
 base::RecursiveMutexGuardguard(&mutex_);
243243
for (auto listener : listeners_) {
244244
 listener->BytecodeMoveEvent(from, to);
245245
 }
246246
 }
247247

248248
voidSharedFunctionInfoMoveEvent(Address from, Address to) {
249-
 base::MutexGuardguard(&mutex_);
249+
 base::RecursiveMutexGuardguard(&mutex_);
250250
for (auto listener : listeners_) {
251251
 listener->SharedFunctionInfoMoveEvent(from, to);
252252
 }
253253
 }
254254

255255
voidNativeContextMoveEvent(Address from, Address to) {
256-
 base::MutexGuardguard(&mutex_);
256+
 base::RecursiveMutexGuardguard(&mutex_);
257257
for (auto listener : listeners_) {
258258
 listener->NativeContextMoveEvent(from, to);
259259
 }
260260
 }
261261

262262
voidCodeMovingGCEvent() {
263-
 base::MutexGuardguard(&mutex_);
263+
 base::RecursiveMutexGuardguard(&mutex_);
264264
for (auto listener : listeners_) {
265265
 listener->CodeMovingGCEvent();
266266
 }
267267
 }
268268

269269
voidCodeDisableOptEvent(Handle<AbstractCode> code,
270270
 Handle<SharedFunctionInfo> shared) {
271-
 base::MutexGuardguard(&mutex_);
271+
 base::RecursiveMutexGuardguard(&mutex_);
272272
for (auto listener : listeners_) {
273273
 listener->CodeDisableOptEvent(code, shared);
274274
 }
275275
 }
276276

277277
voidCodeDeoptEvent(Handle<Code> code, DeoptimizeKind kind, Address pc,
278278
int fp_to_sp_delta) {
279-
 base::MutexGuardguard(&mutex_);
279+
 base::RecursiveMutexGuardguard(&mutex_);
280280
for (auto listener : listeners_) {
281281
 listener->CodeDeoptEvent(code, kind, pc, fp_to_sp_delta);
282282
 }
@@ -285,22 +285,22 @@ class Logger {
285285
voidCodeDependencyChangeEvent(Handle<Code> code,
286286
 Handle<SharedFunctionInfo> sfi,
287287
constchar* reason) {
288-
 base::MutexGuardguard(&mutex_);
288+
 base::RecursiveMutexGuardguard(&mutex_);
289289
for (auto listener : listeners_) {
290290
 listener->CodeDependencyChangeEvent(code, sfi, reason);
291291
 }
292292
 }
293293

294294
voidWeakCodeClearEvent() {
295-
 base::MutexGuardguard(&mutex_);
295+
 base::RecursiveMutexGuardguard(&mutex_);
296296
for (auto listener : listeners_) {
297297
 listener->WeakCodeClearEvent();
298298
 }
299299
 }
300300

301301
private:
302302
 std::vector<LogEventListener*> listeners_;
303-
 base::Mutex mutex_;
303+
 base::RecursiveMutex mutex_;
304304
};
305305

306306
} // namespace internal
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 3376e27
Browse files
camillobrunijuanarbol
camillobruni
authored and
juanarbol
committed
deps: V8: cherry-pick a6eaf7574109
Original commit message:
[logging] Use RecursiveMutex for Logger
Logger::allows_code_compaction might be called from within a
CodeCreateEvent where initializing line script line ends might trigger
a GC. During compaction we check if code compaction is allowed which
calls back into the above Logger method.
Bug: 41497149
Change-Id: Ifd1b740df8600584780341d8214e995832e663b4
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5572952
Reviewed-by: Victor Gomes <victorgomes@chromium.org>
Commit-Queue: Camillo Bruni <cbruni@chromium.org>
Cr-Commit-Position: refs/heads/main@{#94140}
Refs: v8/v8@a6eaf75
PR-URL: #65402Fixes: #65140
Reviewed-By: Richard Lau <richard.lau@ibm.com>
1 parent b816fc8 commit 3376e27
2 files changed
Lines changed: 24 additions & 24 deletions
File tree
‎common.gypi‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.56',
41+
'v8_embedder_string': '-node.57',
4242

4343
##### V8 defaults for Node.js #####
4444

‎deps/v8/src/logging/code-events.h‎
Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class Logger {
125125
 Logger& operator=(const Logger&) = delete;
126126

127127
boolAddListener(LogEventListener* listener) {
128-
 base::MutexGuardguard(&mutex_);
128+
 base::RecursiveMutexGuardguard(&mutex_);
129129
auto position = std::find(listeners_.begin(), listeners_.end(), listener);
130130
if (position != listeners_.end()) returnfalse;
131131
// Add the listener to the end and update the element
@@ -134,23 +134,23 @@ class Logger {
134134
 }
135135

136136
boolRemoveListener(LogEventListener* listener) {
137-
 base::MutexGuardguard(&mutex_);
137+
 base::RecursiveMutexGuardguard(&mutex_);
138138
auto position = std::find(listeners_.begin(), listeners_.end(), listener);
139139
if (position == listeners_.end()) returnfalse;
140140
 listeners_.erase(position);
141141
returntrue;
142142
 }
143143

144144
boolis_listening_to_code_events() {
145-
 base::MutexGuardguard(&mutex_);
145+
 base::RecursiveMutexGuardguard(&mutex_);
146146
for (auto listener : listeners_) {
147147
if (listener->is_listening_to_code_events()) returntrue;
148148
 }
149149
returnfalse;
150150
 }
151151

152152
boolallows_code_compaction() {
153-
 base::MutexGuardguard(&mutex_);
153+
 base::RecursiveMutexGuardguard(&mutex_);
154154
for (auto listener : listeners_) {
155155
if (!listener->allows_code_compaction()) returnfalse;
156156
 }
@@ -159,23 +159,23 @@ class Logger {
159159

160160
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
161161
constchar* comment) {
162-
 base::MutexGuardguard(&mutex_);
162+
 base::RecursiveMutexGuardguard(&mutex_);
163163
for (auto listener : listeners_) {
164164
 listener->CodeCreateEvent(tag, code, comment);
165165
 }
166166
 }
167167

168168
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
169169
 Handle<Name> name) {
170-
 base::MutexGuardguard(&mutex_);
170+
 base::RecursiveMutexGuardguard(&mutex_);
171171
for (auto listener : listeners_) {
172172
 listener->CodeCreateEvent(tag, code, name);
173173
 }
174174
 }
175175

176176
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
177177
 Handle<SharedFunctionInfo> shared, Handle<Name> name) {
178-
 base::MutexGuardguard(&mutex_);
178+
 base::RecursiveMutexGuardguard(&mutex_);
179179
for (auto listener : listeners_) {
180180
 listener->CodeCreateEvent(tag, code, shared, name);
181181
 }
@@ -184,7 +184,7 @@ class Logger {
184184
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
185185
 Handle<SharedFunctionInfo> shared, Handle<Name> source,
186186
int line, int column) {
187-
 base::MutexGuardguard(&mutex_);
187+
 base::RecursiveMutexGuardguard(&mutex_);
188188
for (auto listener : listeners_) {
189189
 listener->CodeCreateEvent(tag, code, shared, source, line, column);
190190
 }
@@ -194,7 +194,7 @@ class Logger {
194194
voidCodeCreateEvent(CodeTag tag, const wasm::WasmCode* code,
195195
 wasm::WasmName name, constchar* source_url,
196196
int code_offset, int script_id) {
197-
 base::MutexGuardguard(&mutex_);
197+
 base::RecursiveMutexGuardguard(&mutex_);
198198
for (auto listener : listeners_) {
199199
 listener->CodeCreateEvent(tag, code, name, source_url, code_offset,
200200
 script_id);
@@ -203,80 +203,80 @@ class Logger {
203203
#endif// V8_ENABLE_WEBASSEMBLY
204204

205205
voidCallbackEvent(Handle<Name> name, Address entry_point) {
206-
 base::MutexGuardguard(&mutex_);
206+
 base::RecursiveMutexGuardguard(&mutex_);
207207
for (auto listener : listeners_) {
208208
 listener->CallbackEvent(name, entry_point);
209209
 }
210210
 }
211211

212212
voidGetterCallbackEvent(Handle<Name> name, Address entry_point) {
213-
 base::MutexGuardguard(&mutex_);
213+
 base::RecursiveMutexGuardguard(&mutex_);
214214
for (auto listener : listeners_) {
215215
 listener->GetterCallbackEvent(name, entry_point);
216216
 }
217217
 }
218218

219219
voidSetterCallbackEvent(Handle<Name> name, Address entry_point) {
220-
 base::MutexGuardguard(&mutex_);
220+
 base::RecursiveMutexGuardguard(&mutex_);
221221
for (auto listener : listeners_) {
222222
 listener->SetterCallbackEvent(name, entry_point);
223223
 }
224224
 }
225225

226226
voidRegExpCodeCreateEvent(Handle<AbstractCode> code, Handle<String> source) {
227-
 base::MutexGuardguard(&mutex_);
227+
 base::RecursiveMutexGuardguard(&mutex_);
228228
for (auto listener : listeners_) {
229229
 listener->RegExpCodeCreateEvent(code, source);
230230
 }
231231
 }
232232

233233
voidCodeMoveEvent(Tagged<InstructionStream> from,
234234
 Tagged<InstructionStream> to) {
235-
 base::MutexGuardguard(&mutex_);
235+
 base::RecursiveMutexGuardguard(&mutex_);
236236
for (auto listener : listeners_) {
237237
 listener->CodeMoveEvent(from, to);
238238
 }
239239
 }
240240

241241
voidBytecodeMoveEvent(Tagged<BytecodeArray> from, Tagged<BytecodeArray> to) {
242-
 base::MutexGuardguard(&mutex_);
242+
 base::RecursiveMutexGuardguard(&mutex_);
243243
for (auto listener : listeners_) {
244244
 listener->BytecodeMoveEvent(from, to);
245245
 }
246246
 }
247247

248248
voidSharedFunctionInfoMoveEvent(Address from, Address to) {
249-
 base::MutexGuardguard(&mutex_);
249+
 base::RecursiveMutexGuardguard(&mutex_);
250250
for (auto listener : listeners_) {
251251
 listener->SharedFunctionInfoMoveEvent(from, to);
252252
 }
253253
 }
254254

255255
voidNativeContextMoveEvent(Address from, Address to) {
256-
 base::MutexGuardguard(&mutex_);
256+
 base::RecursiveMutexGuardguard(&mutex_);
257257
for (auto listener : listeners_) {
258258
 listener->NativeContextMoveEvent(from, to);
259259
 }
260260
 }
261261

262262
voidCodeMovingGCEvent() {
263-
 base::MutexGuardguard(&mutex_);
263+
 base::RecursiveMutexGuardguard(&mutex_);
264264
for (auto listener : listeners_) {
265265
 listener->CodeMovingGCEvent();
266266
 }
267267
 }
268268

269269
voidCodeDisableOptEvent(Handle<AbstractCode> code,
270270
 Handle<SharedFunctionInfo> shared) {
271-
 base::MutexGuardguard(&mutex_);
271+
 base::RecursiveMutexGuardguard(&mutex_);
272272
for (auto listener : listeners_) {
273273
 listener->CodeDisableOptEvent(code, shared);
274274
 }
275275
 }
276276

277277
voidCodeDeoptEvent(Handle<Code> code, DeoptimizeKind kind, Address pc,
278278
int fp_to_sp_delta) {
279-
 base::MutexGuardguard(&mutex_);
279+
 base::RecursiveMutexGuardguard(&mutex_);
280280
for (auto listener : listeners_) {
281281
 listener->CodeDeoptEvent(code, kind, pc, fp_to_sp_delta);
282282
 }
@@ -285,22 +285,22 @@ class Logger {
285285
voidCodeDependencyChangeEvent(Handle<Code> code,
286286
 Handle<SharedFunctionInfo> sfi,
287287
constchar* reason) {
288-
 base::MutexGuardguard(&mutex_);
288+
 base::RecursiveMutexGuardguard(&mutex_);
289289
for (auto listener : listeners_) {
290290
 listener->CodeDependencyChangeEvent(code, sfi, reason);
291291
 }
292292
 }
293293

294294
voidWeakCodeClearEvent() {
295-
 base::MutexGuardguard(&mutex_);
295+
 base::RecursiveMutexGuardguard(&mutex_);
296296
for (auto listener : listeners_) {
297297
 listener->WeakCodeClearEvent();
298298
 }
299299
 }
300300

301301
private:
302302
 std::vector<LogEventListener*> listeners_;
303-
 base::Mutex mutex_;
303+
 base::RecursiveMutex mutex_;
304304
};
305305

306306
} // namespace internal
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 3376e27
Browse files
camillobrunijuanarbol
camillobruni
authored and
juanarbol
committed
deps: V8: cherry-pick a6eaf7574109
Original commit message:
[logging] Use RecursiveMutex for Logger
Logger::allows_code_compaction might be called from within a
CodeCreateEvent where initializing line script line ends might trigger
a GC. During compaction we check if code compaction is allowed which
calls back into the above Logger method.
Bug: 41497149
Change-Id: Ifd1b740df8600584780341d8214e995832e663b4
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5572952
Reviewed-by: Victor Gomes <victorgomes@chromium.org>
Commit-Queue: Camillo Bruni <cbruni@chromium.org>
Cr-Commit-Position: refs/heads/main@{#94140}
Refs: v8/v8@a6eaf75
PR-URL: #65402Fixes: #65140
Reviewed-By: Richard Lau <richard.lau@ibm.com>
1 parent b816fc8 commit 3376e27
2 files changed
Lines changed: 24 additions & 24 deletions
File tree
‎common.gypi‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.56',
41+
'v8_embedder_string': '-node.57',
4242

4343
##### V8 defaults for Node.js #####
4444

‎deps/v8/src/logging/code-events.h‎
Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class Logger {
125125
 Logger& operator=(const Logger&) = delete;
126126

127127
boolAddListener(LogEventListener* listener) {
128-
 base::MutexGuardguard(&mutex_);
128+
 base::RecursiveMutexGuardguard(&mutex_);
129129
auto position = std::find(listeners_.begin(), listeners_.end(), listener);
130130
if (position != listeners_.end()) returnfalse;
131131
// Add the listener to the end and update the element
@@ -134,23 +134,23 @@ class Logger {
134134
 }
135135

136136
boolRemoveListener(LogEventListener* listener) {
137-
 base::MutexGuardguard(&mutex_);
137+
 base::RecursiveMutexGuardguard(&mutex_);
138138
auto position = std::find(listeners_.begin(), listeners_.end(), listener);
139139
if (position == listeners_.end()) returnfalse;
140140
 listeners_.erase(position);
141141
returntrue;
142142
 }
143143

144144
boolis_listening_to_code_events() {
145-
 base::MutexGuardguard(&mutex_);
145+
 base::RecursiveMutexGuardguard(&mutex_);
146146
for (auto listener : listeners_) {
147147
if (listener->is_listening_to_code_events()) returntrue;
148148
 }
149149
returnfalse;
150150
 }
151151

152152
boolallows_code_compaction() {
153-
 base::MutexGuardguard(&mutex_);
153+
 base::RecursiveMutexGuardguard(&mutex_);
154154
for (auto listener : listeners_) {
155155
if (!listener->allows_code_compaction()) returnfalse;
156156
 }
@@ -159,23 +159,23 @@ class Logger {
159159

160160
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
161161
constchar* comment) {
162-
 base::MutexGuardguard(&mutex_);
162+
 base::RecursiveMutexGuardguard(&mutex_);
163163
for (auto listener : listeners_) {
164164
 listener->CodeCreateEvent(tag, code, comment);
165165
 }
166166
 }
167167

168168
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
169169
 Handle<Name> name) {
170-
 base::MutexGuardguard(&mutex_);
170+
 base::RecursiveMutexGuardguard(&mutex_);
171171
for (auto listener : listeners_) {
172172
 listener->CodeCreateEvent(tag, code, name);
173173
 }
174174
 }
175175

176176
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
177177
 Handle<SharedFunctionInfo> shared, Handle<Name> name) {
178-
 base::MutexGuardguard(&mutex_);
178+
 base::RecursiveMutexGuardguard(&mutex_);
179179
for (auto listener : listeners_) {
180180
 listener->CodeCreateEvent(tag, code, shared, name);
181181
 }
@@ -184,7 +184,7 @@ class Logger {
184184
voidCodeCreateEvent(CodeTag tag, Handle<AbstractCode> code,
185185
 Handle<SharedFunctionInfo> shared, Handle<Name> source,
186186
int line, int column) {
187-
 base::MutexGuardguard(&mutex_);
187+
 base::RecursiveMutexGuardguard(&mutex_);
188188
for (auto listener : listeners_) {
189189
 listener->CodeCreateEvent(tag, code, shared, source, line, column);
190190
 }
@@ -194,7 +194,7 @@ class Logger {
194194
voidCodeCreateEvent(CodeTag tag, const wasm::WasmCode* code,
195195
 wasm::WasmName name, constchar* source_url,
196196
int code_offset, int script_id) {
197-
 base::MutexGuardguard(&mutex_);
197+
 base::RecursiveMutexGuardguard(&mutex_);
198198
for (auto listener : listeners_) {
199199
 listener->CodeCreateEvent(tag, code, name, source_url, code_offset,
200200
 script_id);
@@ -203,80 +203,80 @@ class Logger {
203203
#endif// V8_ENABLE_WEBASSEMBLY
204204

205205
voidCallbackEvent(Handle<Name> name, Address entry_point) {
206-
 base::MutexGuardguard(&mutex_);
206+
 base::RecursiveMutexGuardguard(&mutex_);
207207
for (auto listener : listeners_) {
208208
 listener->CallbackEvent(name, entry_point);
209209
 }
210210
 }
211211

212212
voidGetterCallbackEvent(Handle<Name> name, Address entry_point) {
213-
 base::MutexGuardguard(&mutex_);
213+
 base::RecursiveMutexGuardguard(&mutex_);
214214
for (auto listener : listeners_) {
215215
 listener->GetterCallbackEvent(name, entry_point);
216216
 }
217217
 }
218218

219219
voidSetterCallbackEvent(Handle<Name> name, Address entry_point) {
220-
 base::MutexGuardguard(&mutex_);
220+
 base::RecursiveMutexGuardguard(&mutex_);
221221
for (auto listener : listeners_) {
222222
 listener->SetterCallbackEvent(name, entry_point);
223223
 }
224224
 }
225225

226226
voidRegExpCodeCreateEvent(Handle<AbstractCode> code, Handle<String> source) {
227-
 base::MutexGuardguard(&mutex_);
227+
 base::RecursiveMutexGuardguard(&mutex_);
228228
for (auto listener : listeners_) {
229229
 listener->RegExpCodeCreateEvent(code, source);
230230
 }
231231
 }
232232

233233
voidCodeMoveEvent(Tagged<InstructionStream> from,
234234
 Tagged<InstructionStream> to) {
235-
 base::MutexGuardguard(&mutex_);
235+
 base::RecursiveMutexGuardguard(&mutex_);
236236
for (auto listener : listeners_) {
237237
 listener->CodeMoveEvent(from, to);
238238
 }
239239
 }
240240

241241
voidBytecodeMoveEvent(Tagged<BytecodeArray> from, Tagged<BytecodeArray> to) {
242-
 base::MutexGuardguard(&mutex_);
242+
 base::RecursiveMutexGuardguard(&mutex_);
243243
for (auto listener : listeners_) {
244244
 listener->BytecodeMoveEvent(from, to);
245245
 }
246246
 }
247247

248248
voidSharedFunctionInfoMoveEvent(Address from, Address to) {
249-
 base::MutexGuardguard(&mutex_);
249+
 base::RecursiveMutexGuardguard(&mutex_);
250250
for (auto listener : listeners_) {
251251
 listener->SharedFunctionInfoMoveEvent(from, to);
252252
 }
253253
 }
254254

255255
voidNativeContextMoveEvent(Address from, Address to) {
256-
 base::MutexGuardguard(&mutex_);
256+
 base::RecursiveMutexGuardguard(&mutex_);
257257
for (auto listener : listeners_) {
258258
 listener->NativeContextMoveEvent(from, to);
259259
 }
260260
 }
261261

262262
voidCodeMovingGCEvent() {
263-
 base::MutexGuardguard(&mutex_);
263+
 base::RecursiveMutexGuardguard(&mutex_);
264264
for (auto listener : listeners_) {
265265
 listener->CodeMovingGCEvent();
266266
 }
267267
 }
268268

269269
voidCodeDisableOptEvent(Handle<AbstractCode> code,
270270
 Handle<SharedFunctionInfo> shared) {
271-
 base::MutexGuardguard(&mutex_);
271+
 base::RecursiveMutexGuardguard(&mutex_);
272272
for (auto listener : listeners_) {
273273
 listener->CodeDisableOptEvent(code, shared);
274274
 }
275275
 }
276276

277277
voidCodeDeoptEvent(Handle<Code> code, DeoptimizeKind kind, Address pc,
278278
int fp_to_sp_delta) {
279-
 base::MutexGuardguard(&mutex_);
279+
 base::RecursiveMutexGuardguard(&mutex_);
280280
for (auto listener : listeners_) {
281281
 listener->CodeDeoptEvent(code, kind, pc, fp_to_sp_delta);
282282
 }
@@ -285,22 +285,22 @@ class Logger {
285285
voidCodeDependencyChangeEvent(Handle<Code> code,
286286
 Handle<SharedFunctionInfo> sfi,
287287
constchar* reason) {
288-
 base::MutexGuardguard(&mutex_);
288+
 base::RecursiveMutexGuardguard(&mutex_);
289289
for (auto listener : listeners_) {
290290
 listener->CodeDependencyChangeEvent(code, sfi, reason);
291291
 }
292292
 }
293293

294294
voidWeakCodeClearEvent() {
295-
 base::MutexGuardguard(&mutex_);
295+
 base::RecursiveMutexGuardguard(&mutex_);
296296
for (auto listener : listeners_) {
297297
 listener->WeakCodeClearEvent();
298298
 }
299299
 }
300300

301301
private:
302302
 std::vector<LogEventListener*> listeners_;
303-
 base::Mutex mutex_;
303+
 base::RecursiveMutex mutex_;
304304
};
305305

306306
} // namespace internal
0 commit comments
Comments
 (0)