Commit fbb3960

Browse files
addaleaxaduh95
addaleax
authored and
aduh95
committed
src: show original file name in FileHandle GC close errors
Otherwise, it can be virtually impossible to debug where these types of errors originate from. PR-URL: #60593 Backport-PR-URL: #64675 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 2cc54e1 commit fbb3960

3 files changed

Lines changed: 32 additions & 17 deletions

File tree

‎src/dataqueue/queue.cc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,7 @@ class FdEntry final : public EntryImpl {
916916
fs::FileHandle::New(realm->GetBindingData<fs::BindingData>(),
917917
file,
918918
Local<Object>(),
919+
{},
919920
entry->start_,
920921
entry->end_ - entry->start_)),
921922
entry);

‎src/node_file.cc‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,12 @@ void FSReqBase::MemoryInfo(MemoryTracker* tracker) const {
222222
// collection if necessary. If that happens, a process warning will be
223223
// emitted (or a fatal exception will occur if the fd cannot be closed.)
224224
FileHandle::FileHandle(BindingData* binding_data,
225-
Local<Object> obj, int fd)
225+
Local<Object> obj,
226+
int fd,
227+
std::string original_name)
226228
: AsyncWrap(binding_data->env(), obj, AsyncWrap::PROVIDER_FILEHANDLE),
227229
StreamBase(env()),
230+
original_name_(std::move(original_name)),
228231
fd_(fd),
229232
binding_data_(binding_data) {
230233
MakeWeak();
@@ -234,6 +237,7 @@ FileHandle::FileHandle(BindingData* binding_data,
234237
FileHandle* FileHandle::New(BindingData* binding_data,
235238
int fd,
236239
Local<Object> obj,
240+
std::string original_name,
237241
std::optional<int64_t> maybeOffset,
238242
std::optional<int64_t> maybeLength) {
239243
Environment* env = binding_data->env();
@@ -242,7 +246,7 @@ FileHandle* FileHandle::New(BindingData* binding_data,
242246
.ToLocal(&obj)) {
243247
returnnullptr;
244248
}
245-
auto handle = newFileHandle(binding_data, obj, fd);
249+
auto handle = newFileHandle(binding_data, obj, fd, original_name);
246250
if (maybeOffset.has_value()) handle->read_offset_ = maybeOffset.value();
247251
if (maybeLength.has_value()) handle->read_length_ = maybeLength.value();
248252
return handle;
@@ -274,6 +278,7 @@ void FileHandle::New(const FunctionCallbackInfo<Value>& args) {
274278
FileHandle::New(binding_data,
275279
args[0].As<Int32>()->Value(),
276280
args.This(),
281+
{},
277282
maybeOffset,
278283
maybeLength);
279284
}
@@ -293,6 +298,7 @@ int FileHandle::DoWrite(WriteWrap* w,
293298

294299
voidFileHandle::MemoryInfo(MemoryTracker* tracker) const {
295300
tracker->TrackField("current_read", current_read_);
301+
tracker->TrackField("original_name", original_name_);
296302
}
297303

298304
BaseObject::TransferMode FileHandle::GetTransferMode() const {
@@ -346,25 +352,28 @@ inline void FileHandle::Close() {
346352
FS_SYNC_TRACE_END(close);
347353
uv_fs_req_cleanup(&req);
348354

349-
structerr_detail { int ret; int fd; };
355+
structerr_detail {
356+
int ret;
357+
int fd;
358+
std::string name;
359+
};
350360

351-
err_detail detail { ret, fd_};
361+
err_detail detail{ret, fd_, original_name_};
352362

353363
AfterClose();
354364

355365
if (ret < 0) {
356366
// Do not unref this
357367
env()->SetImmediate([detail](Environment* env) {
358-
char msg[70];
359-
snprintf(msg, arraysize(msg),
360-
"Closing file descriptor %d on garbage collection failed",
361-
detail.fd);
362-
// This exception will end up being fatal for the process because
363-
// it is being thrown from within the SetImmediate handler and
364-
// there is no JS stack to bubble it to. In other words, tearing
365-
// down the process is the only reasonable thing we can do here.
366368
HandleScope handle_scope(env->isolate());
367-
env->ThrowUVException(detail.ret, "close", msg);
369+
staticconstexpr std::string_view unknown_path = "<unknown path>";
370+
std::string_view filename =
371+
detail.name.empty() ? unknown_path : detail.name;
372+
auto formatted = SPrintF(
373+
"Closing file descriptor %d on garbage collection failed (%s)",
374+
detail.fd,
375+
filename);
376+
env->ThrowUVException(detail.ret, "close", formatted.c_str());
368377
});
369378
return;
370379
}
@@ -846,8 +855,8 @@ void AfterOpenFileHandle(uv_fs_t* req) {
846855
FS_ASYNC_TRACE_END1(
847856
req->fs_type, req_wrap, "result", static_cast<int>(req->result))
848857
if (after.Proceed()) {
849-
FileHandle* fd = FileHandle::New(req_wrap->binding_data(),
850-
static_cast<int>(req->result));
858+
FileHandle* fd = FileHandle::New(
859+
req_wrap->binding_data(), static_cast<int>(req->result), {}, req->path);
851860
if (fd == nullptr) return;
852861
req_wrap->Resolve(fd->object());
853862
}
@@ -2277,7 +2286,7 @@ static void OpenFileHandle(const FunctionCallbackInfo<Value>& args) {
22772286
if (result < 0) {
22782287
return; // syscall failed, no need to continue, error info is in ctx
22792288
}
2280-
FileHandle* fd = FileHandle::New(binding_data, result);
2289+
FileHandle* fd = FileHandle::New(binding_data, result, {}, path.ToString());
22812290
if (fd == nullptr) return;
22822291
args.GetReturnValue().Set(fd->object());
22832292
}

‎src/node_file.h‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ class FileHandle final : public AsyncWrap, public StreamBase {
331331
static FileHandle* New(BindingData* binding_data,
332332
int fd,
333333
v8::Local<v8::Object> obj = v8::Local<v8::Object>(),
334+
std::string original_name = {},
334335
std::optional<int64_t> maybeOffset = std::nullopt,
335336
std::optional<int64_t> maybeLength = std::nullopt);
336337
~FileHandle() override;
@@ -397,7 +398,10 @@ class FileHandle final : public AsyncWrap, public StreamBase {
397398
int fd_;
398399
};
399400

400-
FileHandle(BindingData* binding_data, v8::Local<v8::Object> obj, int fd);
401+
FileHandle(BindingData* binding_data,
402+
v8::Local<v8::Object> obj,
403+
int fd,
404+
std::string original_name);
401405

402406
// Synchronous close that emits a warning
403407
voidClose();
@@ -439,6 +443,7 @@ class FileHandle final : public AsyncWrap, public StreamBase {
439443
// Asynchronous close
440444
v8::MaybeLocal<v8::Promise> ClosePromise();
441445

446+
std::string original_name_;
442447
int fd_;
443448
bool closing_ = false;
444449
bool closed_ = false;

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 fbb3960
Browse files
addaleaxaduh95
addaleax
authored and
aduh95
committed
src: show original file name in FileHandle GC close errors
Otherwise, it can be virtually impossible to debug where these types
of errors originate from.
PR-URL: #60593
Backport-PR-URL: #64675
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 2cc54e1 commit fbb3960
3 files changed
Lines changed: 32 additions & 17 deletions
File tree
‎src/dataqueue/queue.cc‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,7 @@ class FdEntry final : public EntryImpl {
916916
fs::FileHandle::New(realm->GetBindingData<fs::BindingData>(),
917917
 file,
918918
 Local<Object>(),
919+
 {},
919920
 entry->start_,
920921
 entry->end_ - entry->start_)),
921922
 entry);
‎src/node_file.cc‎
Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,12 @@ void FSReqBase::MemoryInfo(MemoryTracker* tracker) const {
222222
// collection if necessary. If that happens, a process warning will be
223223
// emitted (or a fatal exception will occur if the fd cannot be closed.)
224224
FileHandle::FileHandle(BindingData* binding_data,
225-
 Local<Object> obj, int fd)
225+
 Local<Object> obj,
226+
int fd,
227+
 std::string original_name)
226228
 : AsyncWrap(binding_data->env(), obj, AsyncWrap::PROVIDER_FILEHANDLE),
227229
 StreamBase(env()),
230+
 original_name_(std::move(original_name)),
228231
 fd_(fd),
229232
 binding_data_(binding_data) {
230233
MakeWeak();
@@ -234,6 +237,7 @@ FileHandle::FileHandle(BindingData* binding_data,
234237
FileHandle* FileHandle::New(BindingData* binding_data,
235238
int fd,
236239
 Local<Object> obj,
240+
 std::string original_name,
237241
 std::optional<int64_t> maybeOffset,
238242
 std::optional<int64_t> maybeLength) {
239243
 Environment* env = binding_data->env();
@@ -242,7 +246,7 @@ FileHandle* FileHandle::New(BindingData* binding_data,
242246
 .ToLocal(&obj)) {
243247
returnnullptr;
244248
 }
245-
auto handle = newFileHandle(binding_data, obj, fd);
249+
auto handle = newFileHandle(binding_data, obj, fd, original_name);
246250
if (maybeOffset.has_value()) handle->read_offset_ = maybeOffset.value();
247251
if (maybeLength.has_value()) handle->read_length_ = maybeLength.value();
248252
return handle;
@@ -274,6 +278,7 @@ void FileHandle::New(const FunctionCallbackInfo<Value>& args) {
274278
FileHandle::New(binding_data,
275279
 args[0].As<Int32>()->Value(),
276280
 args.This(),
281+
 {},
277282
 maybeOffset,
278283
 maybeLength);
279284
}
@@ -293,6 +298,7 @@ int FileHandle::DoWrite(WriteWrap* w,
293298

294299
voidFileHandle::MemoryInfo(MemoryTracker* tracker) const {
295300
 tracker->TrackField("current_read", current_read_);
301+
 tracker->TrackField("original_name", original_name_);
296302
}
297303

298304
BaseObject::TransferMode FileHandle::GetTransferMode() const {
@@ -346,25 +352,28 @@ inline void FileHandle::Close() {
346352
FS_SYNC_TRACE_END(close);
347353
uv_fs_req_cleanup(&req);
348354

349-
structerr_detail { int ret; int fd; };
355+
structerr_detail {
356+
int ret;
357+
int fd;
358+
 std::string name;
359+
 };
350360

351-
 err_detail detail { ret, fd_};
361+
 err_detail detail{ret, fd_, original_name_};
352362

353363
AfterClose();
354364

355365
if (ret < 0) {
356366
// Do not unref this
357367
env()->SetImmediate([detail](Environment* env) {
358-
char msg[70];
359-
snprintf(msg, arraysize(msg),
360-
"Closing file descriptor %d on garbage collection failed",
361-
 detail.fd);
362-
// This exception will end up being fatal for the process because
363-
// it is being thrown from within the SetImmediate handler and
364-
// there is no JS stack to bubble it to. In other words, tearing
365-
// down the process is the only reasonable thing we can do here.
366368
 HandleScope handle_scope(env->isolate());
367-
 env->ThrowUVException(detail.ret, "close", msg);
369+
staticconstexpr std::string_view unknown_path = "<unknown path>";
370+
 std::string_view filename =
371+
 detail.name.empty() ? unknown_path : detail.name;
372+
auto formatted = SPrintF(
373+
"Closing file descriptor %d on garbage collection failed (%s)",
374+
 detail.fd,
375+
 filename);
376+
 env->ThrowUVException(detail.ret, "close", formatted.c_str());
368377
 });
369378
return;
370379
 }
@@ -846,8 +855,8 @@ void AfterOpenFileHandle(uv_fs_t* req) {
846855
FS_ASYNC_TRACE_END1(
847856
 req->fs_type, req_wrap, "result", static_cast<int>(req->result))
848857
if (after.Proceed()) {
849-
 FileHandle* fd = FileHandle::New(req_wrap->binding_data(),
850-
static_cast<int>(req->result));
858+
 FileHandle* fd = FileHandle::New(
859+
req_wrap->binding_data(), static_cast<int>(req->result), {}, req->path);
851860
if (fd == nullptr) return;
852861
 req_wrap->Resolve(fd->object());
853862
 }
@@ -2277,7 +2286,7 @@ static void OpenFileHandle(const FunctionCallbackInfo<Value>& args) {
22772286
if (result < 0) {
22782287
return; // syscall failed, no need to continue, error info is in ctx
22792288
 }
2280-
 FileHandle* fd = FileHandle::New(binding_data, result);
2289+
 FileHandle* fd = FileHandle::New(binding_data, result, {}, path.ToString());
22812290
if (fd == nullptr) return;
22822291
 args.GetReturnValue().Set(fd->object());
22832292
 }
‎src/node_file.h‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ class FileHandle final : public AsyncWrap, public StreamBase {
331331
static FileHandle* New(BindingData* binding_data,
332332
int fd,
333333
 v8::Local<v8::Object> obj = v8::Local<v8::Object>(),
334+
 std::string original_name = {},
334335
 std::optional<int64_t> maybeOffset = std::nullopt,
335336
 std::optional<int64_t> maybeLength = std::nullopt);
336337
~FileHandle() override;
@@ -397,7 +398,10 @@ class FileHandle final : public AsyncWrap, public StreamBase {
397398
int fd_;
398399
 };
399400

400-
FileHandle(BindingData* binding_data, v8::Local<v8::Object> obj, int fd);
401+
FileHandle(BindingData* binding_data,
402+
 v8::Local<v8::Object> obj,
403+
int fd,
404+
 std::string original_name);
401405

402406
// Synchronous close that emits a warning
403407
voidClose();
@@ -439,6 +443,7 @@ class FileHandle final : public AsyncWrap, public StreamBase {
439443
// Asynchronous close
440444
 v8::MaybeLocal<v8::Promise> ClosePromise();
441445

446+
 std::string original_name_;
442447
int fd_;
443448
bool closing_ = false;
444449
bool closed_ = false;
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 fbb3960
Browse files
addaleaxaduh95
addaleax
authored and
aduh95
committed
src: show original file name in FileHandle GC close errors
Otherwise, it can be virtually impossible to debug where these types
of errors originate from.
PR-URL: #60593
Backport-PR-URL: #64675
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 2cc54e1 commit fbb3960
3 files changed
Lines changed: 32 additions & 17 deletions
File tree
‎src/dataqueue/queue.cc‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,7 @@ class FdEntry final : public EntryImpl {
916916
fs::FileHandle::New(realm->GetBindingData<fs::BindingData>(),
917917
 file,
918918
 Local<Object>(),
919+
 {},
919920
 entry->start_,
920921
 entry->end_ - entry->start_)),
921922
 entry);
‎src/node_file.cc‎
Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,12 @@ void FSReqBase::MemoryInfo(MemoryTracker* tracker) const {
222222
// collection if necessary. If that happens, a process warning will be
223223
// emitted (or a fatal exception will occur if the fd cannot be closed.)
224224
FileHandle::FileHandle(BindingData* binding_data,
225-
 Local<Object> obj, int fd)
225+
 Local<Object> obj,
226+
int fd,
227+
 std::string original_name)
226228
 : AsyncWrap(binding_data->env(), obj, AsyncWrap::PROVIDER_FILEHANDLE),
227229
 StreamBase(env()),
230+
 original_name_(std::move(original_name)),
228231
 fd_(fd),
229232
 binding_data_(binding_data) {
230233
MakeWeak();
@@ -234,6 +237,7 @@ FileHandle::FileHandle(BindingData* binding_data,
234237
FileHandle* FileHandle::New(BindingData* binding_data,
235238
int fd,
236239
 Local<Object> obj,
240+
 std::string original_name,
237241
 std::optional<int64_t> maybeOffset,
238242
 std::optional<int64_t> maybeLength) {
239243
 Environment* env = binding_data->env();
@@ -242,7 +246,7 @@ FileHandle* FileHandle::New(BindingData* binding_data,
242246
 .ToLocal(&obj)) {
243247
returnnullptr;
244248
 }
245-
auto handle = newFileHandle(binding_data, obj, fd);
249+
auto handle = newFileHandle(binding_data, obj, fd, original_name);
246250
if (maybeOffset.has_value()) handle->read_offset_ = maybeOffset.value();
247251
if (maybeLength.has_value()) handle->read_length_ = maybeLength.value();
248252
return handle;
@@ -274,6 +278,7 @@ void FileHandle::New(const FunctionCallbackInfo<Value>& args) {
274278
FileHandle::New(binding_data,
275279
 args[0].As<Int32>()->Value(),
276280
 args.This(),
281+
 {},
277282
 maybeOffset,
278283
 maybeLength);
279284
}
@@ -293,6 +298,7 @@ int FileHandle::DoWrite(WriteWrap* w,
293298

294299
voidFileHandle::MemoryInfo(MemoryTracker* tracker) const {
295300
 tracker->TrackField("current_read", current_read_);
301+
 tracker->TrackField("original_name", original_name_);
296302
}
297303

298304
BaseObject::TransferMode FileHandle::GetTransferMode() const {
@@ -346,25 +352,28 @@ inline void FileHandle::Close() {
346352
FS_SYNC_TRACE_END(close);
347353
uv_fs_req_cleanup(&req);
348354

349-
structerr_detail { int ret; int fd; };
355+
structerr_detail {
356+
int ret;
357+
int fd;
358+
 std::string name;
359+
 };
350360

351-
 err_detail detail { ret, fd_};
361+
 err_detail detail{ret, fd_, original_name_};
352362

353363
AfterClose();
354364

355365
if (ret < 0) {
356366
// Do not unref this
357367
env()->SetImmediate([detail](Environment* env) {
358-
char msg[70];
359-
snprintf(msg, arraysize(msg),
360-
"Closing file descriptor %d on garbage collection failed",
361-
 detail.fd);
362-
// This exception will end up being fatal for the process because
363-
// it is being thrown from within the SetImmediate handler and
364-
// there is no JS stack to bubble it to. In other words, tearing
365-
// down the process is the only reasonable thing we can do here.
366368
 HandleScope handle_scope(env->isolate());
367-
 env->ThrowUVException(detail.ret, "close", msg);
369+
staticconstexpr std::string_view unknown_path = "<unknown path>";
370+
 std::string_view filename =
371+
 detail.name.empty() ? unknown_path : detail.name;
372+
auto formatted = SPrintF(
373+
"Closing file descriptor %d on garbage collection failed (%s)",
374+
 detail.fd,
375+
 filename);
376+
 env->ThrowUVException(detail.ret, "close", formatted.c_str());
368377
 });
369378
return;
370379
 }
@@ -846,8 +855,8 @@ void AfterOpenFileHandle(uv_fs_t* req) {
846855
FS_ASYNC_TRACE_END1(
847856
 req->fs_type, req_wrap, "result", static_cast<int>(req->result))
848857
if (after.Proceed()) {
849-
 FileHandle* fd = FileHandle::New(req_wrap->binding_data(),
850-
static_cast<int>(req->result));
858+
 FileHandle* fd = FileHandle::New(
859+
req_wrap->binding_data(), static_cast<int>(req->result), {}, req->path);
851860
if (fd == nullptr) return;
852861
 req_wrap->Resolve(fd->object());
853862
 }
@@ -2277,7 +2286,7 @@ static void OpenFileHandle(const FunctionCallbackInfo<Value>& args) {
22772286
if (result < 0) {
22782287
return; // syscall failed, no need to continue, error info is in ctx
22792288
 }
2280-
 FileHandle* fd = FileHandle::New(binding_data, result);
2289+
 FileHandle* fd = FileHandle::New(binding_data, result, {}, path.ToString());
22812290
if (fd == nullptr) return;
22822291
 args.GetReturnValue().Set(fd->object());
22832292
 }
‎src/node_file.h‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ class FileHandle final : public AsyncWrap, public StreamBase {
331331
static FileHandle* New(BindingData* binding_data,
332332
int fd,
333333
 v8::Local<v8::Object> obj = v8::Local<v8::Object>(),
334+
 std::string original_name = {},
334335
 std::optional<int64_t> maybeOffset = std::nullopt,
335336
 std::optional<int64_t> maybeLength = std::nullopt);
336337
~FileHandle() override;
@@ -397,7 +398,10 @@ class FileHandle final : public AsyncWrap, public StreamBase {
397398
int fd_;
398399
 };
399400

400-
FileHandle(BindingData* binding_data, v8::Local<v8::Object> obj, int fd);
401+
FileHandle(BindingData* binding_data,
402+
 v8::Local<v8::Object> obj,
403+
int fd,
404+
 std::string original_name);
401405

402406
// Synchronous close that emits a warning
403407
voidClose();
@@ -439,6 +443,7 @@ class FileHandle final : public AsyncWrap, public StreamBase {
439443
// Asynchronous close
440444
 v8::MaybeLocal<v8::Promise> ClosePromise();
441445

446+
 std::string original_name_;
442447
int fd_;
443448
bool closing_ = false;
444449
bool closed_ = false;
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 fbb3960
Browse files
addaleaxaduh95
addaleax
authored and
aduh95
committed
src: show original file name in FileHandle GC close errors
Otherwise, it can be virtually impossible to debug where these types
of errors originate from.
PR-URL: #60593
Backport-PR-URL: #64675
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 2cc54e1 commit fbb3960
3 files changed
Lines changed: 32 additions & 17 deletions
File tree
‎src/dataqueue/queue.cc‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,7 @@ class FdEntry final : public EntryImpl {
916916
fs::FileHandle::New(realm->GetBindingData<fs::BindingData>(),
917917
 file,
918918
 Local<Object>(),
919+
 {},
919920
 entry->start_,
920921
 entry->end_ - entry->start_)),
921922
 entry);
‎src/node_file.cc‎
Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,12 @@ void FSReqBase::MemoryInfo(MemoryTracker* tracker) const {
222222
// collection if necessary. If that happens, a process warning will be
223223
// emitted (or a fatal exception will occur if the fd cannot be closed.)
224224
FileHandle::FileHandle(BindingData* binding_data,
225-
 Local<Object> obj, int fd)
225+
 Local<Object> obj,
226+
int fd,
227+
 std::string original_name)
226228
 : AsyncWrap(binding_data->env(), obj, AsyncWrap::PROVIDER_FILEHANDLE),
227229
 StreamBase(env()),
230+
 original_name_(std::move(original_name)),
228231
 fd_(fd),
229232
 binding_data_(binding_data) {
230233
MakeWeak();
@@ -234,6 +237,7 @@ FileHandle::FileHandle(BindingData* binding_data,
234237
FileHandle* FileHandle::New(BindingData* binding_data,
235238
int fd,
236239
 Local<Object> obj,
240+
 std::string original_name,
237241
 std::optional<int64_t> maybeOffset,
238242
 std::optional<int64_t> maybeLength) {
239243
 Environment* env = binding_data->env();
@@ -242,7 +246,7 @@ FileHandle* FileHandle::New(BindingData* binding_data,
242246
 .ToLocal(&obj)) {
243247
returnnullptr;
244248
 }
245-
auto handle = newFileHandle(binding_data, obj, fd);
249+
auto handle = newFileHandle(binding_data, obj, fd, original_name);
246250
if (maybeOffset.has_value()) handle->read_offset_ = maybeOffset.value();
247251
if (maybeLength.has_value()) handle->read_length_ = maybeLength.value();
248252
return handle;
@@ -274,6 +278,7 @@ void FileHandle::New(const FunctionCallbackInfo<Value>& args) {
274278
FileHandle::New(binding_data,
275279
 args[0].As<Int32>()->Value(),
276280
 args.This(),
281+
 {},
277282
 maybeOffset,
278283
 maybeLength);
279284
}
@@ -293,6 +298,7 @@ int FileHandle::DoWrite(WriteWrap* w,
293298

294299
voidFileHandle::MemoryInfo(MemoryTracker* tracker) const {
295300
 tracker->TrackField("current_read", current_read_);
301+
 tracker->TrackField("original_name", original_name_);
296302
}
297303

298304
BaseObject::TransferMode FileHandle::GetTransferMode() const {
@@ -346,25 +352,28 @@ inline void FileHandle::Close() {
346352
FS_SYNC_TRACE_END(close);
347353
uv_fs_req_cleanup(&req);
348354

349-
structerr_detail { int ret; int fd; };
355+
structerr_detail {
356+
int ret;
357+
int fd;
358+
 std::string name;
359+
 };
350360

351-
 err_detail detail { ret, fd_};
361+
 err_detail detail{ret, fd_, original_name_};
352362

353363
AfterClose();
354364

355365
if (ret < 0) {
356366
// Do not unref this
357367
env()->SetImmediate([detail](Environment* env) {
358-
char msg[70];
359-
snprintf(msg, arraysize(msg),
360-
"Closing file descriptor %d on garbage collection failed",
361-
 detail.fd);
362-
// This exception will end up being fatal for the process because
363-
// it is being thrown from within the SetImmediate handler and
364-
// there is no JS stack to bubble it to. In other words, tearing
365-
// down the process is the only reasonable thing we can do here.
366368
 HandleScope handle_scope(env->isolate());
367-
 env->ThrowUVException(detail.ret, "close", msg);
369+
staticconstexpr std::string_view unknown_path = "<unknown path>";
370+
 std::string_view filename =
371+
 detail.name.empty() ? unknown_path : detail.name;
372+
auto formatted = SPrintF(
373+
"Closing file descriptor %d on garbage collection failed (%s)",
374+
 detail.fd,
375+
 filename);
376+
 env->ThrowUVException(detail.ret, "close", formatted.c_str());
368377
 });
369378
return;
370379
 }
@@ -846,8 +855,8 @@ void AfterOpenFileHandle(uv_fs_t* req) {
846855
FS_ASYNC_TRACE_END1(
847856
 req->fs_type, req_wrap, "result", static_cast<int>(req->result))
848857
if (after.Proceed()) {
849-
 FileHandle* fd = FileHandle::New(req_wrap->binding_data(),
850-
static_cast<int>(req->result));
858+
 FileHandle* fd = FileHandle::New(
859+
req_wrap->binding_data(), static_cast<int>(req->result), {}, req->path);
851860
if (fd == nullptr) return;
852861
 req_wrap->Resolve(fd->object());
853862
 }
@@ -2277,7 +2286,7 @@ static void OpenFileHandle(const FunctionCallbackInfo<Value>& args) {
22772286
if (result < 0) {
22782287
return; // syscall failed, no need to continue, error info is in ctx
22792288
 }
2280-
 FileHandle* fd = FileHandle::New(binding_data, result);
2289+
 FileHandle* fd = FileHandle::New(binding_data, result, {}, path.ToString());
22812290
if (fd == nullptr) return;
22822291
 args.GetReturnValue().Set(fd->object());
22832292
 }
‎src/node_file.h‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ class FileHandle final : public AsyncWrap, public StreamBase {
331331
static FileHandle* New(BindingData* binding_data,
332332
int fd,
333333
 v8::Local<v8::Object> obj = v8::Local<v8::Object>(),
334+
 std::string original_name = {},
334335
 std::optional<int64_t> maybeOffset = std::nullopt,
335336
 std::optional<int64_t> maybeLength = std::nullopt);
336337
~FileHandle() override;
@@ -397,7 +398,10 @@ class FileHandle final : public AsyncWrap, public StreamBase {
397398
int fd_;
398399
 };
399400

400-
FileHandle(BindingData* binding_data, v8::Local<v8::Object> obj, int fd);
401+
FileHandle(BindingData* binding_data,
402+
 v8::Local<v8::Object> obj,
403+
int fd,
404+
 std::string original_name);
401405

402406
// Synchronous close that emits a warning
403407
voidClose();
@@ -439,6 +443,7 @@ class FileHandle final : public AsyncWrap, public StreamBase {
439443
// Asynchronous close
440444
 v8::MaybeLocal<v8::Promise> ClosePromise();
441445

446+
 std::string original_name_;
442447
int fd_;
443448
bool closing_ = false;
444449
bool closed_ = false;
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 fbb3960
Browse files
addaleaxaduh95
addaleax
authored and
aduh95
committed
src: show original file name in FileHandle GC close errors
Otherwise, it can be virtually impossible to debug where these types
of errors originate from.
PR-URL: #60593
Backport-PR-URL: #64675
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 2cc54e1 commit fbb3960
3 files changed
Lines changed: 32 additions & 17 deletions
File tree
‎src/dataqueue/queue.cc‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,7 @@ class FdEntry final : public EntryImpl {
916916
fs::FileHandle::New(realm->GetBindingData<fs::BindingData>(),
917917
 file,
918918
 Local<Object>(),
919+
 {},
919920
 entry->start_,
920921
 entry->end_ - entry->start_)),
921922
 entry);
‎src/node_file.cc‎
Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,12 @@ void FSReqBase::MemoryInfo(MemoryTracker* tracker) const {
222222
// collection if necessary. If that happens, a process warning will be
223223
// emitted (or a fatal exception will occur if the fd cannot be closed.)
224224
FileHandle::FileHandle(BindingData* binding_data,
225-
 Local<Object> obj, int fd)
225+
 Local<Object> obj,
226+
int fd,
227+
 std::string original_name)
226228
 : AsyncWrap(binding_data->env(), obj, AsyncWrap::PROVIDER_FILEHANDLE),
227229
 StreamBase(env()),
230+
 original_name_(std::move(original_name)),
228231
 fd_(fd),
229232
 binding_data_(binding_data) {
230233
MakeWeak();
@@ -234,6 +237,7 @@ FileHandle::FileHandle(BindingData* binding_data,
234237
FileHandle* FileHandle::New(BindingData* binding_data,
235238
int fd,
236239
 Local<Object> obj,
240+
 std::string original_name,
237241
 std::optional<int64_t> maybeOffset,
238242
 std::optional<int64_t> maybeLength) {
239243
 Environment* env = binding_data->env();
@@ -242,7 +246,7 @@ FileHandle* FileHandle::New(BindingData* binding_data,
242246
 .ToLocal(&obj)) {
243247
returnnullptr;
244248
 }
245-
auto handle = newFileHandle(binding_data, obj, fd);
249+
auto handle = newFileHandle(binding_data, obj, fd, original_name);
246250
if (maybeOffset.has_value()) handle->read_offset_ = maybeOffset.value();
247251
if (maybeLength.has_value()) handle->read_length_ = maybeLength.value();
248252
return handle;
@@ -274,6 +278,7 @@ void FileHandle::New(const FunctionCallbackInfo<Value>& args) {
274278
FileHandle::New(binding_data,
275279
 args[0].As<Int32>()->Value(),
276280
 args.This(),
281+
 {},
277282
 maybeOffset,
278283
 maybeLength);
279284
}
@@ -293,6 +298,7 @@ int FileHandle::DoWrite(WriteWrap* w,
293298

294299
voidFileHandle::MemoryInfo(MemoryTracker* tracker) const {
295300
 tracker->TrackField("current_read", current_read_);
301+
 tracker->TrackField("original_name", original_name_);
296302
}
297303

298304
BaseObject::TransferMode FileHandle::GetTransferMode() const {
@@ -346,25 +352,28 @@ inline void FileHandle::Close() {
346352
FS_SYNC_TRACE_END(close);
347353
uv_fs_req_cleanup(&req);
348354

349-
structerr_detail { int ret; int fd; };
355+
structerr_detail {
356+
int ret;
357+
int fd;
358+
 std::string name;
359+
 };
350360

351-
 err_detail detail { ret, fd_};
361+
 err_detail detail{ret, fd_, original_name_};
352362

353363
AfterClose();
354364

355365
if (ret < 0) {
356366
// Do not unref this
357367
env()->SetImmediate([detail](Environment* env) {
358-
char msg[70];
359-
snprintf(msg, arraysize(msg),
360-
"Closing file descriptor %d on garbage collection failed",
361-
 detail.fd);
362-
// This exception will end up being fatal for the process because
363-
// it is being thrown from within the SetImmediate handler and
364-
// there is no JS stack to bubble it to. In other words, tearing
365-
// down the process is the only reasonable thing we can do here.
366368
 HandleScope handle_scope(env->isolate());
367-
 env->ThrowUVException(detail.ret, "close", msg);
369+
staticconstexpr std::string_view unknown_path = "<unknown path>";
370+
 std::string_view filename =
371+
 detail.name.empty() ? unknown_path : detail.name;
372+
auto formatted = SPrintF(
373+
"Closing file descriptor %d on garbage collection failed (%s)",
374+
 detail.fd,
375+
 filename);
376+
 env->ThrowUVException(detail.ret, "close", formatted.c_str());
368377
 });
369378
return;
370379
 }
@@ -846,8 +855,8 @@ void AfterOpenFileHandle(uv_fs_t* req) {
846855
FS_ASYNC_TRACE_END1(
847856
 req->fs_type, req_wrap, "result", static_cast<int>(req->result))
848857
if (after.Proceed()) {
849-
 FileHandle* fd = FileHandle::New(req_wrap->binding_data(),
850-
static_cast<int>(req->result));
858+
 FileHandle* fd = FileHandle::New(
859+
req_wrap->binding_data(), static_cast<int>(req->result), {}, req->path);
851860
if (fd == nullptr) return;
852861
 req_wrap->Resolve(fd->object());
853862
 }
@@ -2277,7 +2286,7 @@ static void OpenFileHandle(const FunctionCallbackInfo<Value>& args) {
22772286
if (result < 0) {
22782287
return; // syscall failed, no need to continue, error info is in ctx
22792288
 }
2280-
 FileHandle* fd = FileHandle::New(binding_data, result);
2289+
 FileHandle* fd = FileHandle::New(binding_data, result, {}, path.ToString());
22812290
if (fd == nullptr) return;
22822291
 args.GetReturnValue().Set(fd->object());
22832292
 }
‎src/node_file.h‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ class FileHandle final : public AsyncWrap, public StreamBase {
331331
static FileHandle* New(BindingData* binding_data,
332332
int fd,
333333
 v8::Local<v8::Object> obj = v8::Local<v8::Object>(),
334+
 std::string original_name = {},
334335
 std::optional<int64_t> maybeOffset = std::nullopt,
335336
 std::optional<int64_t> maybeLength = std::nullopt);
336337
~FileHandle() override;
@@ -397,7 +398,10 @@ class FileHandle final : public AsyncWrap, public StreamBase {
397398
int fd_;
398399
 };
399400

400-
FileHandle(BindingData* binding_data, v8::Local<v8::Object> obj, int fd);
401+
FileHandle(BindingData* binding_data,
402+
 v8::Local<v8::Object> obj,
403+
int fd,
404+
 std::string original_name);
401405

402406
// Synchronous close that emits a warning
403407
voidClose();
@@ -439,6 +443,7 @@ class FileHandle final : public AsyncWrap, public StreamBase {
439443
// Asynchronous close
440444
 v8::MaybeLocal<v8::Promise> ClosePromise();
441445

446+
 std::string original_name_;
442447
int fd_;
443448
bool closing_ = false;
444449
bool closed_ = false;
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 fbb3960
Browse files
addaleaxaduh95
addaleax
authored and
aduh95
committed
src: show original file name in FileHandle GC close errors
Otherwise, it can be virtually impossible to debug where these types
of errors originate from.
PR-URL: #60593
Backport-PR-URL: #64675
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 2cc54e1 commit fbb3960
3 files changed
Lines changed: 32 additions & 17 deletions
File tree
‎src/dataqueue/queue.cc‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,7 @@ class FdEntry final : public EntryImpl {
916916
fs::FileHandle::New(realm->GetBindingData<fs::BindingData>(),
917917
 file,
918918
 Local<Object>(),
919+
 {},
919920
 entry->start_,
920921
 entry->end_ - entry->start_)),
921922
 entry);
‎src/node_file.cc‎
Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,12 @@ void FSReqBase::MemoryInfo(MemoryTracker* tracker) const {
222222
// collection if necessary. If that happens, a process warning will be
223223
// emitted (or a fatal exception will occur if the fd cannot be closed.)
224224
FileHandle::FileHandle(BindingData* binding_data,
225-
 Local<Object> obj, int fd)
225+
 Local<Object> obj,
226+
int fd,
227+
 std::string original_name)
226228
 : AsyncWrap(binding_data->env(), obj, AsyncWrap::PROVIDER_FILEHANDLE),
227229
 StreamBase(env()),
230+
 original_name_(std::move(original_name)),
228231
 fd_(fd),
229232
 binding_data_(binding_data) {
230233
MakeWeak();
@@ -234,6 +237,7 @@ FileHandle::FileHandle(BindingData* binding_data,
234237
FileHandle* FileHandle::New(BindingData* binding_data,
235238
int fd,
236239
 Local<Object> obj,
240+
 std::string original_name,
237241
 std::optional<int64_t> maybeOffset,
238242
 std::optional<int64_t> maybeLength) {
239243
 Environment* env = binding_data->env();
@@ -242,7 +246,7 @@ FileHandle* FileHandle::New(BindingData* binding_data,
242246
 .ToLocal(&obj)) {
243247
returnnullptr;
244248
 }
245-
auto handle = newFileHandle(binding_data, obj, fd);
249+
auto handle = newFileHandle(binding_data, obj, fd, original_name);
246250
if (maybeOffset.has_value()) handle->read_offset_ = maybeOffset.value();
247251
if (maybeLength.has_value()) handle->read_length_ = maybeLength.value();
248252
return handle;
@@ -274,6 +278,7 @@ void FileHandle::New(const FunctionCallbackInfo<Value>& args) {
274278
FileHandle::New(binding_data,
275279
 args[0].As<Int32>()->Value(),
276280
 args.This(),
281+
 {},
277282
 maybeOffset,
278283
 maybeLength);
279284
}
@@ -293,6 +298,7 @@ int FileHandle::DoWrite(WriteWrap* w,
293298

294299
voidFileHandle::MemoryInfo(MemoryTracker* tracker) const {
295300
 tracker->TrackField("current_read", current_read_);
301+
 tracker->TrackField("original_name", original_name_);
296302
}
297303

298304
BaseObject::TransferMode FileHandle::GetTransferMode() const {
@@ -346,25 +352,28 @@ inline void FileHandle::Close() {
346352
FS_SYNC_TRACE_END(close);
347353
uv_fs_req_cleanup(&req);
348354

349-
structerr_detail { int ret; int fd; };
355+
structerr_detail {
356+
int ret;
357+
int fd;
358+
 std::string name;
359+
 };
350360

351-
 err_detail detail { ret, fd_};
361+
 err_detail detail{ret, fd_, original_name_};
352362

353363
AfterClose();
354364

355365
if (ret < 0) {
356366
// Do not unref this
357367
env()->SetImmediate([detail](Environment* env) {
358-
char msg[70];
359-
snprintf(msg, arraysize(msg),
360-
"Closing file descriptor %d on garbage collection failed",
361-
 detail.fd);
362-
// This exception will end up being fatal for the process because
363-
// it is being thrown from within the SetImmediate handler and
364-
// there is no JS stack to bubble it to. In other words, tearing
365-
// down the process is the only reasonable thing we can do here.
366368
 HandleScope handle_scope(env->isolate());
367-
 env->ThrowUVException(detail.ret, "close", msg);
369+
staticconstexpr std::string_view unknown_path = "<unknown path>";
370+
 std::string_view filename =
371+
 detail.name.empty() ? unknown_path : detail.name;
372+
auto formatted = SPrintF(
373+
"Closing file descriptor %d on garbage collection failed (%s)",
374+
 detail.fd,
375+
 filename);
376+
 env->ThrowUVException(detail.ret, "close", formatted.c_str());
368377
 });
369378
return;
370379
 }
@@ -846,8 +855,8 @@ void AfterOpenFileHandle(uv_fs_t* req) {
846855
FS_ASYNC_TRACE_END1(
847856
 req->fs_type, req_wrap, "result", static_cast<int>(req->result))
848857
if (after.Proceed()) {
849-
 FileHandle* fd = FileHandle::New(req_wrap->binding_data(),
850-
static_cast<int>(req->result));
858+
 FileHandle* fd = FileHandle::New(
859+
req_wrap->binding_data(), static_cast<int>(req->result), {}, req->path);
851860
if (fd == nullptr) return;
852861
 req_wrap->Resolve(fd->object());
853862
 }
@@ -2277,7 +2286,7 @@ static void OpenFileHandle(const FunctionCallbackInfo<Value>& args) {
22772286
if (result < 0) {
22782287
return; // syscall failed, no need to continue, error info is in ctx
22792288
 }
2280-
 FileHandle* fd = FileHandle::New(binding_data, result);
2289+
 FileHandle* fd = FileHandle::New(binding_data, result, {}, path.ToString());
22812290
if (fd == nullptr) return;
22822291
 args.GetReturnValue().Set(fd->object());
22832292
 }
‎src/node_file.h‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ class FileHandle final : public AsyncWrap, public StreamBase {
331331
static FileHandle* New(BindingData* binding_data,
332332
int fd,
333333
 v8::Local<v8::Object> obj = v8::Local<v8::Object>(),
334+
 std::string original_name = {},
334335
 std::optional<int64_t> maybeOffset = std::nullopt,
335336
 std::optional<int64_t> maybeLength = std::nullopt);
336337
~FileHandle() override;
@@ -397,7 +398,10 @@ class FileHandle final : public AsyncWrap, public StreamBase {
397398
int fd_;
398399
 };
399400

400-
FileHandle(BindingData* binding_data, v8::Local<v8::Object> obj, int fd);
401+
FileHandle(BindingData* binding_data,
402+
 v8::Local<v8::Object> obj,
403+
int fd,
404+
 std::string original_name);
401405

402406
// Synchronous close that emits a warning
403407
voidClose();
@@ -439,6 +443,7 @@ class FileHandle final : public AsyncWrap, public StreamBase {
439443
// Asynchronous close
440444
 v8::MaybeLocal<v8::Promise> ClosePromise();
441445

446+
 std::string original_name_;
442447
int fd_;
443448
bool closing_ = false;
444449
bool closed_ = false;
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 fbb3960
Browse files
addaleaxaduh95
addaleax
authored and
aduh95
committed
src: show original file name in FileHandle GC close errors
Otherwise, it can be virtually impossible to debug where these types
of errors originate from.
PR-URL: #60593
Backport-PR-URL: #64675
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 2cc54e1 commit fbb3960
3 files changed
Lines changed: 32 additions & 17 deletions
File tree
‎src/dataqueue/queue.cc‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,7 @@ class FdEntry final : public EntryImpl {
916916
fs::FileHandle::New(realm->GetBindingData<fs::BindingData>(),
917917
 file,
918918
 Local<Object>(),
919+
 {},
919920
 entry->start_,
920921
 entry->end_ - entry->start_)),
921922
 entry);
‎src/node_file.cc‎
Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,12 @@ void FSReqBase::MemoryInfo(MemoryTracker* tracker) const {
222222
// collection if necessary. If that happens, a process warning will be
223223
// emitted (or a fatal exception will occur if the fd cannot be closed.)
224224
FileHandle::FileHandle(BindingData* binding_data,
225-
 Local<Object> obj, int fd)
225+
 Local<Object> obj,
226+
int fd,
227+
 std::string original_name)
226228
 : AsyncWrap(binding_data->env(), obj, AsyncWrap::PROVIDER_FILEHANDLE),
227229
 StreamBase(env()),
230+
 original_name_(std::move(original_name)),
228231
 fd_(fd),
229232
 binding_data_(binding_data) {
230233
MakeWeak();
@@ -234,6 +237,7 @@ FileHandle::FileHandle(BindingData* binding_data,
234237
FileHandle* FileHandle::New(BindingData* binding_data,
235238
int fd,
236239
 Local<Object> obj,
240+
 std::string original_name,
237241
 std::optional<int64_t> maybeOffset,
238242
 std::optional<int64_t> maybeLength) {
239243
 Environment* env = binding_data->env();
@@ -242,7 +246,7 @@ FileHandle* FileHandle::New(BindingData* binding_data,
242246
 .ToLocal(&obj)) {
243247
returnnullptr;
244248
 }
245-
auto handle = newFileHandle(binding_data, obj, fd);
249+
auto handle = newFileHandle(binding_data, obj, fd, original_name);
246250
if (maybeOffset.has_value()) handle->read_offset_ = maybeOffset.value();
247251
if (maybeLength.has_value()) handle->read_length_ = maybeLength.value();
248252
return handle;
@@ -274,6 +278,7 @@ void FileHandle::New(const FunctionCallbackInfo<Value>& args) {
274278
FileHandle::New(binding_data,
275279
 args[0].As<Int32>()->Value(),
276280
 args.This(),
281+
 {},
277282
 maybeOffset,
278283
 maybeLength);
279284
}
@@ -293,6 +298,7 @@ int FileHandle::DoWrite(WriteWrap* w,
293298

294299
voidFileHandle::MemoryInfo(MemoryTracker* tracker) const {
295300
 tracker->TrackField("current_read", current_read_);
301+
 tracker->TrackField("original_name", original_name_);
296302
}
297303

298304
BaseObject::TransferMode FileHandle::GetTransferMode() const {
@@ -346,25 +352,28 @@ inline void FileHandle::Close() {
346352
FS_SYNC_TRACE_END(close);
347353
uv_fs_req_cleanup(&req);
348354

349-
structerr_detail { int ret; int fd; };
355+
structerr_detail {
356+
int ret;
357+
int fd;
358+
 std::string name;
359+
 };
350360

351-
 err_detail detail { ret, fd_};
361+
 err_detail detail{ret, fd_, original_name_};
352362

353363
AfterClose();
354364

355365
if (ret < 0) {
356366
// Do not unref this
357367
env()->SetImmediate([detail](Environment* env) {
358-
char msg[70];
359-
snprintf(msg, arraysize(msg),
360-
"Closing file descriptor %d on garbage collection failed",
361-
 detail.fd);
362-
// This exception will end up being fatal for the process because
363-
// it is being thrown from within the SetImmediate handler and
364-
// there is no JS stack to bubble it to. In other words, tearing
365-
// down the process is the only reasonable thing we can do here.
366368
 HandleScope handle_scope(env->isolate());
367-
 env->ThrowUVException(detail.ret, "close", msg);
369+
staticconstexpr std::string_view unknown_path = "<unknown path>";
370+
 std::string_view filename =
371+
 detail.name.empty() ? unknown_path : detail.name;
372+
auto formatted = SPrintF(
373+
"Closing file descriptor %d on garbage collection failed (%s)",
374+
 detail.fd,
375+
 filename);
376+
 env->ThrowUVException(detail.ret, "close", formatted.c_str());
368377
 });
369378
return;
370379
 }
@@ -846,8 +855,8 @@ void AfterOpenFileHandle(uv_fs_t* req) {
846855
FS_ASYNC_TRACE_END1(
847856
 req->fs_type, req_wrap, "result", static_cast<int>(req->result))
848857
if (after.Proceed()) {
849-
 FileHandle* fd = FileHandle::New(req_wrap->binding_data(),
850-
static_cast<int>(req->result));
858+
 FileHandle* fd = FileHandle::New(
859+
req_wrap->binding_data(), static_cast<int>(req->result), {}, req->path);
851860
if (fd == nullptr) return;
852861
 req_wrap->Resolve(fd->object());
853862
 }
@@ -2277,7 +2286,7 @@ static void OpenFileHandle(const FunctionCallbackInfo<Value>& args) {
22772286
if (result < 0) {
22782287
return; // syscall failed, no need to continue, error info is in ctx
22792288
 }
2280-
 FileHandle* fd = FileHandle::New(binding_data, result);
2289+
 FileHandle* fd = FileHandle::New(binding_data, result, {}, path.ToString());
22812290
if (fd == nullptr) return;
22822291
 args.GetReturnValue().Set(fd->object());
22832292
 }
‎src/node_file.h‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ class FileHandle final : public AsyncWrap, public StreamBase {
331331
static FileHandle* New(BindingData* binding_data,
332332
int fd,
333333
 v8::Local<v8::Object> obj = v8::Local<v8::Object>(),
334+
 std::string original_name = {},
334335
 std::optional<int64_t> maybeOffset = std::nullopt,
335336
 std::optional<int64_t> maybeLength = std::nullopt);
336337
~FileHandle() override;
@@ -397,7 +398,10 @@ class FileHandle final : public AsyncWrap, public StreamBase {
397398
int fd_;
398399
 };
399400

400-
FileHandle(BindingData* binding_data, v8::Local<v8::Object> obj, int fd);
401+
FileHandle(BindingData* binding_data,
402+
 v8::Local<v8::Object> obj,
403+
int fd,
404+
 std::string original_name);
401405

402406
// Synchronous close that emits a warning
403407
voidClose();
@@ -439,6 +443,7 @@ class FileHandle final : public AsyncWrap, public StreamBase {
439443
// Asynchronous close
440444
 v8::MaybeLocal<v8::Promise> ClosePromise();
441445

446+
 std::string original_name_;
442447
int fd_;
443448
bool closing_ = false;
444449
bool closed_ = false;
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 fbb3960
Browse files
addaleaxaduh95
addaleax
authored and
aduh95
committed
src: show original file name in FileHandle GC close errors
Otherwise, it can be virtually impossible to debug where these types
of errors originate from.
PR-URL: #60593
Backport-PR-URL: #64675
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 2cc54e1 commit fbb3960
3 files changed
Lines changed: 32 additions & 17 deletions
File tree
‎src/dataqueue/queue.cc‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,7 @@ class FdEntry final : public EntryImpl {
916916
fs::FileHandle::New(realm->GetBindingData<fs::BindingData>(),
917917
 file,
918918
 Local<Object>(),
919+
 {},
919920
 entry->start_,
920921
 entry->end_ - entry->start_)),
921922
 entry);
‎src/node_file.cc‎
Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,12 @@ void FSReqBase::MemoryInfo(MemoryTracker* tracker) const {
222222
// collection if necessary. If that happens, a process warning will be
223223
// emitted (or a fatal exception will occur if the fd cannot be closed.)
224224
FileHandle::FileHandle(BindingData* binding_data,
225-
 Local<Object> obj, int fd)
225+
 Local<Object> obj,
226+
int fd,
227+
 std::string original_name)
226228
 : AsyncWrap(binding_data->env(), obj, AsyncWrap::PROVIDER_FILEHANDLE),
227229
 StreamBase(env()),
230+
 original_name_(std::move(original_name)),
228231
 fd_(fd),
229232
 binding_data_(binding_data) {
230233
MakeWeak();
@@ -234,6 +237,7 @@ FileHandle::FileHandle(BindingData* binding_data,
234237
FileHandle* FileHandle::New(BindingData* binding_data,
235238
int fd,
236239
 Local<Object> obj,
240+
 std::string original_name,
237241
 std::optional<int64_t> maybeOffset,
238242
 std::optional<int64_t> maybeLength) {
239243
 Environment* env = binding_data->env();
@@ -242,7 +246,7 @@ FileHandle* FileHandle::New(BindingData* binding_data,
242246
 .ToLocal(&obj)) {
243247
returnnullptr;
244248
 }
245-
auto handle = newFileHandle(binding_data, obj, fd);
249+
auto handle = newFileHandle(binding_data, obj, fd, original_name);
246250
if (maybeOffset.has_value()) handle->read_offset_ = maybeOffset.value();
247251
if (maybeLength.has_value()) handle->read_length_ = maybeLength.value();
248252
return handle;
@@ -274,6 +278,7 @@ void FileHandle::New(const FunctionCallbackInfo<Value>& args) {
274278
FileHandle::New(binding_data,
275279
 args[0].As<Int32>()->Value(),
276280
 args.This(),
281+
 {},
277282
 maybeOffset,
278283
 maybeLength);
279284
}
@@ -293,6 +298,7 @@ int FileHandle::DoWrite(WriteWrap* w,
293298

294299
voidFileHandle::MemoryInfo(MemoryTracker* tracker) const {
295300
 tracker->TrackField("current_read", current_read_);
301+
 tracker->TrackField("original_name", original_name_);
296302
}
297303

298304
BaseObject::TransferMode FileHandle::GetTransferMode() const {
@@ -346,25 +352,28 @@ inline void FileHandle::Close() {
346352
FS_SYNC_TRACE_END(close);
347353
uv_fs_req_cleanup(&req);
348354

349-
structerr_detail { int ret; int fd; };
355+
structerr_detail {
356+
int ret;
357+
int fd;
358+
 std::string name;
359+
 };
350360

351-
 err_detail detail { ret, fd_};
361+
 err_detail detail{ret, fd_, original_name_};
352362

353363
AfterClose();
354364

355365
if (ret < 0) {
356366
// Do not unref this
357367
env()->SetImmediate([detail](Environment* env) {
358-
char msg[70];
359-
snprintf(msg, arraysize(msg),
360-
"Closing file descriptor %d on garbage collection failed",
361-
 detail.fd);
362-
// This exception will end up being fatal for the process because
363-
// it is being thrown from within the SetImmediate handler and
364-
// there is no JS stack to bubble it to. In other words, tearing
365-
// down the process is the only reasonable thing we can do here.
366368
 HandleScope handle_scope(env->isolate());
367-
 env->ThrowUVException(detail.ret, "close", msg);
369+
staticconstexpr std::string_view unknown_path = "<unknown path>";
370+
 std::string_view filename =
371+
 detail.name.empty() ? unknown_path : detail.name;
372+
auto formatted = SPrintF(
373+
"Closing file descriptor %d on garbage collection failed (%s)",
374+
 detail.fd,
375+
 filename);
376+
 env->ThrowUVException(detail.ret, "close", formatted.c_str());
368377
 });
369378
return;
370379
 }
@@ -846,8 +855,8 @@ void AfterOpenFileHandle(uv_fs_t* req) {
846855
FS_ASYNC_TRACE_END1(
847856
 req->fs_type, req_wrap, "result", static_cast<int>(req->result))
848857
if (after.Proceed()) {
849-
 FileHandle* fd = FileHandle::New(req_wrap->binding_data(),
850-
static_cast<int>(req->result));
858+
 FileHandle* fd = FileHandle::New(
859+
req_wrap->binding_data(), static_cast<int>(req->result), {}, req->path);
851860
if (fd == nullptr) return;
852861
 req_wrap->Resolve(fd->object());
853862
 }
@@ -2277,7 +2286,7 @@ static void OpenFileHandle(const FunctionCallbackInfo<Value>& args) {
22772286
if (result < 0) {
22782287
return; // syscall failed, no need to continue, error info is in ctx
22792288
 }
2280-
 FileHandle* fd = FileHandle::New(binding_data, result);
2289+
 FileHandle* fd = FileHandle::New(binding_data, result, {}, path.ToString());
22812290
if (fd == nullptr) return;
22822291
 args.GetReturnValue().Set(fd->object());
22832292
 }
‎src/node_file.h‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ class FileHandle final : public AsyncWrap, public StreamBase {
331331
static FileHandle* New(BindingData* binding_data,
332332
int fd,
333333
 v8::Local<v8::Object> obj = v8::Local<v8::Object>(),
334+
 std::string original_name = {},
334335
 std::optional<int64_t> maybeOffset = std::nullopt,
335336
 std::optional<int64_t> maybeLength = std::nullopt);
336337
~FileHandle() override;
@@ -397,7 +398,10 @@ class FileHandle final : public AsyncWrap, public StreamBase {
397398
int fd_;
398399
 };
399400

400-
FileHandle(BindingData* binding_data, v8::Local<v8::Object> obj, int fd);
401+
FileHandle(BindingData* binding_data,
402+
 v8::Local<v8::Object> obj,
403+
int fd,
404+
 std::string original_name);
401405

402406
// Synchronous close that emits a warning
403407
voidClose();
@@ -439,6 +443,7 @@ class FileHandle final : public AsyncWrap, public StreamBase {
439443
// Asynchronous close
440444
 v8::MaybeLocal<v8::Promise> ClosePromise();
441445

446+
 std::string original_name_;
442447
int fd_;
443448
bool closing_ = false;
444449
bool closed_ = false;
0 commit comments
Comments
 (0)