Repository navigation
pgrep: compare --older with the process's age - #821
jayhemnani9910 wants to merge 3 commits into
Conversation
The start time in /proc/<pid>/stat counts clock ticks since boot, so comparing it with the --older seconds matched nearly every process. Compare the time since the process started instead.
There was a problem hiding this comment.
Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota.
An organization owner can choose the repository organization as the billing source for reviews requested by members with a paid Copilot license. Learn about Copilot code review billing. Review the Copilot code review billing settings.
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #821 +/- ##
==========================================
+ Coverage 19.20% 19.91% +0.71%
==========================================
Files 68 68
Lines 10156 10333 +177
Branches 546 552 +6
==========================================
+ Hits 1950 2058 +108
- Misses 8206 8275 +69
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
| /// time in /proc/<pid>/stat. | ||
| #[cfg(target_os = "linux")] | ||
| fn ticks_since_boot() -> u64 { | ||
| let uptime = std::fs::read_to_string("/proc/uptime") |
There was a problem hiding this comment.
could we use uucore::uptime::get_uptime instead of parsing /proc/uptime again?
w and top already use it
There was a problem hiding this comment.
Done, it uses uucore::uptime::get_uptime now.
| let uptime = std::fs::read_to_string("/proc/uptime") | ||
| .ok() | ||
| .and_then(|s| s.split_whitespace().next()?.parse::<f64>().ok()) | ||
| .unwrap_or(0.0); |
There was a problem hiding this comment.
if /proc/uptime can't be read, --older N silently matches nothing
maybe show an error instead?
There was a problem hiding this comment.
Done, --older now reports the error from get_uptime instead of matching nothing.
| }; | ||
| #[cfg(not(target_os = "linux"))] | ||
| let older_matched = true; | ||
|
|
There was a problem hiding this comment.
why only linux? before this, --older wasn't gated
There was a problem hiding this comment.
No good reason, I removed the Linux gates. Only the tick lookup keeps a cfg(unix), because sysconf is unix-only.
There was a problem hiding this comment.
Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota. Try requesting a review at a lower effort level.
An organization owner can choose the repository organization as the billing source for reviews requested by members with a paid Copilot license. Learn about Copilot code review billing. Review the Copilot code review billing settings.
There was a problem hiding this comment.
Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota. Try requesting a review at a lower effort level.
An organization owner can choose the repository organization as the billing source for reviews requested by members with a paid Copilot license. Learn about Copilot code review billing. Review the Copilot code review billing settings.
pgrep --older N(and pkill/pidwait, which share the matcher) should select processes that have been running for at least N seconds. It compared N with the process's start time, which /proc//stat gives in clock ticks since boot, so on any machine up for more than N/100 seconds every process matched:The matcher now reads the time since boot (
/proc/uptime) and the clock tick rate (sysconf(_SC_CLK_TCK)) once, and keeps a process whennow - start_time >= N * ticks. Without--oldernothing changes.Against procps-ng 4.0.4 with a 2.5 s old process:
--older 0/1/2match,--older 3/5/99999999don't, on both.--older 60 -x systemdgives the same processes. A huge N saturates instead of overflowing.Test
test_older_compares_process_age: a just-spawnedsleepis listed with--older 0and not with--older 60(fails on main).cargo test: 225 pass (224 on main),cargo clippy --all-targets -- -D warningsclean.