pmonitor 1.4.7__py3-none-any.whl → 1.4.8__py3-none-any.whl

monitor/monitor_mac_vmmap.py

@@ -3,9 +3,11 @@ import asyncio
 
 
 class VmMapMemory:
+    def __init__(self):
+        self.last_nonzero_memory = None
+
     async def get_process_memory(self, pid):
-        cmd = ["vmmap", "--summary", str(pid)]
-        proc = None
+        cmd = ["top", "-l", "1", "-stats", "mem", "-pid", str(pid)]
         try:
             # 创建子进程并设置超时
             proc = await asyncio.create_subprocess_exec(
@@ -15,7 +17,7 @@ class VmMapMemory:
             )
 
             try:
-                stdout, _ = await asyncio.wait_for(proc.communicate(), timeout=5)
+                stdout, _ = await asyncio.wait_for(proc.communicate(), timeout=1)
             except asyncio.TimeoutError:
                 # 超时后确保子进程被终止
                 proc.kill()
@@ -23,16 +25,27 @@ class VmMapMemory:
                 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)
+                # 解析 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()
-        return 0.0
+        # 如果未能获取到有效值，返回上一次非零值或默认值 0.0
+        return self.last_nonzero_memory if self.last_nonzero_memory is not None else 0.0

{pmonitor-1.4.7.dist-info → pmonitor-1.4.8.dist-info}/METADATA

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

{pmonitor-1.4.7.dist-info → pmonitor-1.4.8.dist-info}/RECORD

@@ -3,7 +3,7 @@ monitor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 monitor/get_process_name.py,sha256=HxePo2gdrTo2Ukg4DTnYzUMdczVWywCeLCXQ-RRWyu8,3913
 monitor/mac_gpu.py,sha256=kQDPMW04lIYPBbJw772Jh1OQxj-D4JNmdjJlP6BuR4w,2320
 monitor/monitor_mac.py,sha256=OoptTTXTZQupzBwgGOfKNjyYAKBxDy-wI3l6T7XVE8s,4651
-monitor/monitor_mac_vmmap.py,sha256=t-qB5i8b_OKapu21F8LwrxH35FeoCovSsfpGNVYVkWo,1261
+monitor/monitor_mac_vmmap.py,sha256=Lu1AAw6auuZzuNZtASOaNBpRPOOgyzGr1jYSTErmRmo,1971
 monitor/monitor_pids.py,sha256=1Bmemd-cf1NkrcCbKwOg-56fDgxSGLXam-EGmr_5AWU,16531
 monitor/monitor_win.py,sha256=xs5nzqqEPoDmJTegh3lQhVjjpPcOWnruWKK65ttqnTo,6161
 monitor/run_monitor.py,sha256=HDQXHIx47ZRN4Gp0PTr0yWKVM28n8A7-NaO--_pdgso,1577
@@ -24,8 +24,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.4.7.dist-info/METADATA,sha256=OoCVnvaCS5oN5QM8vPHAxlRAgG25-6xrwKqe_ehmS7A,291
-pmonitor-1.4.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-pmonitor-1.4.7.dist-info/entry_points.txt,sha256=vmlLEANgf2fZar9BeXYiKdF6GMJbVXip-SIZx5yPXDo,55
-pmonitor-1.4.7.dist-info/top_level.txt,sha256=tGkQDkVeyKgP5Rr7acpp0df83NBAnI8up0sGwRxuuQ4,8
-pmonitor-1.4.7.dist-info/RECORD,,
+pmonitor-1.4.8.dist-info/METADATA,sha256=cHkAUgHDu0voEx1JNF_q1qbPo7YGVzlt6_h4J53KZRs,291
+pmonitor-1.4.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+pmonitor-1.4.8.dist-info/entry_points.txt,sha256=vmlLEANgf2fZar9BeXYiKdF6GMJbVXip-SIZx5yPXDo,55
+pmonitor-1.4.8.dist-info/top_level.txt,sha256=tGkQDkVeyKgP5Rr7acpp0df83NBAnI8up0sGwRxuuQ4,8
+pmonitor-1.4.8.dist-info/RECORD,,