pmonitor 1.3.6__tar.gz → 1.3.7__tar.gz

{pmonitor-1.3.6 → pmonitor-1.3.7}/PKG-INFO

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

pmonitor-1.3.7/monitor/mac_gpu.py

@@ -0,0 +1,53 @@
+import objc
+import Foundation
+
+IOKit = Foundation.NSBundle.bundleWithIdentifier_("com.apple.framework.IOKit")
+
+functions = [
+    ("IOServiceGetMatchingService", b"II@"),
+    ("IOServiceMatching", b"@*"),
+    ("IORegistryEntryCreateCFProperties", b"IIo^@@I"),
+]
+
+objc.loadBundleFunctions(IOKit, globals(), functions)
+
+
+def accelerator_performance_statistics() -> dict[str, int]:
+    accelerator_info = IOServiceGetMatchingService(
+        0, IOServiceMatching(b"IOAccelerator")
+    )
+    if accelerator_info == 0:
+        raise RuntimeError("IOAccelerator not found")
+    # else...
+    err, props = IORegistryEntryCreateCFProperties(accelerator_info, None, None, 0)
+    if err != 0:
+        raise RuntimeError("IOAccelerator properties not found")
+    # else...
+    return dict(props)
+
+
+def get_gpu_memory():
+    try:
+        gpu_info = accelerator_performance_statistics()
+        use_gpu_memory = 0
+        device_usage = 0
+        print(f"gpu_info: {gpu_info['PerformanceStatistics']}")
+        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)
+                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
+
+
+print(get_gpu_memory())

{pmonitor-1.3.6 → pmonitor-1.3.7}/monitor/monitor_pids.py

@@ -10,6 +10,7 @@ import os
 import stat
 import subprocess
 import re
+import mac_gpu
 
 
 class PidsPerf:
@@ -21,14 +22,6 @@ class PidsPerf:
 
     def get_mac_perf(self):
         current_pid = self.processUtil.find_main_process_pid(self.process_name)
-        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(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:
             minor_cpu_sum = 0
             minor_real_mem_sum = 0
@@ -42,19 +35,7 @@ class PidsPerf:
             current_pids.add(current_pid)  # 将主进程及子进程添加到list中
             pids_process = self.processUtil.get_pids_process(current_pids)  # 获取所有进程
 
-            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)
-                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)
-
+            gpu_memory_usage_0, gpu_memory_percent_0 = mac_gpu.get_gpu_memory()
             for process in pids_process:
                 try:
                     cpu_percent = process.cpu_percent()

{pmonitor-1.3.6 → pmonitor-1.3.7}/pmonitor.egg-info/PKG-INFO

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

{pmonitor-1.3.6 → pmonitor-1.3.7}/pmonitor.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ setup.py
 monitor/WinPidUtil.py
 monitor/__init__.py
 monitor/get_process_name.py
+monitor/mac_gpu.py
 monitor/monitor_mac.py
 monitor/monitor_pids.py
 monitor/monitor_win.py

{pmonitor-1.3.6 → pmonitor-1.3.7}/setup.py

@@ -5,7 +5,7 @@ with open('README.md', 'r') as f:
     long_description = f.read()
 
 setup(name='pmonitor',
-      version='1.3.6',
+      version='1.3.7',
       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/*', 'exec/*'],
+          'monitor': ['DLL/*'],
       },
       platforms=['all'],
       classifiers=[],