pmonitor 1.5.2__py3-none-any.whl → 1.5.4__py3-none-any.whl

monitor/monitor_pids.py

@@ -26,6 +26,7 @@ class PidsPerf:
             minor_cpu_sum = 0
             minor_real_mem_sum = 0
             minor_mem_percent_sum = 0
+            minor_vss_mem_sum = 0
             minor_thread_count_sum = 0
             gpu_memory_usage = 0
             gpu_memory_total = 0
@@ -45,31 +46,35 @@ class PidsPerf:
                     process_memory = process.memory_info()
                     mem_percent = u'%.2f' % (process.memory_percent())  # 内存利用率
                     real_mem = round(process_memory.rss / 1024 / 1024, 2)  # 实际内存
+                    vss_mem = round(process_memory.vms / 1024 / 1024, 2)  # 虚拟内存
                     thread_count = process.num_threads()  # 线程总数
                 except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
                     cpu_percent = 0
                     mem_percent = 0
                     real_mem = 0
                     thread_count = 0
+                    vss_mem = 0
 
                 # 将性能数据保存到对应PID的数据列表中
                 if process.pid == current_pid:  # 主进程数据处理
                     main_cpu = cpu_percent
                     main_real_mem = real_mem
                     main_mem_percent = round(float(mem_percent), 2)
+                    main_vss_mem = vss_mem
                     main_thread_count = thread_count
                     main_data = {'cpu': main_cpu, 'memory': main_real_mem, 'memory percent': main_mem_percent,
-                                 'thread count': main_thread_count}
+                                 'thread count': main_thread_count, 'vss memory': main_vss_mem}
                     # print('主进程', pid_name, main_cpu, main_real_mem, main_mem_percent, main_thread_count)
                 else:  # 子进程数据处理
                     minor_cpu_sum += cpu_percent
                     minor_real_mem_sum += real_mem
+                    minor_vss_mem_sum += vss_mem
                     minor_mem_percent_sum += float(mem_percent)
                     minor_thread_count_sum += thread_count
                 # pid_data[process.pid].append((cpu_percent, real_mem, mem_percent, thread_count))
             minor_data = {'cpu': round(float(minor_cpu_sum), 2), 'memory': round(float(minor_real_mem_sum), 2),
                           'memory percent': round(float(minor_mem_percent_sum), 2),
-                          'thread count': minor_thread_count_sum}
+                          'thread count': minor_thread_count_sum, 'vss memory': minor_vss_mem_sum}
             # print('其他子进程', pid_name, minor_cpu_sum, minor_real_mem_sum, minor_mem_percent_sum,
             #       minor_thread_count_sum)
             # 获取磁盘IO
@@ -118,13 +123,14 @@ class PidsPerf:
         gpu_monitor_dll.GetGPUDataForProcess.argtypes = [ctypes.c_ulong]
         gpu_monitor_dll.GetGPUDataForProcess.restype = ctypes.c_char_p
         # 获取GPU物理内存
-        computer = Computer()
-        gpu_key = list(computer.gpu.keys())[0]
+        # computer = Computer()
+        # gpu_key = list(computer.gpu.keys())[0]
         while True:
             minor_cpu_sum = 0
             minor_workSet_mem_sum = 0
             minor_private_mem_sum = 0
             minor_mem_percent_sum = 0
+            minor_vss_mem_sum = 0
             minor_thread_count_sum = 0
             minor_io_read_sum = 0
             minor_io_write_sum = 0
@@ -151,7 +157,7 @@ class PidsPerf:
             child_pids.add(p_pid)  # app内所有pid
             child_pids = {pid for pid in child_pids if psutil.pid_exists(pid)}  # 移除不存在的进程
 
-            small_data = computer.gpu[gpu_key]['SmallData']  # 获取GPU物理内存信息
+            # small_data = computer.gpu[gpu_key]['SmallData']  # 获取GPU物理内存信息
             try:
                 new_pids_cpu_time_pre = {pid: pidWinPerf.get_process_cpu_time(pid) for pid in child_pids if
                                          pid not in process_cpu_times_pre}
@@ -170,12 +176,14 @@ class PidsPerf:
                 try:
                     process = psutil.Process(pid)
                     pid_name = process.name()
+                    mem_vss = round(process.memory_info().vms / 1024 / 1024, 2)
                     mem_percent = round(process.memory_percent(), 2)
                     thread_count = process.num_threads()
                 except (psutil.AccessDenied, psutil.NoSuchProcess, psutil.ZombieProcess):
                     # print('pid is not found')
                     mem_percent = 0
                     thread_count = 0
+                    mem_vss = 0
                 process_cpu_time_post = pidWinPerf.get_process_cpu_time(pid)
                 memory_info = pidWinPerf.get_process_memory(pid)
                 io_counters = pidWinPerf.get_io_counters(pid)
