pmonitor 1.2.0__tar.gz → 1.2.2__tar.gz

{pmonitor-1.2.0 → pmonitor-1.2.2}/PKG-INFO

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

{pmonitor-1.2.0 → pmonitor-1.2.2}/monitor/monitor_pids.py

@@ -21,12 +21,12 @@ class PidsPerf:
 
     def get_mac_perf(self):
         current_pid = self.processUtil.find_main_process_pid(self.process_name)
-        dll_path = os.path.join(os.path.dirname(__file__), 'exec', 'GpuMonitor')
-        if os.path.exists(dll_path):
-            if not os.access(dll_path, os.X_OK):
+        gpu_tool = os.path.join(os.path.dirname(__file__), 'exec', 'GpuMonitor')
+        if os.path.exists(gpu_tool):
+            if not os.access(gpu_tool, os.X_OK):
                 try:
-                    current_permissions = os.stat(dll_path).st_mode
-                    os.chmod(dll_path, current_permissions | stat.S_IEXEC | stat.S_IXGRP | stat.S_IXOTH)
+                    current_permissions = os.stat(gpu_tool).st_mode
+                    os.chmod(gpu_tool, current_permissions | stat.S_IEXEC | stat.S_IXGRP | stat.S_IXOTH)
                 except Exception as e:
                     raise e
         while True:
@@ -42,7 +42,7 @@ class PidsPerf:
             current_pids.add(current_pid)  # 将主进程及子进程添加到list中
             pids_process = self.processUtil.get_pids_process(current_pids)  # 获取所有进程
 
-            result = subprocess.run([self.gpu_tool], stdout=subprocess.PIPE, text=True)
+            result = subprocess.run([gpu_tool], stdout=subprocess.PIPE, text=True)
             for line in result.stdout.split('\n'):
                 pattern = r"GPU Name:(.*?),Device Percent:(.*?),Dedicated Usage:(\d+)"
                 matches = re.findall(pattern, line)
@@ -128,9 +128,9 @@ class PidsPerf:
         process_io_counters_pre = {pid: pidWinPerf.get_io_counters(pid) for pid in child_pids}
 
         dll_path = os.path.join(os.path.dirname(__file__), 'DLL', 'GpuMonitorLib.dll')
-        gpu_monitor_dll = CDLL(dll_path)
-        gpu_monitor_dll.GetGpuUtilizationByPid.argtypes = [c_int]
-        gpu_monitor_dll.GetGpuUtilizationByPid.restype = c_char_p
+        gpu_monitor_dll = ctypes.CDLL(dll_path)
+        gpu_monitor_dll.GetGPUDataForProcess.argtypes = [ctypes.c_ulong]
+        gpu_monitor_dll.GetGPUDataForProcess.restype = ctypes.c_char_p
         while True:
             minor_cpu_sum = 0
             minor_workSet_mem_sum = 0
@@ -143,6 +143,10 @@ class PidsPerf:
             minor_gpu_system_sum = 0  # (共享内存)
             minor_gpu_committed_sum = 0  # (总使用内存)
             minor_gpu_percent_sum = 0  # (GPU内存占比)
+            main_gpu_dedicated_sum = 0  # （专用内存）
+            main_gpu_system_sum = 0  # (共享内存)
+            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中
@@ -186,7 +190,7 @@ class PidsPerf:
                     pid].ReadTransferCount) / self.interval
                 write_bytes_sec = (io_counters.WriteTransferCount - process_io_counters_pre[
                     pid].WriteTransferCount) / self.interval
-                gpu_info_json = gpu_monitor_dll.GetGpuUtilizationByPid(pid).decode()
+                gpu_info_json = gpu_monitor_dll.GetGPUDataForProcess(pid).decode()
                 gpu_info = json.loads(gpu_info_json)
                 if process_cpu_time_post:
                     # 计算CPU使用率
@@ -197,28 +201,30 @@ class PidsPerf:
                     workSet_mem = round(memory_info.WorkingSetSize / 1024 / 1024, 2)  # MB
                     private_mem = round(memory_info.PrivateUsage / 1024 / 1024, 2)  # MB
                     if pid == p_pid:
-                        if gpu_info['GPUUtilizationPercent'] < 0:
-                            gpu_Dedicated = 0
-                            gpu_System = 0
-                            gpu_Committed = 0
-                            gpu_Usage = 0
-                            # print('主进程pid：', gpu_info['ProcessID'], 'Dedicated:', 0,
-                            #       'System:', 0,
-                            #       'Committed:', 0, 'GPU Usage:',
-                            #       0)
-                        else:
-                            gpu_Dedicated = gpu_info['GPUProcessMemoryLocalUsage']
-                            gpu_System = gpu_info['GPUProcessMemorySharedUsage']
-                            gpu_Committed = gpu_info['GPUProcessMemoryTotalCommitted']
-                            gpu_Usage = gpu_info['GPUUtilizationPercent']
-                            # print('主进程pid：', gpu_info['ProcessID'], 'Dedicated:',
-                            #       gpu_info['GPUProcessMemoryLocalUsage'],
-                            #       'System:', gpu_info['GPUProcessMemorySharedUsage'],
-                            #       'Committed:', gpu_info['GPUProcessMemoryTotalCommitted'], 'GPU Usage:',
-                            #       gpu_info['GPUUtilizationPercent'])
+
+                        for item in gpu_info:
+                            if item['ProcessID'] == p_pid:
+                                if item['GPUUtilizationPercent'] < 0:
+                                    print('主进程pid：', item['ProcessID'], 'Dedicated:', 0,
+                                          'System:', 0,
+                                          'Committed:', 0, 'GPU Usage:',
+                                          0)
+                                    main_gpu_dedicated_sum += 0
+                                    main_gpu_system_sum += 0
+                                    main_gpu_committed_sum += 0
+                                else:
+                                    print('主进程pid：', item['ProcessID'], 'Dedicated:',
+                                          item['GPUProcessMemoryLocalUsage'],
+                                          'System:', item['GPUProcessMemorySharedUsage'],
+                                          'Committed:', item['GPUProcessMemoryTotalCommitted'], 'GPU Usage:',
+                                          item['GPUUtilizationPercent'])
+                                    main_gpu_dedicated_sum += item['GPUProcessMemoryDedicatedUsage']  # （专用内存）
+                                    main_gpu_system_sum += item['GPUProcessMemorySharedUsage']  # (共享内存)
+                                    main_gpu_committed_sum += item['GPUProcessMemoryTotalCommitted']  # (总使用内存)
+                                    main_gpu_percent_sum += item['GPUUtilizationPercent']  # (GPU内存占比)
                         main_data = {'cpu': cpu_usage, 'private': private_mem, "workset": workSet_mem,
-                                     'gpu_Dedicated': round(gpu_Dedicated, 2), 'gpu_System': round(gpu_System, 2),
-                                     'gpu_Committed': round(gpu_Committed, 2), 'gpu_Usage': round(gpu_Usage, 2)}
+                                     'gpu_Dedicated': round(main_gpu_dedicated_sum, 2), 'gpu_System': round(main_gpu_system_sum, 2),
+                                     'gpu_Committed': round(main_gpu_committed_sum, 2), 'gpu_Usage': round(main_gpu_percent_sum, 2)}
 
                         # print(
                         #     f'主进程数据：cpu：{cpu_usage}，workSet：{workSet_mem}，private：{private_mem}，mem_percent：{mem_percent}，thread_count：{thread_count}')
@@ -228,25 +234,27 @@ class PidsPerf:
                         minor_private_mem_sum += private_mem  # 子进程private内存
                         minor_mem_percent_sum += mem_percent  # 子进程内存使用率
                         minor_thread_count_sum += thread_count  # 子进程线程总数
-                        if gpu_info['GPUUtilizationPercent'] < 0:
-                            # print('子进程pid：', gpu_info['ProcessID'], 'Dedicated:', 0,
-                            #       'System:', 0,
-                            #       'Committed:', 0, 'GPU Usage:',
-                            #       0)
-                            minor_gpu_dedicated_sum += 0
-                            minor_gpu_system_sum += 0
-                            minor_gpu_committed_sum += 0
-                            minor_gpu_percent_sum += 0
-                        else:
-                            # print('子进程pid：', gpu_info['ProcessID'], 'Dedicated:',
-                            #       gpu_info['GPUProcessMemoryLocalUsage'],
-                            #       'System:', gpu_info['GPUProcessMemorySharedUsage'],
-                            #       'Committed:', gpu_info['GPUProcessMemoryTotalCommitted'], 'GPU Usage:',
-                            #       gpu_info['GPUUtilizationPercent'])
-                            minor_gpu_dedicated_sum += gpu_info['GPUProcessMemoryLocalUsage']
-                            minor_gpu_system_sum += gpu_info['GPUProcessMemorySharedUsage']
-                            minor_gpu_committed_sum += gpu_info['GPUProcessMemoryTotalCommitted']
-                            minor_gpu_percent_sum += gpu_info['GPUUtilizationPercent']
+                        for item in gpu_info:
+                            if item['ProcessID'] != p_pid:
+                                if item['GPUUtilizationPercent'] < 0:
+                                    print('子进程pid：', item['ProcessID'], 'Dedicated:', 0,
+                                          'System:', 0,
+                                          'Committed:', 0, 'GPU Usage:',
+                                          0)
+                                    minor_gpu_dedicated_sum += 0
+                                    minor_gpu_system_sum += 0
+                                    minor_gpu_committed_sum += 0
+                                    minor_gpu_percent_sum += 0
+                                else:
+                                    print('子进程pid：', item['ProcessID'], 'Dedicated:',
+                                          item['GPUProcessMemoryLocalUsage'],
+                                          'System:', item['GPUProcessMemorySharedUsage'],
+                                          'Committed:', item['GPUProcessMemoryTotalCommitted'], 'GPU Usage:',
+                                          item['GPUUtilizationPercent'])
+                                    minor_gpu_dedicated_sum += item['GPUProcessMemoryLocalUsage']
+                                    minor_gpu_system_sum += item['GPUProcessMemorySharedUsage']
+                                    minor_gpu_committed_sum += item['GPUProcessMemoryTotalCommitted']
+                                    minor_gpu_percent_sum += item['GPUUtilizationPercent']
                     minor_io_read_sum += read_bytes_sec  # 所有进程IO读取速率总数
                     minor_io_write_sum += write_bytes_sec  # 所有进程IO写入速率总数
 

{pmonitor-1.2.0 → pmonitor-1.2.2}/pmonitor.egg-info/PKG-INFO

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

{pmonitor-1.2.0 → pmonitor-1.2.2}/setup.py

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