Skip to content

Improve child handling #140

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Improve child handling #140

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
671f3e2
improve handling of child processes; fix bug in plot_file for large n…
rokroskar Apr 5, 2017
ae2a5eb
update docstring
rokroskar Apr 6, 2017
7f748c2
fix help string
rokroskar Apr 6, 2017
ff3b22d
oops, removing debug print
rokroskar Apr 6, 2017
c75081a
removed try/except, not needed
rokroskar Apr 6, 2017
b5c87e4
added parent process to dataframe; add df plot function
rokroskar Apr 11, 2017
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
Prev Previous commit
Next Next commit
update docstring
  • Loading branch information
@rokroskar
rokroskar committed Apr 6, 2017
commit ae2a5eb24bd5f92a9e29e46c61027bc4796e58ae
15 changes: 12 additions & 3 deletions memory_profiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1215,7 +1215,7 @@ def read_mprofile_file(filename):
"""Read an mprofile file and return its content.

Returns
=======
-------
content: dict
Keys:

Expand Down Expand Up @@ -1272,7 +1272,7 @@ def read_mprofile_file_multiprocess(filename):
"""Read an mprofile file and return a mem_usage list

Returns
=======
-------
content: list

This is analogous to the list obtained when the `memory_usage` is used
Expand Down Expand Up @@ -1304,8 +1304,17 @@ def read_mprofile_file_multiprocess(filename):
def convert_mem_usage_to_df(filename, is_pickle=False):
"""Convert a `mem_usage` list to a `pandas.DataFrame`

Parameters
----------
filename: path to the memory profile data; can be either a file
created by mprof or a pickle of the result of `memory_usage`

is_pickle: if True, assume the data is the pickled list
returned by `memory_usage`


Returns
=======
-------
content: pandas.DataFrame

Returns a `pandas.DataFrame` with child IDs as columns and the timestamp as an index
Expand Down