Repository navigation
Refactor maxrss calculation to consider children - #162
Merged
Merged
Conversation
atovkes
added a commit
that referenced
this pull request
Oct 15, 2026
…pture (#176) Brings main's 49 commits (Rohan's #170 and #176, plus #161, #162, #164) on top of stage A, so main is an ancestor of desktop-dev again. Conflict resolutions: - Discovery lives in Sensor/adr_discovery since split_stage 02. Main's new modules and tests go there; its policy example moves to Sensor/examples and its GenAI mapping test to Sensor/tests/sensor. - Walk budget: main's stage-ceiling reserve (reserved_walk_entries, 10% by default) replaces desktop-dev's walk-level reserve. Desktop-dev's coverage records stay in main's fair-share walk: scope_excluded, symlink_not_followed, the walk-stop boundary, and swept only when the root was listed. - Hooks: main's digest identity, with desktop-dev's shlex-aware scrubbing (applied before hashing) and readable names. - Schema 1.2 carries both sides' additions; identifier/verify.py stays deleted. - Common/sync.py writes the Discovery copy under Sensor/. Main's Discovery CI job becomes a lint step in Sensor tests, which already run Discovery's tests. - Desktop's import contracts list the new adr_discovery.archive module. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What type of PR is this? (check all applicable)
Related issue: N/A
What changed?
main()'s --resource finally block now takes max(end_self.ru_maxrss, end_children.ru_maxrss) instead of end_self.ru_maxrss alone when computing max_rss_bytes.
Why?
The CPU metrics (cpu_user_seconds, cpu_system_seconds) already aggregate RUSAGE_SELF + RUSAGE_CHILDREN, but max_rss_bytes only read RUSAGE_SELF. Any run where a child process (e.g. a parser shelling out) held the peak memory would silently underreport it in resource.log.
How did you test it?
Reviewed the diff manually and compiled it (py_compile); no existing automated test covers resource.log output, so this is a logic-only fix, not independently exercised by a test run.
Potential risks
Low. max_rss_bytes can now be reported higher than before for runs that spawn subprocesses; no other field or behavior changes. No change to the default (non---resource) code path.