atomicshop 2.19.13__py3-none-any.whl → 2.19.14__py3-none-any.whl

atomicshop/__init__.py

@@ -1,4 +1,4 @@
 """Atomic Basic functions and classes to make developer life easier"""
 
 __author__ = "Den Kras"
-__version__ = '2.19.13'
+__version__ = '2.19.14'

atomicshop/process_poller/simple_process_pool.py

@@ -2,9 +2,11 @@ import threading
 from pathlib import Path
 import time
 import multiprocessing.managers
+import queue
+
 
 from ..wrappers.pywin32w.win_event_log.subscribes import process_create, process_terminate
-from .. import get_process_list, get_process_name_cmd_dll
+from .. import get_process_list
 from ..print_api import print_api
 
 
@@ -15,6 +17,10 @@ WAIT_FOR_PROCESS_POLLER_PID_SECONDS: int = 3
 WAIT_FOR_PROCESS_POLLER_PID_COUNTS: int = WAIT_FOR_PROCESS_POLLER_PID_SECONDS * 10
 
 
+class PidProcessConverterPIDNotFoundError(Exception):
+    pass
+
+
 class SimpleProcessPool:
     """
     THE POOL OF PROCESSES IS NOT REAL TIME!!!
@@ -106,14 +112,16 @@ class SimpleProcessPool:
 
         self._processes: dict = dict()
         self._running: bool = False
+        self.shared_dict_update_queue: queue.Queue = queue.Queue()
+        self.empty_cmdline_queue: queue.Queue = queue.Queue()
 
     def start(self):
         self._running = True
 
         self._processes = get_process_list.GetProcessList(
-            get_method='pywin32', connect_on_init=True).get_processes(as_dict=True)
+            get_method='psutil', connect_on_init=True).get_processes(as_dict=True)
 
-        thread_get_queue = threading.Thread(target=self._start_main_thread, args=(self.process_pool_shared_dict_proxy,))
+        thread_get_queue = threading.Thread(target=self._start_main_thread, args=(self.shared_dict_update_queue,))
         thread_get_queue.daemon = True
         thread_get_queue.start()
 
@@ -121,13 +129,21 @@ class SimpleProcessPool:
         thread_process_termination.daemon = True
         thread_process_termination.start()
 
+        thread_get_psutil_commandline = threading.Thread(target=self._thread_get_psutil_commandline)
+        thread_get_psutil_commandline.daemon = True
+        thread_get_psutil_commandline.start()
+
+        thread_update_shared_dict = threading.Thread(target=self._update_shared_dict, args=(self.shared_dict_update_queue,))
+        thread_update_shared_dict.daemon = True
+        thread_update_shared_dict.start()
+
     def stop(self):
         self._running = False
 
     def get_processes(self):
         return self._processes
 
-    def _start_main_thread(self, process_pool_shared_dict_proxy):
+    def _start_main_thread(self, shared_dict_update_queue):
         get_instance = process_create.ProcessCreateSubscriber()
         get_instance.start()
 
@@ -137,17 +153,35 @@ class SimpleProcessPool:
             process_name = Path(event['NewProcessName']).name
             command_line = event['CommandLine']
 
+            # The event log tracing method doesn't always give the command line, unlike the psutil method.
+            # So, we'll get the command line from the current psutil snapshot separately.
+            if command_line == '':
+                self.empty_cmdline_queue.put(process_id)
+
             self._processes[process_id] = {
                 'name': process_name,
                 'cmdline': command_line
             }
 
             # Update the multiprocessing shared dict proxy.
-            if process_pool_shared_dict_proxy is not None:
-                process_pool_shared_dict_proxy.clear()
-                process_pool_shared_dict_proxy.update(self._processes)
+            shared_dict_update_queue.put(dict(self._processes))
 
-            # print_api(f'Process [{process_id}] added to the pool.', color='blue')
+    def _thread_get_psutil_commandline(self):
+        """
+        This function will get an entry from the queue where command line is missing and get the command line
+        from the psutil snapshot.
+        """
+
+        while self._running:
+            empty_cmd_pid = self.empty_cmdline_queue.get()
+            current_psutil_process_snapshot: dict = get_process_list.GetProcessList(
+                get_method='psutil', connect_on_init=True).get_processes(as_dict=True)
+            command_line = current_psutil_process_snapshot[empty_cmd_pid]['cmdline']
+
+            self._processes[empty_cmd_pid]['cmdline'] = command_line
+
+            # Update the multiprocessing shared dict proxy.
+            self.shared_dict_update_queue.put(dict(self._processes))
 
     def _thread_process_termination(self):
         process_terminate_instance = process_terminate.ProcessTerminateSubscriber()
@@ -188,6 +222,15 @@ class SimpleProcessPool:
         _ = self._processes.pop(process_id, None)
         # print_api(f'Process [{process_id}] removed from the pool.', color='yellow')
 
+        self.shared_dict_update_queue.put(dict(self._processes))
+
+    def _update_shared_dict(self, shared_dict_update_queue):
+        while self._running:
+            current_process_pool = shared_dict_update_queue.get()
+            if self.process_pool_shared_dict_proxy is not None:
+                self.process_pool_shared_dict_proxy.clear()
+                self.process_pool_shared_dict_proxy.update(current_process_pool)
+
 
 class PidProcessConverter:
     """
@@ -204,7 +247,7 @@ class PidProcessConverter:
 
         self.process_pool_shared_dict_proxy: multiprocessing.managers.DictProxy = process_pool_shared_dict_proxy
 
