Skip to content

FIX Merge more children PIDs to parents (fixes #72, maybe affects #14) #75

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
allanlaal wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FIX Merge more children PIDs to parents (fixes #72, maybe affects #14) #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions ps_mem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ def getMemStats(pid):
return (Private, Shared, Shared_huge, Swap, mem_id)


def getCmdName(pid, split_args, discriminate_by_pid, exe_only=False):
def getCmdName(pid, split_args, discriminate_by_pid):
cmdline = proc.open(pid, 'cmdline').read().split("\0")
while cmdline[-1] == '' and len(cmdline) > 1:
cmdline = cmdline[:-1]
Expand Down Expand Up @@ -334,8 +334,8 @@ def getCmdName(pid, split_args, discriminate_by_pid, exe_only=False):
path = cmdline[0] + " [updated]"
else:
path += " [deleted]"

exe = os.path.basename(path)
if exe_only: return exe

proc_status = proc.open(pid, 'status').readlines()
cmd = proc_status[0][6:-1]
Expand All @@ -356,17 +356,20 @@ def getCmdName(pid, split_args, discriminate_by_pid, exe_only=False):
break
if ppid:
try:
p_exe = getCmdName(ppid, False, False, exe_only=True)
p_exe = getCmdName(ppid, False, False)
except LookupError:
pass
else:
if exe == p_exe:
cmd = exe

if sys.version_info >= (3,):
cmd = cmd.encode(errors='replace').decode()
if discriminate_by_pid:
cmd = '%s [%d]' % (cmd, pid)
return cmd
return cmd
else:
return exe


#The following matches "du -h" output
Expand Down