`uptime`: Support files in uptime #6400

AnirbanHalder654322 · 2024-05-14T12:58:56Z

Edit1 : I strace-d the whole thing , we seem to use more than 2x amount of read sys calls (will result in more than 100 extra read calls for very large iterations)compared to GNU uptime, which i believe is due to iter_all_records_from function in uucore::src::lib::features::utmpx

github-actions · 2024-05-14T13:28:05Z

GNU testsuite comparison:

Skipping an intermittent issue tests/tail/inotify-dir-recreate (passes in this run but fails in the 'main' branch)

github-actions · 2024-05-19T18:01:56Z

GNU testsuite comparison:

GNU test failed: tests/timeout/timeout. tests/timeout/timeout is passing on 'main'. Maybe you have to rebase?

… failing for macos

…on on error

Cargo.toml

… in testing

AnirbanHalder654322 · 2024-05-28T10:45:36Z

Changes since last push:

The test test_uptime::test_uptime_for_file_without_utmpx_records has been disabled for freebsd , our uucore::utmpx module uses utmpxname() sys call to set the file from which we iterate through, freebsd uses different sets of syscall which function somewhat similarly yet have differences. Comments have been added to the tests which may pass the CI but they don't function as intended.

github-actions · 2024-05-28T11:07:49Z

GNU testsuite comparison:

Skip an intermittent issue tests/tail/inotify-dir-recreate (fails in this run but passes in the 'main' branch)

AnirbanHalder654322 · 2024-05-28T13:47:51Z

The failing CI tests are unrelated to my PR.

github-actions · 2024-06-01T20:00:13Z

GNU testsuite comparison:

Skipping an intermittent issue tests/tail/inotify-dir-recreate (passes in this run but fails in the 'main' branch)

tests/by-util/test_uptime.rs

github-actions · 2024-06-02T13:35:33Z

GNU testsuite comparison:

Skipping an intermittent issue tests/tail/inotify-dir-recreate (passes in this run but fails in the 'main' branch)

github-actions · 2024-06-04T22:28:41Z

GNU testsuite comparison:

Skip an intermittent issue tests/tail/inotify-dir-recreate (fails in this run but passes in the 'main' branch)

AnirbanHalder654322 · 2024-06-11T16:34:20Z

@sylvestre does this require any more changes ?

github-actions · 2024-06-19T18:33:58Z

GNU testsuite comparison:

Skip an intermittent issue tests/tail/inotify-dir-recreate (fails in this run but passes in the 'main' branch)

Cargo.toml

src/uu/uptime/src/platform/unix.rs

github-actions · 2024-06-21T18:09:49Z

GNU testsuite comparison:

Congrats! The gnu test tests/timeout/timeout is no longer failing!

AnirbanHalder654322 · 2024-06-21T18:15:25Z

Changes since last push:

Removed quick_error in favor of thiserror
Added some documentation on the added dependencies.
The clippy error seems to be unrelated to my pr

sylvestre · 2024-06-22T11:06:11Z

thanks!

