Georg/OOMAnalyser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow all non-whitespace chars in program names

Browse Source 
Program names in Posix can contain all characters expect the null byte.
The code allows \S (all non-whitespaces) and spaces in program names.
This excluded some allowed characters like \n, \r and \t. No negative
effects should arise from this.
This commit is contained in:
Carsten Grohmann 2020-12-07 14:00:20 +01:00
parent 7ef53b3ba2
commit d964d657ba
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OOMAnalyser.py
View File

@ -318,7 +318,7 @@ class OOMAnalyser(object):
"""Analyse an OOM object and calculate additional values""" """Analyse an OOM object and calculate additional values"""
REC_INVOKED_OOMKILLER = re.compile( REC_INVOKED_OOMKILLER = re.compile(
r'^(?P<trigger_proc_name>[\w\- ]+) invoked oom-killer: ' r'^(?P<trigger_proc_name>[\S ]+) invoked oom-killer: '
r'gfp_mask=(?P<trigger_proc_gfp_mask>0x[a-z0-9]+)(\((?P<trigger_proc_gfp_flags>[A-Z_|]+)\))?, ' r'gfp_mask=(?P<trigger_proc_gfp_mask>0x[a-z0-9]+)(\((?P<trigger_proc_gfp_flags>[A-Z_|]+)\))?, '
r'(nodemask=(?P<trigger_proc_nodemask>([\d,-]+|\(null\))), )?' r'(nodemask=(?P<trigger_proc_nodemask>([\d,-]+|\(null\))), )?'
r'order=(?P<trigger_proc_order>\d+), ' r'order=(?P<trigger_proc_order>\d+), '
@ -414,7 +414,7 @@ class OOMAnalyser(object):
r'(?P<nr_ptes_pages>\d+)\s+(?P<swapents_pages>\d+)\s+(?P<oom_score_adj>-?\d+)\s+(?P<name>.+)\s*') r'(?P<nr_ptes_pages>\d+)\s+(?P<swapents_pages>\d+)\s+(?P<oom_score_adj>-?\d+)\s+(?P<name>.+)\s*')
REC_OOM_KILL_PROCESS = re.compile( REC_OOM_KILL_PROCESS = re.compile(
r'^Out of memory: Kill process (?P<killed_proc_pid>\d+) \((?P<killed_proc_name>[\w ]+)\) ' r'^Out of memory: Kill process (?P<killed_proc_pid>\d+) \((?P<killed_proc_name>[\S ]+)\) '
r'score (?P<killed_proc_score>\d+) or sacrifice child', r'score (?P<killed_proc_score>\d+) or sacrifice child',
re.MULTILINE re.MULTILINE
) )