pmonitor 1.5.0__tar.gz → 1.5.2__tar.gz

pmonitor-1.5.2/PKG-INFO

@@ -0,0 +1,21 @@
+Metadata-Version: 2.4
+Name: pmonitor
+Version: 1.5.2
+Summary: pc monitor
+Author: cfr
+Author-email: 1354592998@qq.com
+License: MIT
+Platform: all
+Requires-Python: >=3.6
+Requires-Dist: PyLibreHardwareMonitor>=1.2.2
+Requires-Dist: psutil>=5.9.8
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: license
+Dynamic: platform
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+pc application get monitor

{pmonitor-1.5.0 → pmonitor-1.5.2}/monitor/monitor_mac_vmmap.py

@@ -34,21 +34,21 @@ class VmMapMemory:
     def _convert_to_mb(self, mem_str):
         """
         将内存字符串转换为 MB
-        支持格式: 123, 123K, 123M, 123G
+        支持格式: 123, 123K, 123M, 123G, 12G+, 12G-
         """
         # 移除逗号（如果存在）
         mem_str = mem_str.replace(',', '')
 
         # 检查单位并转换
         if 'G' in mem_str:
-            return float(mem_str.replace('G', '')) * 1024
+            return float(mem_str.replace('G', '').rstrip('+-')) * 1024
         elif 'M' in mem_str:
-            return float(mem_str.replace('M', ''))
+            return float(mem_str.replace('M', '').rstrip('+-'))
         elif 'K' in mem_str:
-            return float(mem_str.replace('K', '')) / 1024
+            return float(mem_str.replace('K', '').rstrip('+-')) / 1024
         else:
             # 假设为字节
-            return float(mem_str) / (1024 * 1024)
+            return float(mem_str.rstrip('+-')) / (1024 * 1024)
 
     def _monitor_memory(self):
         """线程函数：实时监控内存使用"""
@@ -73,7 +73,7 @@ class VmMapMemory:
                     break
 
                 # 匹配 PID 和内存行 (例如: "12345  123.4M")
-                match = re.match(r'^\s*(\d+)\s+([\d,.]+[KMG]?)\s*$', line.strip())
+                match = re.match(r'^\s*(\d+)\s+([\d,.]+[KMG][+-]?)\s*$', line.strip())
                 if match:
                     pid = match.group(1)
                     mem_str = match.group(2)

{pmonitor-1.5.0 → pmonitor-1.5.2}/monitor/monitor_pids.py

@@ -9,8 +9,6 @@ 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
 
@@ -22,13 +20,9 @@ class PidsPerf:
         self.interval = interval
         self.processUtil = ProcessName()
 
-    async def get_mac_perf(self):
+    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
@@ -45,20 +39,12 @@ 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())  # 内存利用率
-                    vm_memory_data = json.loads(vm.get_current_json())
-                    real_mem = vm_memory_data.get(str(process.pid), 0)  # 默认值为 0（如果未找到对应 PID）
+                    real_mem = round(process_memory.rss / 1024 / 1024, 2)  # 实际内存
                     thread_count = process.num_threads()  # 线程总数
                 except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
                     cpu_percent = 0
@@ -88,7 +74,7 @@ class PidsPerf:
             #       minor_thread_count_sum)
             # 获取磁盘IO
             io_read_bytes_start, io_write_bytes_start = self.get_disk_usage()
-            time.sleep(0.1)
+            time.sleep(self.interval)
             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
@@ -99,13 +85,6 @@ 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):
@@ -141,7 +120,6 @@ class PidsPerf:
         # 获取GPU物理内存
         computer = Computer()
         gpu_key = list(computer.gpu.keys())[0]
-        next_time = time.time()  # 初始化下一次执行的时间点
         while True:
             minor_cpu_sum = 0
             minor_workSet_mem_sum = 0
@@ -232,7 +210,6 @@ 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),
@@ -267,7 +244,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),
@@ -293,13 +270,9 @@ class PidsPerf:
             sys.stdout.flush()
             # 更新系统时间
             system_time_pre = system_time_post
-            # 精确控制间隔
-            next_time += self.interval
-            sleep_time = next_time - time.time()
-            if sleep_time > 0:
-                time.sleep(sleep_time)
-            else:
-                next_time = time.time()  # 如果超时，重置时间点v
+            # 等待以确保大约每秒更新一次
+            elapsed = time.time() - start_time
+            time.sleep(max(0, self.interval - elapsed))
 
     async def start_perf(self):
         if platform.system() == 'Windows':

pmonitor-1.5.2/pmonitor.egg-info/PKG-INFO

@@ -0,0 +1,21 @@
+Metadata-Version: 2.4
+Name: pmonitor
+Version: 1.5.2
+Summary: pc monitor
+Author: cfr
+Author-email: 1354592998@qq.com
+License: MIT
+Platform: all
+Requires-Python: >=3.6
+Requires-Dist: PyLibreHardwareMonitor>=1.2.2
+Requires-Dist: psutil>=5.9.8
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: license
+Dynamic: platform
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+pc application get monitor

{pmonitor-1.5.0 → pmonitor-1.5.2}/pmonitor.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ monitor/run_monitor.py
 monitor/sys_info.py
 monitor/DLL/GpuMonitorLib.dll
 monitor/DLL/KernelBase.dll
+monitor/DLL/LibreHardwareMonitorLib.dll
 monitor/DLL/__init__.py
 monitor/DLL/advapi32.dll
 monitor/DLL/bcrypt.dll

{pmonitor-1.5.0 → pmonitor-1.5.2}/pmonitor.egg-info/entry_points.txt

@@ -1,3 +1,2 @@
 [console_scripts]
 pmonitor = monitor.run_monitor:main
-

{pmonitor-1.5.0 → pmonitor-1.5.2}/setup.py

@@ -1,11 +1,10 @@
-from distutils.core import setup
-from setuptools import find_packages
+from setuptools import setup, find_packages
 
 with open('README.md', 'r') as f:
     long_description = f.read()
 
 setup(name='pmonitor',
-      version='1.5.0',
+      version='1.5.2',
       description='pc monitor',
       long_description=long_description,
       author='cfr',

pmonitor-1.5.0/PKG-INFO

@@ -1,11 +0,0 @@
-Metadata-Version: 1.2
-Name: pmonitor
-Version: 1.5.0
-Summary: pc monitor
-Home-page: UNKNOWN
-Author: cfr
-Author-email: 1354592998@qq.com
-License: MIT
-Description: pc application get monitor
-Platform: all
-Requires-Python: >=3.6

pmonitor-1.5.0/pmonitor.egg-info/PKG-INFO

@@ -1,11 +0,0 @@
-Metadata-Version: 1.2
-Name: pmonitor
-Version: 1.5.0
-Summary: pc monitor
-Home-page: UNKNOWN
-Author: cfr
-Author-email: 1354592998@qq.com
-License: MIT
-Description: pc application get monitor
-Platform: all
-Requires-Python: >=3.6