pmonitor 1.4.5__tar.gz → 1.4.7__tar.gz

{pmonitor-1.4.5 → pmonitor-1.4.7}/PKG-INFO

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

pmonitor-1.4.7/monitor/monitor_mac_vmmap.py

@@ -0,0 +1,38 @@
+import re
+import asyncio
+
+
+class VmMapMemory:
+    async def get_process_memory(self, pid):
+        cmd = ["vmmap", "--summary", str(pid)]
+        proc = None
+        try:
+            # 创建子进程并设置超时
+            proc = await asyncio.create_subprocess_exec(
+                *cmd,
+                stdout=asyncio.subprocess.PIPE,
+                stderr=asyncio.subprocess.DEVNULL
+            )
+
+            try:
+                stdout, _ = await asyncio.wait_for(proc.communicate(), timeout=5)
+            except asyncio.TimeoutError:
+                # 超时后确保子进程被终止
+                proc.kill()
+                await proc.wait()
+                raise
+
+            if proc.returncode == 0:
+                match = re.search(r'Physical footprint:\s+([\d.]+)([GMK]?)', stdout.decode())
+                if match:
+                    val, unit = float(match.group(1)), match.group(2)
+                    return val * {
+                        'G': 1024, 'M': 1, 'K': 1 / 1024, '': 1 / (1024 * 1024)
+                    }.get(unit, 1)
+        except Exception as e:
+            print(e)
+        finally:
+            if proc and proc.returncode is None:
+                proc.kill()
+                await proc.wait()
+        return 0.0

{pmonitor-1.4.5 → pmonitor-1.4.7}/monitor/monitor_pids.py

@@ -9,6 +9,8 @@ import ctypes
 import os
 from PyLibreHardwareMonitor.computer import Computer
 
+from monitor.monitor_mac_vmmap import VmMapMemory
+
 if platform.system() != 'Windows':
     from monitor.mac_gpu import get_gpu_memory
 
@@ -20,9 +22,11 @@ class PidsPerf:
         self.interval = interval
         self.processUtil = ProcessName()
 
-    def get_mac_perf(self):
+    async def get_mac_perf(self):
         current_pid = self.processUtil.find_main_process_pid(self.process_name)
+        vm = VmMapMemory()
         while True:
+            start_time = time.time()  # 记录循环开始时间
             minor_cpu_sum = 0
             minor_real_mem_sum = 0
             minor_mem_percent_sum = 0
@@ -39,12 +43,14 @@ class PidsPerf:
             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:
+            # 使用 asyncio.gather 并发获取内存数据
+            memory_tasks = [vm.get_process_memory(process.pid) for process in pids_process]
+            memory_results = await asyncio.gather(*memory_tasks, return_exceptions=True)
+            for idx, process in enumerate(pids_process):
                 try:
                     cpu_percent = process.cpu_percent()
-                    process_memory = process.memory_info()
                     mem_percent = u'%.2f' % (process.memory_percent())  # 内存利用率
-                    real_mem = round(process_memory.rss / 1024 / 1024, 2)  # 实际内存
+                    real_mem = memory_results[idx]  # 实际内存
                     thread_count = process.num_threads()  # 线程总数
                 except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
                     cpu_percent = 0
@@ -74,7 +80,7 @@ class PidsPerf:
             #       minor_thread_count_sum)
             # 获取磁盘IO
             io_read_bytes_start, io_write_bytes_start = self.get_disk_usage()
-            time.sleep(self.interval)
+            time.sleep(0.1)  # 采集间隔
             io_read_bytes_end, io_write_bytes_end = self.get_disk_usage()  # io read/write
             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
@@ -85,6 +91,9 @@ class PidsPerf:
                     "memory_total": mem_total, "memory_available": mem_available}
             json_data = json.dumps(data)
             print(json_data)
+            elapsed = time.time() - start_time
+            remaining_time = max(0, self.interval / 1000 - elapsed)
+            await asyncio.sleep(remaining_time)
             sys.stdout.flush()
 
     def get_disk_usage(self):
@@ -210,6 +219,7 @@ class PidsPerf:
                             #       'Committed:', main_gpu_committed_sum, 'GPU Usage:',
                             #       main_gpu_percent_sum)
                         main_data = {'cpu': cpu_usage, 'private': private_mem, "workset": workSet_mem,
+                                     'thread count': thread_count,
                                      'gpu_Dedicated': round(float(main_gpu_dedicated_sum), 2),
                                      'gpu_System': round(float(main_gpu_system_sum), 2),
                                      'gpu_Committed': round(float(main_gpu_committed_sum), 2),
@@ -244,7 +254,7 @@ class PidsPerf:
             disk_data = {'io read': minor_io_read_sum, 'io write': minor_io_write_sum}
             other_data = {'cpu': minor_cpu_sum, 'private': round(float(minor_private_mem_sum), 2),
                           'workset': round(float(minor_workSet_mem_sum), 2),
-                          'memory percent': round(float(minor_mem_percent_sum), 2),
+                          # 'memory percent': round(float(minor_mem_percent_sum), 2),
                           'thread count': minor_thread_count_sum,
                           'gpu_Dedicated': round(minor_gpu_dedicated_sum, 2),
                           'gpu_System': round(minor_gpu_system_sum, 2),

{pmonitor-1.4.5 → pmonitor-1.4.7}/monitor/run_monitor.py

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

{pmonitor-1.4.5 → pmonitor-1.4.7}/pmonitor.egg-info/PKG-INFO

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

{pmonitor-1.4.5 → pmonitor-1.4.7}/pmonitor.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ monitor/__init__.py
 monitor/get_process_name.py
 monitor/mac_gpu.py
 monitor/monitor_mac.py
+monitor/monitor_mac_vmmap.py
 monitor/monitor_pids.py
 monitor/monitor_win.py
 monitor/run_monitor.py
@@ -25,8 +26,6 @@ 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.4.5 → pmonitor-1.4.7}/setup.py

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