-        self.get_process_with_dll_instance = get_process_name_cmd_dll.ProcessNameCmdline(load_dll=True)
+        self.get_process_with_psutil = get_process_list.GetProcessList(get_method='psutil', connect_on_init=True)
 
     def get_process_by_pid(self, pid: int):
         """
@@ -219,18 +262,20 @@ class PidProcessConverter:
         counter = 0
         process_dict: dict = dict()
         while counter < WAIT_FOR_PROCESS_POLLER_PID_COUNTS:
-            if pid not in self.process_pool_shared_dict_proxy:
+            # We need it so that the pool will not change in the middle of the process.
+            current_pid_pool = convert_proxy_dict_to_dict(self.process_pool_shared_dict_proxy)
+            if pid not in current_pid_pool:
                 # print(dict(self.process_pool_shared_dict_proxy))
                 time.sleep(0.1)
                 counter += 1
             else:
-                process_dict = self.process_pool_shared_dict_proxy[pid]
+                process_dict = current_pid_pool[pid]
                 break
 
-        if counter == WAIT_FOR_PROCESS_POLLER_PID_COUNTS and not process_dict:
-            print_api(f"Error: The PID [{pid}] is not in the pool, trying DLL snapshot.", color='yellow')
+        if not process_dict:
+            print_api(f"Error: The PID [{pid}] is not in the pool, trying psutil snapshot.", color='yellow')
             # Last resort, try to get the process name by current process snapshot.
-            processes = self.get_process_with_dll_instance.get_process_details(as_dict=True)
+            processes = self.get_process_with_psutil.get_processes(as_dict=True)
             if pid not in processes:
                 print_api(f"Error: Couldn't get the process name for PID: {pid}.", color='red')
                 process_dict = {
@@ -242,3 +287,25 @@ class PidProcessConverter:
 
         return process_dict
 
+
+def convert_proxy_dict_to_dict(proxy_dict: multiprocessing.managers.DictProxy) -> dict:
+    """
+    Convert the multiprocessing shared dict proxy to a normal dict.
+
+    :param proxy_dict: multiprocessing.managers.DictProxy, the shared dict proxy.
+    :return: dict, the normal dict.
+    """
+
+    # Create a snapshot of the keys
+    keys = list(proxy_dict.keys())
+    current_pid_pool = {}
+
+    for key in keys:
+        try:
+            # Attempt to retrieve the value for each key
+            current_pid_pool[key] = proxy_dict[key]
+        except KeyError:
+            # The key was removed concurrently; skip it
+            continue
+
+    return current_pid_pool

{atomicshop-2.19.13.dist-info → atomicshop-2.19.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: atomicshop
-Version: 2.19.13
+Version: 2.19.14
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License: MIT License

{atomicshop-2.19.13.dist-info → atomicshop-2.19.14.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=eRHmU5tHbd8diqaPTRFDlAasPNcCSvV7P_hocFodM0M,124
+atomicshop/__init__.py,sha256=jnzkSiVKr7rNaRPe51te8qpwDBNj2V37gzYMQVqPkoQ,124
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_create_pdf_demo.py,sha256=Yi-PGZuMg0RKvQmLqVeLIZYadqEZwUm-4A9JxBl_vYA,3713
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
@@ -170,7 +170,7 @@ atomicshop/permissions/ubuntu_permissions.py,sha256=n8z1vcIXDts4zLVue33dtJiTopjg
 atomicshop/permissions/win_permissions.py,sha256=eDQm1jfK9x_hkbLqIJjFTwfqinAWQ0iSr0kW3XrF1BE,1272
 atomicshop/process_poller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/process_poller/process_pool.py,sha256=4Qs427qd7OcBxu5PMFU5PTmyuxRy0vgj2GLsRt0IoEw,9565
-atomicshop/process_poller/simple_process_pool.py,sha256=E0w66imLQQ0phHuTQfTaApOTurX0duE9vw1trjUY7rI,9894
+atomicshop/process_poller/simple_process_pool.py,sha256=ap9nCywHZ-eta7EHe0mTYS45-zYvMjgvfESXAuG0Wi4,12578
 atomicshop/process_poller/tracer_base.py,sha256=IOiHcnmF-MccOSCErixN5mve9RifZ9cPnGVHCIRchrs,1091
 atomicshop/process_poller/pollers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/process_poller/pollers/psutil_pywin32wmi_dll.py,sha256=XRRfOIy62iOYU8IKRcyECWiL0rqQ35DeYbPsv_SHDVM,4510
@@ -329,8 +329,8 @@ atomicshop/wrappers/socketw/statistics_csv.py,sha256=fgMzDXI0cybwUEqAxprRmY3lqbh
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_installed_software.py,sha256=Qzmyktvob1qp6Tjk2DjLfAqr_yXV0sgWzdMW_9kwNjY,2345
 atomicshop/wrappers/winregw/winreg_network.py,sha256=AENV88H1qDidrcpyM9OwEZxX5svfi-Jb4N6FkS1xtqA,8851
-atomicshop-2.19.13.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.19.13.dist-info/METADATA,sha256=w6lD6Ue1Ffz4syR_hzVwv9PF65O42HFgdkvH3adb7PU,10631
-atomicshop-2.19.13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.19.13.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.19.13.dist-info/RECORD,,
+atomicshop-2.19.14.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.19.14.dist-info/METADATA,sha256=1ZQp-Wt5osHkFGnEavFkPEC41-jmfqJsSsktj0T7aBk,10631
+atomicshop-2.19.14.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.19.14.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.19.14.dist-info/RECORD,,