pmonitor 1.4.2__tar.gz → 1.4.3__tar.gz

{pmonitor-1.4.2 → pmonitor-1.4.3}/PKG-INFO

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

{pmonitor-1.4.2 → pmonitor-1.4.3}/monitor/mac_gpu.py

@@ -36,21 +36,26 @@ if platform.system() != 'Windows':
         try:
             gpu_info = accelerator_performance_statistics()
             use_gpu_memory = 0
-            device_usage = 0
-            # print(f"gpu_info: {gpu_info['PerformanceStatistics']}")
+            total_gpu_memory = 0
+            free_gpu_memory = 0
             for key, value in gpu_info["PerformanceStatistics"].items():
-                if key == "In use system memory":
-                    use_gpu_memory = int(value) / 1024 / 1024
-                    # print(f"{key}: {value}")
-                elif key == "inUseSysMemoryBytes":
-                    use_gpu_memory = int(value) / 1024 / 1024
-                    # print(f"{key}: {value}")
-                elif key == "Device Utilization %":
-                    device_usage = int(value)
+                if key == "In use system memory" or key == "gartUsedBytes":
+                    use_gpu_memory = int(value)
+                elif key == "gartSizeBytes":
+                    total_gpu_memory = int(value)
+                elif key == "gartFreeBytes":
+                    free_gpu_memory = int(value)
+                elif key == "Alloc system memory":
+                    total_gpu_memory = int(value)
                     # print('device usage', device_usage)
             # use_gpu_memory = gpu_info["PerformanceStatistics"]["In use system memory"]
             # total_gpu_memory = gpu_info["PerformanceStatistics"]["Alloc system memory"]
         except Exception as e:
             print(f"Mac端在arm64平台通过接口获取Gpu Memory失败：{e}")
             use_gpu_memory = 0
-        return use_gpu_memory, device_usage
+            total_gpu_memory = 0
+            free_gpu_memory = 0
+        if free_gpu_memory == 0:
+            free_gpu_memory = total_gpu_memory - use_gpu_memory
+        return round(use_gpu_memory / 1024 / 1024, 2), round(total_gpu_memory / 1024 / 1024, 2), round(
+            free_gpu_memory / 1024 / 1024, 2)

{pmonitor-1.4.2 → pmonitor-1.4.3}/monitor/monitor_pids.py

@@ -7,9 +7,7 @@ import asyncio
 import platform
 import ctypes
 import os
-import stat
-import subprocess
-import re
+
 if platform.system() != 'Windows':
     from monitor.mac_gpu import get_gpu_memory
 
@@ -28,15 +26,18 @@ class PidsPerf:
             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
+            gpu_memory_usage = 0
+            gpu_memory_total = 0
+            gpu_memory_free = 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)  # 获取所有进程
 
-            gpu_memory_usage_0, gpu_memory_percent_0 = get_gpu_memory()
+            mem_info = psutil.virtual_memory()
+            mem_total = round(mem_info.total / 1024 / 1024, 2)  # 总虚拟内存
+            mem_available = round(mem_info.available / 1024 / 1024, 2)  # 剩余虚拟内存
+
+            gpu_memory_usage, gpu_memory_total, gpu_memory_free = get_gpu_memory()
             for process in pids_process:
                 try:
                     cpu_percent = process.cpu_percent()
@@ -77,9 +78,10 @@ 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}
-            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}
+            gpu_data = {'gpu memory usage': gpu_memory_usage, 'gpu memory total': gpu_memory_total,
+                        'gpu memory free': gpu_memory_free}
+            data = {'main': main_data, 'other': minor_data, 'disk': disk_data, "gpu": gpu_data,
+                    "memory_total": mem_total, "memory_available": mem_available}
             json_data = json.dumps(data)
             print(json_data)
             sys.stdout.flush()
@@ -101,6 +103,7 @@ class PidsPerf:
     def get_win_perf(self):
         from monitor.WinPidUtil import PidWinPerformance, FILETIME
         from ctypes import CDLL, c_int, c_char_p, byref
+        from PyLibreHardwareMonitor.computer import Computer
         pidWinPerf = PidWinPerformance()
         system_time_pre = pidWinPerf.filetime_to_100nano_seconds(FILETIME())
         p_pid = self.processUtil.find_main_process_pid(self.process_name)
@@ -114,6 +117,9 @@ class PidsPerf:
         gpu_monitor_dll = ctypes.CDLL(dll_path)
         gpu_monitor_dll.GetGPUDataForProcess.argtypes = [ctypes.c_ulong]
         gpu_monitor_dll.GetGPUDataForProcess.restype = ctypes.c_char_p
+        # 获取GPU物理内存
+        computer = Computer()
+        gpu_key = list(computer.gpu.keys())[0]
         while True:
             minor_cpu_sum = 0
             minor_workSet_mem_sum = 0
@@ -145,6 +151,7 @@ class PidsPerf:
             child_pids.add(p_pid)  # app内所有pid
             child_pids = {pid for pid in child_pids if psutil.pid_exists(pid)}  # 移除不存在的进程
 
+            small_data = computer.gpu[gpu_key]['SmallData']  # 获取GPU物理内存信息
             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}
@@ -156,6 +163,8 @@ class PidsPerf:
 
             # print('----------------------------------------------------------')
             # print('pid', child_pids)
+            memory_total = round(psutil.virtual_memory().total / 1024 / 1024, 2)
+            memory_available = round(psutil.virtual_memory().available / 1024 / 1024, 2)
 
             for pid in child_pids:
                 try:
@@ -241,8 +250,14 @@ class PidsPerf:
                           'gpu_System': round(minor_gpu_system_sum, 2),
                           'gpu_Committed': round(minor_gpu_committed_sum, 2),
                           'gpu_Usage': round(minor_gpu_percent_sum, 2)}
+            gpu_data = {'gpu memory usage': small_data['GPU Memory Used'],
+                        'gpu memory total': small_data['GPU Memory Total'],
+                        'gpu memory free': small_data['GPU Memory Free']}
             try:
-                data = {'main': main_data, 'other': other_data, 'disk': disk_data}
+                data = {'main': main_data, 'other': other_data, 'disk': disk_data,
+                        'gpu': gpu_data,
+                        'memory_total': memory_total,
+                        'memory_available': memory_available}
                 json_data = json.dumps(data)
                 print(json_data)
             except UnboundLocalError:

{pmonitor-1.4.2 → pmonitor-1.4.3}/monitor/run_monitor.py

@@ -27,7 +27,7 @@ def main():
     if args.time:
         interval = args.time
 
-    # process = 'pixcake.exe'
+    # process = 'ColorByte.exe'
     # interval = 1
     process_name = ProcessName()
     if process is not None:

{pmonitor-1.4.2 → pmonitor-1.4.3}/pmonitor.egg-info/PKG-INFO

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

{pmonitor-1.4.2 → pmonitor-1.4.3}/setup.py

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