pmonitor 1.5.5__py3-none-any.whl → 1.5.7__py3-none-any.whl

monitor/monitor_pids.py

@@ -1,4 +1,3 @@
-import psutil
 import time
 import json
 from monitor.get_process_name import *
@@ -7,7 +6,7 @@ import asyncio
 import platform
 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 +19,13 @@ 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()
+        next_time = time.time()  # 初始化下一次执行的时间点
+        first_iteration = True  # 标志变量，用于跳过第一次循环
         while True:
+            start_time = time.time()  # 记录循环开始时间
             minor_cpu_sum = 0
             minor_real_mem_sum = 0
             minor_mem_percent_sum = 0
@@ -40,12 +43,21 @@ class PidsPerf:
             mem_available = round(mem_info.available / 1024 / 1024, 2)  # 剩余虚拟内存
 
             gpu_memory_usage, gpu_memory_total, gpu_memory_free = get_gpu_memory()
+            # 使用 asyncio.gather 并发获取内存数据
+            vm.update_pids(current_pids)
+
+            if first_iteration:
+                first_iteration = False  # 第一次循环后将标志置为 False
+                await asyncio.sleep(self.interval / 1000)  # 等待一段时间以确保数据稳定
+                continue  # 跳过第一次循环
+
             for process in 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)  # 实际内存
+                    vm_memory_data = json.loads(vm.get_current_json())
+                    real_mem = vm_memory_data.get(str(process.pid), 0)  # 默认值为 0（如果未找到对应 PID）
                     vss_mem = round(process_memory.vms / 1024 / 1024, 2)  # 虚拟内存
                     thread_count = process.num_threads()  # 线程总数
                 except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
@@ -79,7 +91,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
@@ -90,6 +102,13 @@ class PidsPerf:
                     "memory_total": mem_total, "memory_available": mem_available}
             json_data = json.dumps(data)
             print(json_data)
+            # 精确控制间隔
+            next_time += self.interval
+            sleep_time = next_time - time.time()
+            if sleep_time > 0:
+                await asyncio.sleep(sleep_time)
+            else:
+                next_time = time.time()  # 如果超时，重置时间点
             sys.stdout.flush()
 
     def get_disk_usage(self):

{pmonitor-1.5.5.dist-info → pmonitor-1.5.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pmonitor
-Version: 1.5.5
+Version: 1.5.7
 Summary: pc monitor
 Author: cfr
 Author-email: 1354592998@qq.com

{pmonitor-1.5.5.dist-info → pmonitor-1.5.7.dist-info}/RECORD

@@ -4,11 +4,11 @@ monitor/get_process_name.py,sha256=HxePo2gdrTo2Ukg4DTnYzUMdczVWywCeLCXQ-RRWyu8,3
 monitor/mac_gpu.py,sha256=kQDPMW04lIYPBbJw772Jh1OQxj-D4JNmdjJlP6BuR4w,2320
 monitor/monitor_mac.py,sha256=OoptTTXTZQupzBwgGOfKNjyYAKBxDy-wI3l6T7XVE8s,4651
 monitor/monitor_mac_vmmap.py,sha256=2ZLhig5ymY6XU7bZGnHM9VIK-d5DAqWOFItIfv7KDPE,3819
-monitor/monitor_pids.py,sha256=VqgN4puRMDXzNukiHVrZp-gsYKswUiFkuvhPRo56sII,16772
+monitor/monitor_pids.py,sha256=kqMOsYVqkrB6uh0LoifvO3w0bBmpUH7XrLw0tSmTFdk,17755
 monitor/monitor_win.py,sha256=xs5nzqqEPoDmJTegh3lQhVjjpPcOWnruWKK65ttqnTo,6161
 monitor/run_monitor.py,sha256=HDQXHIx47ZRN4Gp0PTr0yWKVM28n8A7-NaO--_pdgso,1577
 monitor/sys_info.py,sha256=aNultuRoQuRYPkYo397xAXVDXP07Qx5JOHtYzNmEvuc,3208
-monitor/DLL/GpuMonitorLib.dll,sha256=t1Y4h7Hoxz2s9Ziiofrp7xgfpuQiMafxnRVW0TcmmuY,68608
+monitor/DLL/GpuMonitorLib.dll,sha256=V4nPPvQ0JRVKFdhpIL7Q5da8-KpbThqr7WIMxMKxrKU,66560
 monitor/DLL/KernelBase.dll,sha256=MSJ2WSh-2Lk6yFVLX_a8G2EnNuaOtJGpfg-Vw9HY_go,3860744
 monitor/DLL/LibreHardwareMonitorLib.dll,sha256=XSzcprSY4xSH3i5DhngO6mYtVmC3GJvu9-0X9UKwPbU,790528
 monitor/DLL/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -25,8 +25,8 @@ 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.5.5.dist-info/METADATA,sha256=n_TzAaS9o3NXsebViiGZE6UgmFOAOcjMjrb3ZjWhot0,427
-pmonitor-1.5.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-pmonitor-1.5.5.dist-info/entry_points.txt,sha256=RiT4cQ3f8vsU3HSGbQrMROCHMi7eOFzdh-k0g7TzoFE,54
-pmonitor-1.5.5.dist-info/top_level.txt,sha256=tGkQDkVeyKgP5Rr7acpp0df83NBAnI8up0sGwRxuuQ4,8
-pmonitor-1.5.5.dist-info/RECORD,,
+pmonitor-1.5.7.dist-info/METADATA,sha256=iih0wvjnWstOzhRqT8XZU1kFU_5uKiT0BnFnlZbD9N4,427
+pmonitor-1.5.7.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pmonitor-1.5.7.dist-info/entry_points.txt,sha256=RiT4cQ3f8vsU3HSGbQrMROCHMi7eOFzdh-k0g7TzoFE,54
+pmonitor-1.5.7.dist-info/top_level.txt,sha256=tGkQDkVeyKgP5Rr7acpp0df83NBAnI8up0sGwRxuuQ4,8
+pmonitor-1.5.7.dist-info/RECORD,,