pmonitor 1.5.0__tar.gz → 1.5.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (36) hide show
  1. {pmonitor-1.5.0 → pmonitor-1.5.1}/PKG-INFO +1 -1
  2. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/monitor_mac_vmmap.py +6 -6
  3. {pmonitor-1.5.0 → pmonitor-1.5.1}/pmonitor.egg-info/PKG-INFO +1 -1
  4. {pmonitor-1.5.0 → pmonitor-1.5.1}/setup.py +1 -1
  5. {pmonitor-1.5.0 → pmonitor-1.5.1}/README.md +0 -0
  6. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/DLL/GpuMonitorLib.dll +0 -0
  7. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/DLL/KernelBase.dll +0 -0
  8. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/DLL/__init__.py +0 -0
  9. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/DLL/advapi32.dll +0 -0
  10. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/DLL/bcrypt.dll +0 -0
  11. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/DLL/kernel.appcore.dll +0 -0
  12. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/DLL/kernel32.dll +0 -0
  13. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/DLL/msvcirt.dll +0 -0
  14. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/DLL/msvcp140.dll +0 -0
  15. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/DLL/ntdll.dll +0 -0
  16. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/DLL/pdh.dll +0 -0
  17. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/DLL/rpcrt4.dll +0 -0
  18. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/DLL/sechost.dll +0 -0
  19. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/DLL/ucrtbased.dll +0 -0
  20. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/DLL/vcruntime140.dll +0 -0
  21. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/DLL/vcruntime140_1.dll +0 -0
  22. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/WinPidUtil.py +0 -0
  23. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/__init__.py +0 -0
  24. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/get_process_name.py +0 -0
  25. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/mac_gpu.py +0 -0
  26. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/monitor_mac.py +0 -0
  27. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/monitor_pids.py +0 -0
  28. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/monitor_win.py +0 -0
  29. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/run_monitor.py +0 -0
  30. {pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/sys_info.py +0 -0
  31. {pmonitor-1.5.0 → pmonitor-1.5.1}/pmonitor.egg-info/SOURCES.txt +0 -0
  32. {pmonitor-1.5.0 → pmonitor-1.5.1}/pmonitor.egg-info/dependency_links.txt +0 -0
  33. {pmonitor-1.5.0 → pmonitor-1.5.1}/pmonitor.egg-info/entry_points.txt +0 -0
  34. {pmonitor-1.5.0 → pmonitor-1.5.1}/pmonitor.egg-info/requires.txt +0 -0
  35. {pmonitor-1.5.0 → pmonitor-1.5.1}/pmonitor.egg-info/top_level.txt +0 -0
  36. {pmonitor-1.5.0 → pmonitor-1.5.1}/setup.cfg +0 -0
{pmonitor-1.5.0 → pmonitor-1.5.1}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 1.2
2
2
  Name: pmonitor
3
- Version: 1.5.0
3
+ Version: 1.5.1
4
4
  Summary: pc monitor
5
5
  Home-page: UNKNOWN
6
6
  Author: cfr
{pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/monitor_mac_vmmap.py RENAMED
@@ -34,21 +34,21 @@ class VmMapMemory:
34
34
  def _convert_to_mb(self, mem_str):
35
35
  """
36
36
  将内存字符串转换为 MB
37
- 支持格式: 123, 123K, 123M, 123G
37
+ 支持格式: 123, 123K, 123M, 123G, 12G+, 12G-
38
38
  """
39
39
  # 移除逗号（如果存在）
40
40
  mem_str = mem_str.replace(',', '')
41
41
 
42
42
  # 检查单位并转换
43
43
  if 'G' in mem_str:
44
- return float(mem_str.replace('G', '')) * 1024
44
+ return float(mem_str.replace('G', '').rstrip('+-')) * 1024
45
45
  elif 'M' in mem_str:
46
- return float(mem_str.replace('M', ''))
46
+ return float(mem_str.replace('M', '').rstrip('+-'))
47
47
  elif 'K' in mem_str:
48
- return float(mem_str.replace('K', '')) / 1024
48
+ return float(mem_str.replace('K', '').rstrip('+-')) / 1024
49
49
  else:
50
50
  # 假设为字节
51
- return float(mem_str) / (1024 * 1024)
51
+ return float(mem_str.rstrip('+-')) / (1024 * 1024)
52
52
 
53
53
  def _monitor_memory(self):
54
54
  """线程函数：实时监控内存使用"""
@@ -73,7 +73,7 @@ class VmMapMemory:
73
73
  break
74
74
 
75
75
  # 匹配 PID 和内存行 (例如: "12345 123.4M")
76
- match = re.match(r'^\s*(\d+)\s+([\d,.]+[KMG]?)\s*$', line.strip())
76
+ match = re.match(r'^\s*(\d+)\s+([\d,.]+[KMG][+-]?)\s*$', line.strip())
77
77
  if match:
78
78
  pid = match.group(1)
79
79
  mem_str = match.group(2)
{pmonitor-1.5.0 → pmonitor-1.5.1}/pmonitor.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 1.2
2
2
  Name: pmonitor
3
- Version: 1.5.0
3
+ Version: 1.5.1
4
4
  Summary: pc monitor
5
5
  Home-page: UNKNOWN
6
6
  Author: cfr
{pmonitor-1.5.0 → pmonitor-1.5.1}/setup.py RENAMED
@@ -5,7 +5,7 @@ with open('README.md', 'r') as f:
5
5
  long_description = f.read()
6
6
 
7
7
  setup(name='pmonitor',
8
- version='1.5.0',
8
+ version='1.5.1',
9
9
  description='pc monitor',
10
10
  long_description=long_description,
11
11
  author='cfr',
{pmonitor-1.5.0 → pmonitor-1.5.1}/README.md RENAMED
File without changes
{pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/DLL/ntdll.dll RENAMED
File without changes
{pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/DLL/pdh.dll RENAMED
File without changes
{pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/WinPidUtil.py RENAMED
File without changes
{pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/__init__.py RENAMED
File without changes
{pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/mac_gpu.py RENAMED
File without changes
{pmonitor-1.5.0 → pmonitor-1.5.1}/monitor/sys_info.py RENAMED
File without changes
{pmonitor-1.5.0 → pmonitor-1.5.1}/setup.cfg RENAMED
File without changes