1.3.3

vinifmor · Aug 12, 2023 · a341a58 · a341a58
2 parents 69f41c8 + 818601c
commit a341a58
Show file tree

Hide file tree

Showing 8 changed files with 231 additions and 215 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.3.3] 2023-08-12
+
+### Improvements
+- optimizer: ignoring more unneeded EA launcher and Wine child processes
+
+### Fixes
+- watcher/optimizer: not able to map processes alive with `ps` command version >= 4.0.X
+
 ## [1.3.2] 2023-01-30
 ### Improvements
 - replaced some subprocess calls executed in behalf of non-root users by async calls (Python's asyncio native approach)

diff --git a/guapow/__init__.py b/guapow/__init__.py
@@ -2,4 +2,4 @@
 
 ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 __app_name__ = 'guapow'
-__version__ = '1.3.2'
+__version__ = '1.3.3'
diff --git a/guapow/common/system.py b/guapow/common/system.py
@@ -1,5 +1,6 @@
 import asyncio
 import os
+import re
 import subprocess
 import traceback
 from datetime import datetime, timedelta
@@ -9,6 +10,7 @@
 
 BAD_USER_ENV_VARS = {'LD_PRELOAD'}
 T = TypeVar('T')
+RE_SEVERAL_SPACES = re.compile(r'\s+')
 
 
 class ProcessTimedOutError(Exception):
@@ -124,7 +126,7 @@ def _match(line: str) -> Optional[Tuple[int, str]]:
         line_strip = line.strip()
 
         if line_strip:
-            line_split = line_strip.split('#', 1)
+            line_split = RE_SEVERAL_SPACES.split(line_strip, 1)
 
             if len(line_split) > 1:
                 name = line_split[1].strip()
@@ -134,7 +136,7 @@ def _match(line: str) -> Optional[Tuple[int, str]]:
                     except ValueError:
                         return
 
-    return await match_syscall(cmd=f'ps -Ao "%p#%c" -ww --no-headers --sort={"-" if last_match else ""}pid',
+    return await match_syscall(cmd=f'ps -Ao pid,comm -ww --no-headers --sort={"-" if last_match else ""}pid',
                                match=_match)
 
 
@@ -143,7 +145,7 @@ def _match(line: str) -> Optional[Tuple[int, str]]:
         line_strip = line.strip()
 
         if line_strip:
-            line_split = line_strip.split('#', 1)
+            line_split = RE_SEVERAL_SPACES.split(line_strip, 1)
 
             if len(line_split) > 1:
                 for p in patterns:
@@ -154,7 +156,7 @@ def _match(line: str) -> Optional[Tuple[int, str]]:
                         except ValueError:
                             break
 
-    return await match_syscall(cmd=f'ps -Ao "%p#%a" -ww --no-headers --sort={"-" if last_match else ""}pid',
+    return await match_syscall(cmd=f'ps -Ao pid,args -ww --no-headers --sort={"-" if last_match else ""}pid',
                                match=_match)
 
 
@@ -165,7 +167,7 @@ def _match(line: str) -> Optional[Dict[str, int]]:
         line_strip = line.strip()
 
         if line_strip:
-            line_split = line_strip.split('#', 1)
+            line_split = RE_SEVERAL_SPACES.split(line_strip, 1)
 
             if len(line_split) > 1:
                 cmd = line_split[1].strip()
@@ -178,7 +180,7 @@ def _match(line: str) -> Optional[Dict[str, int]]:
             if len(matches) == len(commands):
                 return matches
 
-    await match_syscall(cmd=f'ps -Ao "%p#%a" -ww --no-headers --sort={"-" if last_match else ""}pid', match=_match)
+    await match_syscall(cmd=f'ps -Ao pid,args -ww --no-headers --sort={"-" if last_match else ""}pid', match=_match)
     return matches if matches else None
 
 
@@ -189,7 +191,7 @@ def _match(line: str) -> Optional[Dict[str, int]]:
         line_strip = line.strip()
 
         if line_strip:
-            line_split = line_strip.split('#', 1)
+            line_split = RE_SEVERAL_SPACES.split(line_strip, 1)
 
             if len(line_split) > 1:
                 current_name = line_split[1].strip()
@@ -203,7 +205,7 @@ def _match(line: str) -> Optional[Dict[str, int]]:
         if len(matches) == len(names):
             return matches
 
-    await match_syscall(cmd=f'ps -Ao "%p#%c" -ww --no-headers --sort={"-" if last_match else ""}pid', match=_match)
+    await match_syscall(cmd=f'ps -Ao pid,comm -ww --no-headers --sort={"-" if last_match else ""}pid', match=_match)
     return matches if matches else None
 
 
@@ -215,7 +217,7 @@ def _match(line: str) -> Optional[Dict[int, str]]:
             line_strip = line.strip()
 
             if line_strip:
-                line_split = line_strip.split('#', 1)
+                line_split = RE_SEVERAL_SPACES.split(line_strip, 1)
 
                 if len(line_split) > 1:
                     try:
@@ -229,7 +231,7 @@ def _match(line: str) -> Optional[Dict[int, str]]:
             if len(matches) == len(pids):
                 return matches
 
-        await match_syscall(cmd='ps -Ao "%p#%a" -ww --no-headers', match=_match)
+        await match_syscall(cmd='ps -Ao pid,args -ww --no-headers', match=_match)
         return matches if matches else None
 
 
@@ -238,7 +240,7 @@ def read_current_pids() -> Set[int]:
 
 
 async def map_pids_by_ppid() -> Optional[Dict[int, Set[int]]]:
-    code, output = await async_syscall('ps -Ao "%P#%p" -ww --no-headers')
+    code, output = await async_syscall('ps -Ao ppid,pid -ww --no-headers')
 
     if code == 0 and output:
         all_procs = {}
@@ -247,7 +249,7 @@ async def map_pids_by_ppid() -> Optional[Dict[int, Set[int]]]:
                 line_strip = line.strip()
 
                 if line_strip:
-                    line_split = line_strip.split('#', 1)
+                    line_split = RE_SEVERAL_SPACES.split(line_strip, 1)
 
                     if len(line_split) == 2:
                         try:
@@ -348,7 +350,7 @@ async def run_async_process(cmd: str, user_id: Optional[int] = None, custom_env:
 
 
 async def map_processes_by_parent() -> Dict[int, Set[Tuple[int, str]]]:
-    exitcode, output = await async_syscall(f'ps -Ao "%P#%p#%c" -ww --no-headers')
+    exitcode, output = await async_syscall(f'ps -Ao ppid,pid,comm -ww --no-headers')
 
     if exitcode == 0 and output:
         proc_tree = dict()
@@ -357,7 +359,7 @@ async def map_processes_by_parent() -> Dict[int, Set[Tuple[int, str]]]:
             line_strip = line.strip()
 
             if line_strip:
-                line_split = line_strip.split('#', 2)
+                line_split = RE_SEVERAL_SPACES.split(line_strip, 2)
 
                 if len(line_split) > 2:
                     ppid, pid, comm, = (e.strip() for e in line_split)

diff --git a/guapow/service/optimizer/launcher.py b/guapow/service/optimizer/launcher.py
@@ -11,7 +11,7 @@
 from guapow.common import util
 from guapow.common.dto import OptimizationRequest
 from guapow.common.model import CustomEnum
-from guapow.common.system import async_syscall, map_processes_by_parent, find_process_children
+from guapow.common.system import async_syscall, map_processes_by_parent, find_process_children, RE_SEVERAL_SPACES
 from guapow.common.users import is_root_user
 from guapow.service.optimizer.profile import OptimizationProfile
 
@@ -129,8 +129,8 @@ def __init__(self, check_time: float, found_check_time: float, logger: Logger,
     @staticmethod
     async def map_process_by_pid(mode: LauncherSearchMode, ignore: Set[int]) -> Optional[Dict[int, str]]:
         if mode:
-            mode_str = "a" if mode == LauncherSearchMode.COMMAND else "c"
-            exitcode, output = await async_syscall(f'ps -Ao "%p#%{mode_str}" -ww --no-headers')
+            mode_str = "args" if mode == LauncherSearchMode.COMMAND else "comm"
+            exitcode, output = await async_syscall(f'ps -Ao pid,{mode_str} -ww --no-headers')
 
             if exitcode == 0 and output:
                 pid_comm = dict()
@@ -139,7 +139,7 @@ async def map_process_by_pid(mode: LauncherSearchMode, ignore: Set[int]) -> Opti
                     line_strip = line.strip()
 
                     if line_strip:
-                        line_split = line_strip.split('#', 1)
+                        line_split = RE_SEVERAL_SPACES.split(line_strip, 1)
 
                         if len(line_split) > 1:
                             try:
@@ -261,13 +261,15 @@ def to_ignore(self) -> Set[str]:
         if self._to_ignore is None:
             self._to_ignore = {"wineserver", "services.exe", "winedevice.exe", "plugplay.exe", "svchost.exe",
                                "explorer.exe", "rpcss.exe", "tabtip.exe", "wine", "wine64", "wineboot.exe",
-                               "cmd.exe", "conhost.exe", "start.exe", "steam-runtime-l", "proton", "gzip",
-                               "steam.exe", "python", "python3", "OriginWebHelper", "Origin.exe",
+                               "cmd.exe", "conhost.exe", "start.exe", "winemenubuilder", "steam-runtime-l", "proton",
+                               "gzip", "steam.exe", "python", "python3", "OriginWebHelper", "Origin.exe",
                                "OriginClientSer", "QtWebEngineProc", "EASteamProxy.ex", "ActivationUI.ex",
-                               "EALink.exe", "OriginLegacyCLI", "IGOProxy.exe", "IGOProxy64.exe", "igoproxy64.exe",
-                               "ldconfig", "UPlayBrowser.exe", "UbisoftGameLaun", "upc.exe", "UplayService.ex",
-                               "UplayWebCore.ex", "CrRendererMain", "regsvr32", "CrGpuMain", "CrUtilityMain",
-                               "whql:off", "PnkBstrA.exe"}
+                               "EALink.exe", "OriginLegacyCLI", "IGOProxy.exe", "IGOProxy32.exe", "IGOProxy64.exe",
+                               "igoproxy64.exe", "ldconfig", "UPlayBrowser.exe", "UbisoftGameLaun", "upc.exe",
+                               "UplayService.ex", "UplayWebCore.ex", "CrRendererMain", "regsvr32", "CrGpuMain",
+                               "CrUtilityMain", "whql:off", "PnkBstrA.exe", "EABackgroundSer", "EADesktop.exe",
+                               "EALocalHostSvc.", "EADestager.exe", "EALaunchHelper", "Link2EA.exe",
+                               "ThreadPoolSingl ", "CrBrowserMain", "rundll32.exe", "iexplore.exe", "UnityCrashHandl"}
 
         return self._to_ignore
 

diff --git a/guapow/service/watcher/util.py b/guapow/service/watcher/util.py
@@ -1,18 +1,18 @@
 import asyncio
 from typing import Dict, Tuple
 
-from guapow.common.system import async_syscall
+from guapow.common.system import async_syscall, RE_SEVERAL_SPACES
 
 
 async def _map_processes_by_attribute(attr: str) -> Dict[int, str]:
-    code, output = await async_syscall(f'ps -Ao "%p#%{attr}" -ww --no-headers')
+    code, output = await async_syscall(f'ps -Ao pid,{attr} -ww --no-headers')
 
     if code == 0:
         procs = {}
         for line in output.split('\n'):
             line_strip = line.strip()
             if line_strip:
-                line_split = line_strip.split('#', 1)
+                line_split = RE_SEVERAL_SPACES.split(line_strip, 1)
 
                 if len(line_split) > 1:
                     try:
@@ -24,7 +24,7 @@ async def _map_processes_by_attribute(attr: str) -> Dict[int, str]:
 
 
 async def map_processes() -> Dict[int, Tuple[str, str]]:
-    pid_comm, pid_cmd = await asyncio.gather(_map_processes_by_attribute('c'), _map_processes_by_attribute('a'))
+    pid_comm, pid_cmd = await asyncio.gather(_map_processes_by_attribute("comm"), _map_processes_by_attribute("args"))
 
     if pid_comm and pid_cmd:
         res = {}