-
-
Notifications
You must be signed in to change notification settings - Fork 299
fix: Use /proc/<id>/status to get uid rather than loginuid. #691
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.
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
mpb27
wants to merge
6
commits into
rbonghi:master
Choose a base branch
from
mpb27:fix/proc-loginuid-unavailable
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
e2af1f0
fix: Use /proc/<id>/status to get uid rather than loginuid.
mpb27 39823e1
Merge branch 'master' into fix/proc-loginuid-unavailable
johnnynunez 731ea19
Apply suggestion from @sourcery-ai[bot]
johnnynunez 2b89657
Apply suggestion from @sourcery-ai[bot]
johnnynunez 889a331
Merge branch 'master' into fix/proc-loginuid-unavailable
johnnynunez 583e9db
Merge branch 'master' into fix/proc-loginuid-unavailable
johnnynunez File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,12 +18,14 @@ | |
import re | ||
import os | ||
import pwd | ||
from .common import cat | ||
from .common import cat, cat_multiline | ||
# Logging | ||
import logging | ||
# Create logger | ||
logger = logging.getLogger(__name__) | ||
|
||
|
||
PROCESS_UID_REG = re.compile(r'^Uid:\s+(\d+)', re.MULTILINE) | ||
MEM_TABLE_REG = re.compile(r'^(?P<user>\w+)\s+(?P<process>[^ ]+)\s+(?P<PID>\d+)\s+(?P<size>\d+)(?P<unit>\w)\n') | ||
TOT_TABLE_REG = re.compile(r'total\s+(?P<size>\d+)(?P<unit>\w)') | ||
|
||
|
@@ -70,7 +72,7 @@ def read_process_table(path_table): | |
class ProcessService(object): | ||
|
||
def __init__(self): | ||
self.usernames = {4294967295: "root"} | ||
self.usernames = {4294967295: "root", -1: "<unknown>"} | ||
# board type | ||
self._root_path = "/sys/kernel" | ||
if os.getenv('JTOP_TESTING', False): | ||
|
@@ -91,7 +93,9 @@ def get_process_info(self, pid, gpu_mem_usage, process_name, uptime): | |
# https://man7.org/linux/man-pages/man5/proc.5.html | ||
stat = cat(os.path.join('/proc', pid, 'stat')).split() | ||
# Decode uid and find username | ||
uid = int(cat(os.path.join('/proc', pid, 'loginuid'))) | ||
proc_status = cat_multiline(os.path.join('/proc', pid, 'status')) | ||
uid_matches = PROCESS_UID_REG.findall(proc_status) | ||
uid = int(uid_matches[0]) if uid_matches else int(-1) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. issue (code-quality): We've found these issues:
|
||
if uid not in self.usernames: | ||
self.usernames[uid] = pwd.getpwuid(uid).pw_name | ||
johnnynunez marked this conversation as resolved.
Show resolved
Hide resolved
|
||
# Read memory process | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.