Skip to content

Add include_children parameter when creating MemTimer object for external processes #70

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

Merged
fabianp merged 2 commits into from
Jan 28, 2014
Merged

Add include_children parameter when creating MemTimer object for external processes #70

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6924d6
Add include_children parameter when creating MemTimer object for exte…
guillermo-carrasco Jan 27, 2014
3b25886
return mem avoids entering the next block. This is not en if else case
guillermo-carrasco Jan 27, 2014
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 memory_profiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ def memory_usage(proc=-1, interval=.1, timeout=None, timestamps=False,
while True:
child_conn, parent_conn = Pipe() # this will store MemTimer's results
p = MemTimer(os.getpid(), interval, child_conn, timestamps=timestamps,
max_usage=max_usage)
max_usage=max_usage, include_children=include_children)
p.start()
parent_conn.recv() # wait until we start getting memory
returned = f(*args, **kw)
Expand Down