pmonitor 1.1.8__tar.gz → 1.2.0__tar.gz

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

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

{pmonitor-1.1.8 → pmonitor-1.2.0}/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.8 → pmonitor-1.2.0}/pmonitor.egg-info/PKG-INFO

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

{pmonitor-1.1.8 → pmonitor-1.2.0}/pmonitor.egg-info/SOURCES.txt

@@ -24,6 +24,8 @@ monitor/DLL/sechost.dll
 monitor/DLL/ucrtbased.dll
 monitor/DLL/vcruntime140.dll
 monitor/DLL/vcruntime140_1.dll
+monitor/exec/GpuMonitor
+monitor/exec/__init__.py
 pmonitor.egg-info/PKG-INFO
 pmonitor.egg-info/SOURCES.txt
 pmonitor.egg-info/dependency_links.txt

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

@@ -5,7 +5,7 @@ with open('README.md', 'r') as f:
     long_description = f.read()
 
 setup(name='pmonitor',
-      version='1.1.8',
+      version='1.2.0',
       description='pc monitor',
       long_description=long_description,
       author='cfr',
@@ -14,7 +14,7 @@ setup(name='pmonitor',
       license='MIT',
       packages=find_packages(),
       package_data={
-          'monitor': ['DLL/*'],
+          'monitor': ['DLL/*', 'exec/*'],
       },
       platforms=['all'],
       classifiers=[],