Skip to content

Store child processes by PID #354

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
merged 3 commits into from
Mar 20, 2022
Merged

Store child processes by PID #354

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2246640
store processes by PID
IMikhelson Mar 19, 2022
ea08ce8
included memory_metric
IMikhelson Mar 19, 2022
3faea8a
include io and max_iterations
IMikhelson Mar 19, 2022
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
22 changes: 10 additions & 12 deletions memory_profiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# .. we'll use this to pass it to the child script ..
_CLEAN_GLOBALS = globals().copy()

__version__ = '0.59.0'
__version__ = '0.60.0'

_CMD_USAGE = "python -m memory_profiler script_file.py"

Expand All @@ -23,7 +23,6 @@
import traceback
import warnings


if sys.platform == "win32":
# any value except signal.CTRL_C_EVENT and signal.CTRL_BREAK_EVENT
# can be used to kill a process unconditionally in Windows
Expand Down Expand Up @@ -106,12 +105,12 @@ def _get_child_memory(process, meminfo_attr=None, memory_metric=0):
for child in getattr(process, children_attr)(recursive=True):
if isinstance(memory_metric, str):
meminfo = getattr(child, meminfo_attr)()
yield getattr(meminfo, memory_metric) / _TWO_20
yield child.pid, getattr(meminfo, memory_metric) / _TWO_20
else:
yield getattr(child, meminfo_attr)()[memory_metric] / _TWO_20
yield child.pid, getattr(child, meminfo_attr)()[memory_metric] / _TWO_20
except (psutil.NoSuchProcess, psutil.AccessDenied):
# https://github.com/fabianp/memory_profiler/issues/71
yield 0.0
yield (0, 0.0)


def _get_memory(pid, backend, timestamps=False, include_children=False, filename=None):
Expand Down Expand Up @@ -139,7 +138,7 @@ def ps_util_tool():
else 'get_memory_info'
mem = getattr(process, meminfo_attr)()[0] / _TWO_20
if include_children:
mem += sum(_get_child_memory(process, meminfo_attr))
mem += sum([mem for (pid, mem) in _get_child_memory(process, meminfo_attr)])
if timestamps:
return mem, time.time()
else:
Expand All @@ -166,7 +165,7 @@ def _ps_util_full_tool(memory_metric):
mem = getattr(meminfo, memory_metric) / _TWO_20

if include_children:
mem += sum(_get_child_memory(process, meminfo_attr, memory_metric))
mem += sum([mem for (pid, mem) in _get_child_memory(process, meminfo_attr, memory_metric)])

if timestamps:
return mem, time.time()
Expand Down Expand Up @@ -411,13 +410,13 @@ def memory_usage(proc=-1, interval=.1, timeout=None, timestamps=False,

# Write children to the stream file
if multiprocess:
for idx, chldmem in enumerate(_get_child_memory(proc.pid)):
for idx, chldmem in _get_child_memory(proc.pid):
stream.write("CHLD {0} {1:.6f} {2:.4f}\n".format(idx, chldmem, time.time()))
else:
# Create a nested list with the child memory
if multiprocess:
mem_usage = [mem_usage]
for chldmem in _get_child_memory(proc.pid):
for _, chldmem in _get_child_memory(proc.pid):
mem_usage.append(chldmem)

# Append the memory usage to the return value
Expand Down Expand Up @@ -455,13 +454,13 @@ def memory_usage(proc=-1, interval=.1, timeout=None, timestamps=False,

# Write children to the stream file
if multiprocess:
for idx, chldmem in enumerate(_get_child_memory(proc)):
for idx, chldmem in _get_child_memory(proc):
stream.write("CHLD {0} {1:.6f} {2:.4f}\n".format(idx, chldmem, time.time()))
else:
# Create a nested list with the child memory
if multiprocess:
mem_usage = [mem_usage]
for chldmem in _get_child_memory(proc):
for _, chldmem in _get_child_memory(proc):
mem_usage.append(chldmem)

# Append the memory usage to the return value
Expand Down Expand Up @@ -1248,7 +1247,6 @@ def exec_with_profiler(filename, profiler, backend, passed_args=[]):
try:
if _backend == 'tracemalloc' and has_tracemalloc:
tracemalloc.start()

with io.open(filename, encoding='utf-8') as f:
exec(compile(f.read(), filename, 'exec'), ns, ns)
finally:
Expand Down