pmonitor 1.3.3__tar.gz → 1.3.5__tar.gz

{pmonitor-1.3.3 → pmonitor-1.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: pmonitor
-Version: 1.3.3
+Version: 1.3.5
 Summary: pc monitor
 Home-page: UNKNOWN
 Author: cfr

{pmonitor-1.3.3 → pmonitor-1.3.5}/monitor/WinPidUtil.py

@@ -1,6 +1,8 @@
 import ctypes
 from ctypes import wintypes, byref, windll
 
+import psutil
+
 # 定义以及初始化 API 函数和类型
 GetSystemTimes = ctypes.windll.kernel32.GetSystemTimes
 GetProcessTimes = ctypes.windll.kernel32.GetProcessTimes
@@ -91,6 +93,8 @@ class PidWinPerformance:
         return self.filetime_to_100nano_seconds(kernel_time) + self.filetime_to_100nano_seconds(user_time)
 
     def get_process_memory(self, pid):
+        if not psutil.pid_exists(pid):
+            return 0
         OpenProcess = ctypes.windll.kernel32.OpenProcess
         OpenProcess.restype = wintypes.HANDLE
         OpenProcess.argtypes = [wintypes.DWORD, ctypes.wintypes.BOOL, wintypes.DWORD]
@@ -98,16 +102,18 @@ class PidWinPerformance:
         GetProcessMemoryInfo.argtypes = [wintypes.HANDLE, ctypes.POINTER(PROCESS_MEMORY_COUNTERS_EX), wintypes.DWORD]
         GetProcessMemoryInfo.restype = ctypes.wintypes.BOOL
         process = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, False, pid)
-        if not process:
-            raise ctypes.WinError()
-        counters = PROCESS_MEMORY_COUNTERS_EX()
-        counters.cb = ctypes.sizeof(PROCESS_MEMORY_COUNTERS_EX)
-
-        if not GetProcessMemoryInfo(process, ctypes.byref(counters), counters.cb):
+        if psutil.Process(pid).is_running() and psutil.Process(pid).status() != psutil.STATUS_ZOMBIE:
+            if not process:
+                raise ctypes.WinError()
+            counters = PROCESS_MEMORY_COUNTERS_EX()
+            counters.cb = ctypes.sizeof(PROCESS_MEMORY_COUNTERS_EX)
+
+            if not GetProcessMemoryInfo(process, ctypes.byref(counters), counters.cb):
+                CloseHandle(process)
+                raise ctypes.WinError()
             CloseHandle(process)
-            raise ctypes.WinError()
-        CloseHandle(process)
-        return counters
+            return counters
+        return 0
 
     def get_io_counters(self, pid):
         counters = IO_COUNTERS()

{pmonitor-1.3.3 → pmonitor-1.3.5}/monitor/get_process_name.py

@@ -91,8 +91,16 @@ class ProcessName:
         :return:
         '''
         children = set()
-        for child in psutil.Process(pid).children(recursive=True):
-            children.add(child.pid)
+        try:
+            parent_process = psutil.Process(pid)
+            for child in parent_process.children(recursive=True):
+                children.add(child.pid)
+        except psutil.NoSuchProcess:
+            # print(f"主进程 {pid} 不存在或已终止.")
+            pass
+        except Exception as e:
+            # print(f"获取子进程PID时发生错误: {e}")
+            pass
         return children
 
     def find_main_process_pid(self, process_name) -> None:

{pmonitor-1.3.3 → pmonitor-1.3.5}/monitor/monitor_pids.py

@@ -124,6 +124,7 @@ class PidsPerf:
         p_pid = self.processUtil.find_main_process_pid(self.process_name)
         child_pids = self.processUtil.get_children_pids(p_pid)
         child_pids.add(p_pid)  # app内所有pid
+
         process_cpu_times_pre = {pid: pidWinPerf.get_process_cpu_time(pid) for pid in child_pids}
         process_io_counters_pre = {pid: pidWinPerf.get_io_counters(pid) for pid in child_pids}
 
@@ -148,9 +149,6 @@ class PidsPerf:
             main_gpu_committed_sum = 0  # (总使用内存)
             main_gpu_percent_sum = 0  # (GPU内存占比)
 
-            current_pids = self.processUtil.get_children_pids(p_pid)  # 获取所有子进程
-            current_pids.add(p_pid)  # 将主进程及子进程添加到list中
-
             start_time = time.time()  # 记录循环开始的时间
             system_idle_time = FILETIME()
             system_kernel_time = FILETIME()
@@ -160,18 +158,23 @@ class PidsPerf:
                                                   byref(system_user_time))
             system_time_post = pidWinPerf.filetime_to_100nano_seconds(
                 system_kernel_time) + pidWinPerf.filetime_to_100nano_seconds(system_user_time)
-
+            p_pid = self.processUtil.find_main_process_pid(self.process_name)
             child_pids = self.processUtil.get_children_pids(p_pid)
             child_pids.add(p_pid)  # app内所有pid
+            child_pids = {pid for pid in child_pids if psutil.pid_exists(pid)}  # 移除不存在的进程
 
-            new_pids_cpu_time_pre = {pid: pidWinPerf.get_process_cpu_time(pid) for pid in child_pids if
-                                     pid not in process_cpu_times_pre}
-            process_cpu_times_pre.update(new_pids_cpu_time_pre)
-            new_process_io_counters_pre = {pid: pidWinPerf.get_io_counters(pid) for pid in child_pids}
-            process_io_counters_pre.update(new_process_io_counters_pre)
+            try:
+                new_pids_cpu_time_pre = {pid: pidWinPerf.get_process_cpu_time(pid) for pid in child_pids if
+                                         pid not in process_cpu_times_pre}
+                process_cpu_times_pre.update(new_pids_cpu_time_pre)
+                new_process_io_counters_pre = {pid: pidWinPerf.get_io_counters(pid) for pid in child_pids}
+                process_io_counters_pre.update(new_process_io_counters_pre)
+            except psutil.Error as ex:
+                print(f"Error updating counters: {ex}")
 
             # print('----------------------------------------------------------')
             # print('pid', child_pids)
+
             for pid in child_pids:
                 try:
                     process = psutil.Process(pid)
@@ -182,10 +185,11 @@ class PidsPerf:
                     # print('pid is not found')
                     mem_percent = 0
                     thread_count = 0
-
                 process_cpu_time_post = pidWinPerf.get_process_cpu_time(pid)
                 memory_info = pidWinPerf.get_process_memory(pid)
                 io_counters = pidWinPerf.get_io_counters(pid)
+                if io_counters is None or pid not in process_io_counters_pre:
+                    continue
                 read_bytes_sec = (io_counters.ReadTransferCount - process_io_counters_pre[
                     pid].ReadTransferCount) / self.interval
                 write_bytes_sec = (io_counters.WriteTransferCount - process_io_counters_pre[

{pmonitor-1.3.3 → pmonitor-1.3.5}/pmonitor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: pmonitor
-Version: 1.3.3
+Version: 1.3.5
 Summary: pc monitor
 Home-page: UNKNOWN
 Author: cfr

{pmonitor-1.3.3 → pmonitor-1.3.5}/setup.py

@@ -5,7 +5,7 @@ with open('README.md', 'r') as f:
     long_description = f.read()
 
 setup(name='pmonitor',
-      version='1.3.3',
+      version='1.3.5',
       description='pc monitor',
       long_description=long_description,
       author='cfr',