Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix the max_mem_rss measurement #192

Merged
merged 6 commits into from
Jun 12, 2024
Merged

Fix the max_mem_rss measurement #192

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bbc7fa5
Fix the max_mem_rss measurement
mdboom Jun 12, 2024
ae3414f
Fix Windows
mdboom Jun 12, 2024
c0ed773
Don't provide a default value for resource_type
mdboom Jun 12, 2024
ad789ee
Fix Windows
mdboom Jun 12, 2024
5b08621
Use an abstraction
mdboom Jun 12, 2024
54077f9
Update pyperf/_process_time.py
mdboom Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyperf/_collect_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def collect_system_metadata(metadata):

def collect_memory_metadata(metadata):
if resource is not None:
metadata["mem_max_rss"] = get_max_rss()
metadata["mem_max_rss"] = get_max_rss(children=False)

# Note: Don't collect VmPeak of /proc/self/status on Linux because it is
# not accurate. See pyperf._linux_memory for more accurate memory metrics.
Expand Down
12 changes: 8 additions & 4 deletions pyperf/_process_time.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,13 @@
resource = None


def get_max_rss():
def get_max_rss(children=False):
mdboom marked this conversation as resolved.
Show resolved Hide resolved
if resource is not None:
usage = resource.getrusage(resource.RUSAGE_CHILDREN)
if children:
resource_type = resource.RUSAGE_CHILDREN
Copy link
Member

Choose a reason for hiding this comment

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

We should not use RUSAGE_SELF on Linux, FreeBSD and other platforms?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This function is called in two contexts -- one when the benchmark runs entirely in a separate subprocess, in which case we want CHILDREN, and one when in which it runs in the same process, where we want SELF. Saying that, it would probably clearer to not have a default value for resource_type here.

else:
resource_type = resource.RUSAGE_SELF
usage = resource.getrusage(resource_type)
if sys.platform == 'darwin':
return usage.ru_maxrss
return usage.ru_maxrss * 1024
Expand Down Expand Up @@ -61,7 +65,7 @@ def bench_process(loops, args, kw, profile_filename=None):
args = [args[0], "-m", "cProfile", "-o", temp_profile_filename] + args[1:]

for _ in range_it:
start_rss = get_max_rss()
start_rss = get_max_rss(children=True)

proc = subprocess.Popen(args, **kw)
with proc:
Expand All @@ -75,7 +79,7 @@ def bench_process(loops, args, kw, profile_filename=None):
os.unlink(temp_profile_filename)
sys.exit(exitcode)

rss = get_max_rss() - start_rss
rss = get_max_rss(children=True) - start_rss
max_rss = max(max_rss, rss)

if profile_filename:
Expand Down