hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-23 05:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor VFS watch logic for macOS and Linux/Windows compatibility

Browse source 
- Enhanced the VFS watch setup in ServeSession to differentiate between macOS and other platforms, ensuring proper handling of file and directory watches.
- Improved clarity by restructuring the logic for watching paths, addressing platform-specific requirements and optimizing resource usage.
- Maintained non-recursive watching for ignored directories while ensuring all relevant files are monitored effectively.
This commit is contained in:
Joe 2026-03-07 10:40:32 -06:00
parent c19b249657
commit 4b38c070fb
1 changed files with 39 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/serve_session.rs
View file

@ -384,38 +384,49 @@ impl ServeSession {
use walkdir::WalkDir;
let watch_start = Instant::now();
// Walk each $path root, skipping directories that match
// globIgnorePaths, and watch each non-ignored directory
// individually (non-recursive). This avoids creating kqueue
// FDs for ignored subtrees on macOS.
let passes_ignore = |entry: &walkdir::DirEntry| -> bool {
watch_ignore_rules
.iter()
.all(|rule: &PathIgnoreRule| rule.passes(entry.path()))
};
vfs.set_watch_recursive(false);
let mut watch_count: usize = 0;
for root in &path_roots {
for entry in WalkDir::new(root)
.follow_links(true)
.into_iter()
.filter_entry(&passes_ignore)
.flatten()
{
// Watch both files and directories. On macOS kqueue,
// file watches are required because directory watches
// only fire for structural changes. On Linux/Windows,
// file watches prevent a debouncer race where read_raw's
// auto-registered file watch conflicts with the directory
// watch during rename-overwrite (atomic save pattern).
let _ = vfs.watch(entry.path());
if cfg!(target_os = "macos") {
// macOS kqueue: one FD per watched path. Walk each $path
// root, skip globIgnorePaths subtrees, and watch every
// non-ignored file and directory non-recursively. File
// watches are required because kqueue directory watches
// only fire for structural changes, not child content edits.
let passes_ignore = |entry: &walkdir::DirEntry| -> bool {
watch_ignore_rules
.iter()
.all(|rule: &PathIgnoreRule| rule.passes(entry.path()))
};
vfs.set_watch_recursive(false);
for root in &path_roots {
for entry in WalkDir::new(root)
.follow_links(true)
.into_iter()
.filter_entry(&passes_ignore)
.flatten()
{
let _ = vfs.watch(entry.path());
watch_count += 1;
}
}
let _ = vfs.watch(&project_folder);
watch_count += 1;
vfs.set_watch_recursive(true);
} else {
// Linux/Windows: inotify uses a single FD for all watches,
// RDCW uses one handle per directory. Recursive watches are
// cheap and directory watches already cover child file
// events. globIgnorePaths filtering is handled by the
// change processor's event filter.
for root in &path_roots {
let _ = vfs.watch(root);
watch_count += 1;
}
vfs.set_watch_recursive(false);
let _ = vfs.watch(&project_folder);
vfs.set_watch_recursive(true);
watch_count += 1;
}
// Watch project folder non-recursively for project file edits.
let _ = vfs.watch(&project_folder);
watch_count += 1;
vfs.set_watch_recursive(true);
log::debug!(
"Set up {} watches in {:.1?}",
watch_count,