Skip to content

Enable Child Memory Usage Tracking on Windows #23686

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

Merged
merged 1 commit into from
Mar 31, 2019

Conversation

gmittert
Copy link
Contributor

Windows requires a handle to get memory usage, so on Windows collect the child's memory usage as it exits instead of as the parent is cleaning up. This enables both Windows to output memory usage stats and causes test/Misc/stats_dir_plausible_maxrss.swift to pass on Windows.

Windows requires a handle to get memory usage, so do a slight refactor
to collect the child's memory usage as it exits instead of as the parent
is cleaning up.
Copy link
Contributor

@jrose-apple jrose-apple left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks reasonable to me. Thank you!

@jrose-apple
Copy link
Contributor

@swift-ci Please smoke test

@jrose-apple jrose-apple self-assigned this Mar 31, 2019
@jrose-apple jrose-apple merged commit 8998235 into swiftlang:master Mar 31, 2019
@gmittert gmittert deleted the BringBackRSSReaders branch March 31, 2019 03:57
@compnerd
Copy link
Member

Hmm, I suspect that this has caused a regression on the Windows test suite: Driver.batch_mode_parseable_output_cancellation fails after this:
https://dev.azure.com/compnerd/windows-swift/_build/results?buildId=901

@gmittert
Copy link
Contributor Author

Bleh, I'll take a look

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants