pmonitor 1.1.9__py3-none-any.whl → 1.2.0__py3-none-any.whl

monitor/monitor_pids.py

@@ -7,6 +7,9 @@ import asyncio
 import platform
 import ctypes
 import os
+import stat
+import subprocess
+import re
 
 
 class PidsPerf:
@@ -18,14 +21,40 @@ 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):
+                try:
+                    current_permissions = os.stat(dll_path).st_mode
+                    os.chmod(dll_path, current_permissions | stat.S_IEXEC | stat.S_IXGRP | stat.S_IXOTH)
+                except Exception as e:
+                    raise e
         while True:
             minor_cpu_sum = 0
             minor_real_mem_sum = 0
             minor_mem_percent_sum = 0
             minor_thread_count_sum = 0
+            gpu_memory_usage_0 = 0
+            gpu_memory_percent_0 = 0
+            gpu_memory_usage_1 = 0
+            gpu_memory_percent_1 = 0
             current_pids = self.processUtil.get_children_pids(current_pid)  # 获取所有子进程
             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)
+            for line in result.stdout.split('\n'):
+                pattern = r"GPU Name:(.*?),Device Percent:(.*?),Dedicated Usage:(\d+)"
+                matches = re.findall(pattern, line)
+                for match in matches:
+                    gpu_name, device_percent, dedicated_usage = match
+                    if 'driver' in gpu_name or 'Apple' in gpu_name:
+                        gpu_memory_usage_0 = round(float(dedicated_usage) / 1024 / 1024, 2)
+                        gpu_memory_percent_0 = round(float(device_percent), 2)
+                    else:
+                        gpu_memory_usage_1 = round(float(dedicated_usage) / 1024 / 1024, 2)
+                        gpu_memory_percent_1 = round(float(device_percent), 2)
+
             for process in pids_process:
                 try:
                     cpu_percent = process.cpu_percent()
@@ -66,7 +95,9 @@ class PidsPerf:
             io_read_bytes = io_read_bytes_end - io_read_bytes_start  # io read/byte
             io_write_bytes = io_write_bytes_end - io_write_bytes_start  # io write/byte
             disk_data = {'io read': io_read_bytes, 'io write': io_write_bytes}
-            data = {'main': main_data, 'other': minor_data, 'disk': disk_data}
+            gpu_data = {'gpu 0 memory usage': gpu_memory_usage_0, 'gpu 0 device Utilization': gpu_memory_percent_0,
+                        'gpu 1 memory usage': gpu_memory_usage_1, 'gpu 1 device Utilization': gpu_memory_percent_1}
+            data = {'main': main_data, 'other': minor_data, 'disk': disk_data, "gpu": gpu_data}
             json_data = json.dumps(data)
             print(json_data)
             sys.stdout.flush()

{pmonitor-1.1.9.dist-info → pmonitor-1.2.0.dist-info}/METADATA

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

{pmonitor-1.1.9.dist-info → pmonitor-1.2.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ monitor/WinPidUtil.py,sha256=NGkit8UoDAW7dz1vrwsb50QFroO-0hZ44fd_fykJ3WM,8523
 monitor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 monitor/get_process_name.py,sha256=eUElEd6chW-gw416o3VZg3UZPi8ZCG9rcw8ayrpVcz4,3620
 monitor/monitor_mac.py,sha256=OoptTTXTZQupzBwgGOfKNjyYAKBxDy-wI3l6T7XVE8s,4651
-monitor/monitor_pids.py,sha256=lXeh4gQzAd6fEUk0ETGT4vEr4L1sx9TEHK-KN77uvLo,13951
+monitor/monitor_pids.py,sha256=AYeIsaCp1LLKTI-Z4psP-o1Ol8xatY0K7wuvRFOsATI,15636
 monitor/monitor_win.py,sha256=xs5nzqqEPoDmJTegh3lQhVjjpPcOWnruWKK65ttqnTo,6161
 monitor/run_monitor.py,sha256=s9JSFu5olh3VhrEqj_CZ5l25nvBtd2cN0NhU9R2KOKM,1581
 monitor/sys_info.py,sha256=aNultuRoQuRYPkYo397xAXVDXP07Qx5JOHtYzNmEvuc,3208
@@ -22,8 +22,10 @@ monitor/DLL/sechost.dll,sha256=1mXCrgNDRBiZ2XZk7eTpDm4oPG-x9BW4uYUVkrfvBkk,69986
 monitor/DLL/ucrtbased.dll,sha256=vtmKFPEHyr2OXkrUOu3Qs1dlbKG1dxZ8ItKCkTTU5S4,2238056
 monitor/DLL/vcruntime140.dll,sha256=AsaqDm5iRBGp8ZsDYKeGWrFZCOJgJFEOXDipwINiw1o,119888
 monitor/DLL/vcruntime140_1.dll,sha256=fdmqAuJxxoym1fGNZR0joV1yWXFa9DMmV4993ifzdjc,49640
-pmonitor-1.1.9.dist-info/METADATA,sha256=mDPrQIcbWW059dbqobf5EsU1kzNDfyU1IYVpbxIQpRU,215
-pmonitor-1.1.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-pmonitor-1.1.9.dist-info/entry_points.txt,sha256=vmlLEANgf2fZar9BeXYiKdF6GMJbVXip-SIZx5yPXDo,55
-pmonitor-1.1.9.dist-info/top_level.txt,sha256=tGkQDkVeyKgP5Rr7acpp0df83NBAnI8up0sGwRxuuQ4,8
-pmonitor-1.1.9.dist-info/RECORD,,
+monitor/exec/GpuMonitor,sha256=vlkPrbj2ArTAO_OTxrk68l3UDMigUM-eG7y76Tmmd0k,111568
+monitor/exec/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pmonitor-1.2.0.dist-info/METADATA,sha256=ade--dYTc2kF8Vrjhh3PKhEPQaR4GjRx-V9WZco1kBs,215
+pmonitor-1.2.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+pmonitor-1.2.0.dist-info/entry_points.txt,sha256=vmlLEANgf2fZar9BeXYiKdF6GMJbVXip-SIZx5yPXDo,55
+pmonitor-1.2.0.dist-info/top_level.txt,sha256=tGkQDkVeyKgP5Rr7acpp0df83NBAnI8up0sGwRxuuQ4,8
+pmonitor-1.2.0.dist-info/RECORD,,