pmonitor 1.4.7__tar.gz → 1.4.9__tar.gz

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

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

pmonitor-1.4.9/monitor/monitor_mac_vmmap.py

@@ -0,0 +1,51 @@
+import re
+import asyncio
+
+
+class VmMapMemory:
+    def __init__(self):
+        self.last_nonzero_memory = None
+
+    async def get_process_memory(self, pid):
+        cmd = ["top", "-l", "1", "-stats", "mem", "-pid", str(pid)]
+        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=1)
+            except asyncio.TimeoutError:
+                # 超时后确保子进程被终止
+                proc.kill()
+                await proc.wait()
+                raise
+
+            if proc.returncode == 0:
+                # 解析 top 输出中的内存信息
+                lines = stdout.decode().strip().split('\n')
+                if lines:
+                    last_line = lines[-1].strip()  # 获取最后一行
+                    match = re.match(r'^([\d.]+)([GMK]?)$', last_line)
+
+                    if match:
+                        val, unit = float(match.group(1)), match.group(2)
+                        memory_value = val * {
+                            'G': 1024, 'M': 1, 'K': 1 / 1024, '': 1 / (1024 * 1024)
+                        }.get(unit, 1)
+
+                        if memory_value > 0:
+                            self.last_nonzero_memory = memory_value
+                        # 返回当前值或上一次非零值
+                        return memory_value if memory_value != 0 else self.last_nonzero_memory
+        except Exception as e:
+            print(e)
+        finally:
+            if proc and proc.returncode is None:
+                proc.kill()
+                await proc.wait()
+        # 如果未能获取到有效值，返回上一次非零值或默认值 0.0
+        return self.last_nonzero_memory if self.last_nonzero_memory is not None else 0.0

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

@@ -25,6 +25,7 @@ class PidsPerf:
     async def get_mac_perf(self):
         current_pid = self.processUtil.find_main_process_pid(self.process_name)
         vm = VmMapMemory()
+        next_time = time.time()  # 初始化下一次执行的时间点
         while True:
             start_time = time.time()  # 记录循环开始时间
             minor_cpu_sum = 0
@@ -80,7 +81,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(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
@@ -91,9 +92,13 @@ 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)
+            # 精确控制间隔
+            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):
@@ -129,6 +134,7 @@ 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
@@ -280,9 +286,13 @@ class PidsPerf:
             sys.stdout.flush()
             # 更新系统时间
             system_time_pre = system_time_post
-            # 等待以确保大约每秒更新一次
-            elapsed = time.time() - start_time
-            time.sleep(max(0, self.interval - elapsed))
+            # 精确控制间隔
+            next_time += self.interval
+            sleep_time = next_time - time.time()
+            if sleep_time > 0:
+                time.sleep(sleep_time)
+            else:
+                next_time = time.time()  # 如果超时，重置时间点v
 
     async def start_perf(self):
         if platform.system() == 'Windows':

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

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

{pmonitor-1.4.7 → pmonitor-1.4.9}/setup.py

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

pmonitor-1.4.7/monitor/monitor_mac_vmmap.py

@@ -1,38 +0,0 @@
-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