@@ -210,6 +218,9 @@ class PidsPerf:
                             #       'Committed:', main_gpu_committed_sum, 'GPU Usage:',
                             #       main_gpu_percent_sum)
                         main_data = {'cpu': cpu_usage, 'private': private_mem, "workset": workSet_mem,
+                                     "vss memory": mem_vss,
+                                     "mem percent": mem_percent,
+                                     "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),
@@ -219,6 +230,7 @@ class PidsPerf:
                         #     f'主进程数据：cpu：{cpu_usage}，workSet：{workSet_mem}，private：{private_mem}，mem_percent：{mem_percent}，thread_count：{thread_count}')
                     else:
                         minor_cpu_sum += cpu_usage  # 子进程总
+                        minor_vss_mem_sum += mem_vss  # 子进程vss内存
                         minor_workSet_mem_sum += workSet_mem  # 子进程workSet内存
                         minor_private_mem_sum += private_mem  # 子进程private内存
                         minor_mem_percent_sum += mem_percent  # 子进程内存使用率
@@ -244,23 +256,24 @@ 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),
+                          'vss memory': minor_vss_mem_sum,
                           '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),
                           'gpu_Committed': round(minor_gpu_committed_sum, 2),
                           'gpu_Usage': round(minor_gpu_percent_sum, 2)}
-            if 'GPU Memory Used' in small_data:
-                gpu_data = {'gpu memory usage': round(small_data['GPU Memory Used'], 2),
-                            'gpu memory total': round(small_data['GPU Memory Total'], 2),
-                            'gpu memory free': round(small_data['GPU Memory Free'], 2)}
-            else:
-                gpu_data = {'gpu memory usage': round(small_data['D3D Shared Memory Used'], 2),
-                            'gpu memory total': round(small_data['D3D Shared Memory Total'], 2),
-                            'gpu memory free': round(small_data['D3D Shared Memory Free'], 2)}
+            # if 'GPU Memory Used' in small_data:
+            #     gpu_data = {'gpu memory usage': round(small_data['GPU Memory Used'], 2),
+            #                 'gpu memory total': round(small_data['GPU Memory Total'], 2),
+            #                 'gpu memory free': round(small_data['GPU Memory Free'], 2)}
+            # else:
+            #     gpu_data = {'gpu memory usage': round(small_data['D3D Shared Memory Used'], 2),
+            #                 'gpu memory total': round(small_data['D3D Shared Memory Total'], 2),
+            #                 'gpu memory free': round(small_data['D3D Shared Memory Free'], 2)}
             try:
                 data = {'main': main_data, 'other': other_data, 'disk': disk_data,
-                        'gpu': gpu_data,
+                        # 'gpu': gpu_data,
                         'memory_total': memory_total,
                         'memory_available': memory_available}
                 json_data = json.dumps(data)

{pmonitor-1.5.2.dist-info → pmonitor-1.5.4.dist-info}/METADATA

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

{pmonitor-1.5.2.dist-info → pmonitor-1.5.4.dist-info}/RECORD

@@ -4,7 +4,7 @@ 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=DftMSexy87lHIiSJoVJDxNQLXcfHpZg4jNwsJRc4hjw,15968
+monitor/monitor_pids.py,sha256=VqgN4puRMDXzNukiHVrZp-gsYKswUiFkuvhPRo56sII,16772
 monitor/monitor_win.py,sha256=xs5nzqqEPoDmJTegh3lQhVjjpPcOWnruWKK65ttqnTo,6161
 monitor/run_monitor.py,sha256=HDQXHIx47ZRN4Gp0PTr0yWKVM28n8A7-NaO--_pdgso,1577
 monitor/sys_info.py,sha256=aNultuRoQuRYPkYo397xAXVDXP07Qx5JOHtYzNmEvuc,3208
@@ -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.2.dist-info/METADATA,sha256=ppCC12Qt8JYHdv7t6_j_UB7LsOlPnsP9ekkzrY1N0xM,427
-pmonitor-1.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pmonitor-1.5.2.dist-info/entry_points.txt,sha256=RiT4cQ3f8vsU3HSGbQrMROCHMi7eOFzdh-k0g7TzoFE,54
-pmonitor-1.5.2.dist-info/top_level.txt,sha256=tGkQDkVeyKgP5Rr7acpp0df83NBAnI8up0sGwRxuuQ4,8
-pmonitor-1.5.2.dist-info/RECORD,,
+pmonitor-1.5.4.dist-info/METADATA,sha256=u7U43Hm3aPIp6Gxrpx7K8ZBhEFDUH_pODlLr3aBYrzc,427
+pmonitor-1.5.4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pmonitor-1.5.4.dist-info/entry_points.txt,sha256=RiT4cQ3f8vsU3HSGbQrMROCHMi7eOFzdh-k0g7TzoFE,54
+pmonitor-1.5.4.dist-info/top_level.txt,sha256=tGkQDkVeyKgP5Rr7acpp0df83NBAnI8up0sGwRxuuQ4,8
+pmonitor-1.5.4.dist-info/RECORD,,

{pmonitor-1.5.2.dist-info → pmonitor-1.5.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any