Skip to content

fs.watch: decouple from bun.Watcher, own inotify/FSEvents/kqueue directly #29952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jarred-Sumner merged 10 commits into from
Apr 30, 2026
Merged

fs.watch: decouple from bun.Watcher, own inotify/FSEvents/kqueue directly #29952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
63e9712
fs.watch: decouple from bun.Watcher, own inotify/FSEvents/kqueue dire…
robobun Apr 29, 2026
7a94c29
[autofix.ci] apply automated fixes
autofix-ci[bot] Apr 29, 2026
158296a
path_watcher: detach reader threads instead of storing undefined handle
robobun Apr 29, 2026
f2b14bc
path_watcher: fix three races flagged in review
robobun Apr 29, 2026
a3a0c85
path_watcher(linux): re-fetch wd_map entry each dispatch iteration
robobun Apr 29, 2026
7bdde12
path_watcher(freebsd): propagate kevent registration failure
robobun Apr 29, 2026
211e35d
path_watcher: fix macOS addWatch-error race, drop DCLP fast path, str…
robobun Apr 29, 2026
070a615
path_watcher(linux): update cached subpath when inotify re-returns a wd
robobun Apr 29, 2026
be68ee7
path_watcher(freebsd): reject stale events when kevent fd is recycled…
robobun Apr 29, 2026
dd8732c
path_watcher: address review — bun.sys/bun.path/bun.DirIterator, dedu…
robobun Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/bun.js/node/fs_events.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ pub const FSEventsWatcher = struct {
recursive: bool,
ctx: ?*anyopaque,

pub const Callback = PathWatcher.Callback;
pub const Callback = *const fn (ctx: ?*anyopaque, event: Event, is_file: bool) void;
pub const UpdateEndCallback = *const fn (ctx: ?*anyopaque) void;

pub fn init(loop: *FSEventsLoop, path: string, recursive: bool, callback: Callback, updateEnd: UpdateEndCallback, ctx: ?*anyopaque) *FSEventsWatcher {
Expand Down Expand Up @@ -640,11 +640,9 @@ pub fn closeAndWait() void {
const string = []const u8;

const std = @import("std");
const EventType = @import("./path_watcher.zig").PathWatcher.EventType;
const Semaphore = std.Thread.Semaphore;

const PathWatcher = @import("./path_watcher.zig").PathWatcher;
const EventType = PathWatcher.EventType;

const bun = @import("bun");
const Mutex = bun.Mutex;
const UnboundedQueue = bun.threading.UnboundedQueue;
Expand Down
Loading
Loading