If utmpx BOOT_TIME is unavailable, derive boot time via sysctl CTL_KERN.KERN_BOOTTIME to reduce intermittent macOS failures (e.g., uutils#3621). Context (blame/history): - 2774274 ("uptime: Support files in uptime (uutils#6400)"): added macOS utmpxname validation and non-fatal 'unknown uptime' fallback with tests (tests/by-util/test_uptime.rs). - 920d29f ("uptime: add support for OpenBSD using utmp"): reorganized uptime.rs and solidified utmp/utmpx-driven paths.

* fix(uucore): use sysctl kern.boottime on macOS as fallback for uptime If utmpx BOOT_TIME is unavailable, derive boot time via sysctl CTL_KERN.KERN_BOOTTIME to reduce intermittent macOS failures (e.g., #3621). Context (blame/history): - 2774274 ("uptime: Support files in uptime (#6400)"): added macOS utmpxname validation and non-fatal 'unknown uptime' fallback with tests (tests/by-util/test_uptime.rs). - 920d29f ("uptime: add support for OpenBSD using utmp"): reorganized uptime.rs and solidified utmp/utmpx-driven paths. * test: add comprehensive macOS tests for sysctl kern.boottime fallback Add unit tests for sysctl boottime availability and get_uptime reliability on macOS, verifying the fallback mechanism works correctly when utmpx BOOT_TIME is unavailable. Add integration tests to ensure uptime command consistently succeeds on macOS with various flags (default, --since) and produces properly formatted output. Enhance documentation of the sysctl fallback code with detailed comments explaining why it exists, the issue it addresses (#3621), and comprehensive SAFETY comments for the unsafe sysctl call. All tests are properly gated with #[cfg(target_os = "macos")] to ensure they only run on macOS and don't interfere with other platforms. * refactor(uucore): replace unsafe sysctl with safe command-line approach for macOS boot time - Remove unsafe libc::sysctl() system call entirely - Replace with safe std::process::Command executing 'sysctl -n kern.boottime' - Parse sysctl output format to extract boot time seconds - Maintains same API and functionality while eliminating unsafe blocks - Addresses reviewer feedback to completely remove unsafe code

AnirbanHalder654322 marked this pull request as draft May 14, 2024 17:25

AnirbanHalder654322 force-pushed the support_files_in_uptime branch 3 times, most recently from 4fc2074 to 3a5ce83 Compare May 19, 2024 17:29

AnirbanHalder654322 force-pushed the support_files_in_uptime branch from ea305b8 to 3a5ce83 Compare May 19, 2024 18:44

AnirbanHalder654322 marked this pull request as ready for review May 19, 2024 18:49

AnirbanHalder654322 marked this pull request as draft May 22, 2024 13:58

AnirbanHalder654322 force-pushed the support_files_in_uptime branch 2 times, most recently from 76a5692 to 7dd90ba Compare May 25, 2024 09:02

AnirbanHalder654322 added 6 commits May 25, 2024 14:33

Added file handling

833c4f7

Modified error types and added tests

b0c39e7

Added commnent explaining regex

4c78c91

Changed regex,fixed printing whitespace and added attributes to tests…

7bd486c

… failing for macos

Added files to fixtures, revamped some of the tests

69c96ce

Disabled flaky tests, and changed flow to prevent boot time calculati…

8eb2641

…on on error

AnirbanHalder654322 force-pushed the support_files_in_uptime branch from 7dd90ba to ce55ec1 Compare May 25, 2024 09:03

sylvestre reviewed May 25, 2024

View reviewed changes

Cargo.toml Outdated Show resolved Hide resolved

Removed fixture files and changed to manual creation of utmpx entries…

de56e06

… in testing

AnirbanHalder654322 force-pushed the support_files_in_uptime branch from ce55ec1 to de56e06 Compare May 25, 2024 09:30

AnirbanHalder654322 marked this pull request as ready for review May 25, 2024 09:41

AnirbanHalder654322 added 2 commits May 25, 2024 16:03

Merge branch 'main' into support_files_in_uptime

fcfb669

Update Cargo.toml

de6a550

AnirbanHalder654322 force-pushed the support_files_in_uptime branch from b5cab86 to de6a550 Compare May 25, 2024 10:50

Fix ownership bug

285d1bb

AnirbanHalder654322 marked this pull request as draft May 25, 2024 11:54

AnirbanHalder654322 force-pushed the support_files_in_uptime branch 3 times, most recently from c6e9990 to 002edae Compare May 26, 2024 12:46

AnirbanHalder654322 requested a review from sylvestre May 28, 2024 11:02

sylvestre reviewed Jun 2, 2024

View reviewed changes

tests/by-util/test_uptime.rs Outdated Show resolved Hide resolved

Fixing test_uptime_with_fifo

4a8c460

AnirbanHalder654322 force-pushed the support_files_in_uptime branch from 266de7b to 4a8c460 Compare June 2, 2024 13:09

sylvestre reviewed Jun 19, 2024

View reviewed changes

Cargo.toml Show resolved Hide resolved

sylvestre reviewed Jun 19, 2024

View reviewed changes

src/uu/uptime/src/platform/unix.rs Outdated Show resolved Hide resolved

Replaced quick_error with thiserror and added some documentation

2b94a69

AnirbanHalder654322 force-pushed the support_files_in_uptime branch from 2d8d270 to 2b94a69 Compare June 21, 2024 17:39

Lint and spelling

ec499ad

AnirbanHalder654322 requested a review from sylvestre June 22, 2024 09:19

sylvestre merged commit 2774274 into uutils:main Jun 22, 2024

BrewTestBot mentioned this pull request Jun 23, 2024

uutils-coreutils 0.0.27 Homebrew/homebrew-core#175400

Merged

moonfruit mentioned this pull request Jun 24, 2024

uutils-selected 0.0.27 moonfruit/homebrew-tap#114

Merged

AnirbanHalder654322 deleted the support_files_in_uptime branch December 28, 2025 06:53

Uh oh!

uptime: Support files in uptime #6400

uptime: Support files in uptime #6400

Uh oh!

Conversation

AnirbanHalder654322 commented May 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented May 14, 2024

Uh oh!

github-actions bot commented May 19, 2024

Uh oh!

Uh oh!

AnirbanHalder654322 commented May 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented May 28, 2024

Uh oh!

AnirbanHalder654322 commented May 28, 2024

Uh oh!

github-actions bot commented Jun 1, 2024

Uh oh!

Uh oh!

github-actions bot commented Jun 2, 2024

Uh oh!

github-actions bot commented Jun 4, 2024

Uh oh!

AnirbanHalder654322 commented Jun 11, 2024

Uh oh!

github-actions bot commented Jun 19, 2024

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jun 21, 2024

Uh oh!

AnirbanHalder654322 commented Jun 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sylvestre commented Jun 22, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

`uptime`: Support files in uptime #6400

`uptime`: Support files in uptime #6400

AnirbanHalder654322 commented May 14, 2024 •

edited

Loading

AnirbanHalder654322 commented May 28, 2024 •

edited

Loading

AnirbanHalder654322 commented Jun 21, 2024 •

edited

Loading