-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
touch: use write-open + futimens on Unix to trigger IN_CLOSE_WRITE #9813
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.
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
base: main
Are you sure you want to change the base?
Conversation
…inux - Add `try_futimens_via_write_fd` function for Unix systems to open files write-only and set times using `futimens`, ensuring inotify watchers detect file closure after touch. - Modify `update_times` to attempt this method before falling back to `set_file_times`, improving compatibility with file monitoring tools on Linux. - Include necessary imports for Unix-specific operations.
- Updated the spell-checker comment to include 'futimens', likely a system call or function name, to avoid false positives in code spell-checking.
src/uu/touch/src/touch.rs
Outdated
| }, | ||
| ]; | ||
|
|
||
| let rc = unsafe { libc::futimens(file.as_raw_fd(), times.as_ptr()) }; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe use https://docs.rs/nix/latest/nix/sys/stat/fn.futimens.html to avoid the unsafe ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fix
| } | ||
|
|
||
| #[cfg(unix)] | ||
| fn try_futimens_via_write_fd(path: &Path, atime: FileTime, mtime: FileTime) -> std::io::Result<()> { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please document this function. and explain what is futimens
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add
|
is it possible to add tests ? thanks |
…time setting - Add nix and tempfile dependencies to Cargo.toml and Cargo.lock - Replace unsafe libc::futimens calls with nix::sys::stat::futimens for better safety and portability - Introduce try_futimens_via_write_fd function using nix abstractions - Add unit tests to verify futimens functionality on Unix systems This change reduces unsafe code usage and leverages a Rust-friendly library for Unix-specific operations.
Summary
Make
touchopen regular files for write and callfutimenson the fd (Unix only). This matches GNU touch behavior and ensures inotify emitsIN_CLOSE_WRITEwhen timestamps are updated.Motivation
Some inotify-based reloaders watch only
IN_CLOSE_WRITE. With the current path-based timestamp update,touchemits onlyIN_ATTRIB, so those watchers miss the change. This caused infinite loops in downstream tests (e.g., 0 A.D. hotload tests on Ubuntu Questing).Changes
OpenOptions::new().write(true)and callfutimenson the fd for regular files.set_file_timespath-based update when open/futimens fails or the target is not a regular file.Testing
cargo test -p uu_touchNotes
related
#9812