pmonitor 1.2.9__tar.gz → 1.3.0__tar.gz

{pmonitor-1.2.9 → pmonitor-1.3.0}/PKG-INFO

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

{pmonitor-1.2.9 → pmonitor-1.3.0}/monitor/monitor_pids.py

@@ -205,25 +205,20 @@ class PidsPerf:
                         if gpu_info is not None:
                             for item in gpu_info:
                                 if item['ProcessID'] == p_pid:
-                                    if item['GPUUtilizationPercent'] < 0:
-                                        # print('主进程pid：', item['ProcessID'], 'Dedicated:', 0,
-                                        #       'System:', 0,
-                                        #       'Committed:', 0, 'GPU Usage:',
-                                        #       0)
-                                        main_gpu_dedicated_sum += 0
-                                        main_gpu_system_sum += 0
-                                        main_gpu_committed_sum += 0
-                                    else:
-                                        print('主进程pid：', item['ProcessID'], 'Dedicated:',
-                                              item['GPUProcessMemoryLocalUsage'],
-                                              'System:', item['GPUProcessMemorySharedUsage'],
-                                              'Committed:', item['GPUProcessMemoryTotalCommitted'], 'GPU Usage:',
-                                              item['GPUUtilizationPercent'])
-                                        main_gpu_dedicated_sum = item['GPUProcessMemoryDedicatedUsage']  # （专用内存）
-                                        main_gpu_system_sum = item['GPUProcessMemorySharedUsage']  # (共享内存)
-                                        main_gpu_committed_sum = item['GPUProcessMemoryTotalCommitted']  # (总使用内存)
-                                        main_gpu_percent_sum = item['GPUUtilizationPercent']  # (GPU内存占比)
-
+                                    main_gpu_dedicated_sum += item['GPUProcessMemoryDedicatedUsage']  # （专用内存）
+                                    main_gpu_system_sum += item['GPUProcessMemorySharedUsage']  # (共享内存)
+                                    main_gpu_committed_sum += item['GPUProcessMemoryTotalCommitted']  # (总使用内存)
+                                    main_gpu_percent_sum += item['GPUUtilizationPercent']  # (GPU内存占比)
+                            print('主进程pid：', item['ProcessID'], 'Dedicated:',
+                                  main_gpu_dedicated_sum,
+                                  'System:', main_gpu_system_sum,
+                                  'Committed:', main_gpu_committed_sum, 'GPU Usage:',
+                                  main_gpu_percent_sum)
+                        main_data = {'cpu': cpu_usage, 'private': private_mem, "workset": workSet_mem,
+                                     '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),
+                                     'gpu_Usage': round(float(main_gpu_percent_sum), 2)}
 
                         # print(
                         #     f'主进程数据：cpu：{cpu_usage}，workSet：{workSet_mem}，private：{private_mem}，mem_percent：{mem_percent}，thread_count：{thread_count}')
@@ -236,35 +231,21 @@ class PidsPerf:
                         if gpu_info is not None:
                             for item in gpu_info:
                                 if item['ProcessID'] != p_pid:
-                                    if item['GPUUtilizationPercent'] < 0:
-                                        # print('子进程pid：', item['ProcessID'], 'Dedicated:', 0,
-                                        #       'System:', 0,
-                                        #       'Committed:', 0, 'GPU Usage:',
-                                        #       0)
-                                        minor_gpu_dedicated_sum += 0
-                                        minor_gpu_system_sum += 0
-                                        minor_gpu_committed_sum += 0
-                                        minor_gpu_percent_sum += 0
-                                    else:
-
-                                        minor_gpu_dedicated_sum += item['GPUProcessMemoryLocalUsage']
-                                        minor_gpu_system_sum += item['GPUProcessMemorySharedUsage']
-                                        minor_gpu_committed_sum += item['GPUProcessMemoryTotalCommitted']
-                                        minor_gpu_percent_sum += item['GPUUtilizationPercent']
-                            print('子进程pid：', 'Dedicated:',
-                                  minor_gpu_dedicated_sum,
-                                  'System:', minor_gpu_system_sum,
-                                  'Committed:', minor_gpu_committed_sum, 'GPU Usage:',
-                                  minor_gpu_percent_sum)
+                                    print('子进程pid：', item['ProcessID'], 'Dedicated:',
+                                          item['GPUProcessMemoryDedicatedUsage'],
+                                          'System:', item['GPUProcessMemorySharedUsage'],
+                                          'Committed:', item['GPUProcessMemoryTotalCommitted'], 'GPU Usage:',
+                                          item['GPUUtilizationPercent'])
+                                    minor_gpu_dedicated_sum += item['GPUProcessMemoryDedicatedUsage']
+                                    minor_gpu_system_sum += item['GPUProcessMemorySharedUsage']
+                                    minor_gpu_committed_sum += item['GPUProcessMemoryTotalCommitted']
+                                    minor_gpu_percent_sum += item['GPUUtilizationPercent']
                     minor_io_read_sum += read_bytes_sec  # 所有进程IO读取速率总数
                     minor_io_write_sum += write_bytes_sec  # 所有进程IO写入速率总数
 
                 else:
                     # print(f"PID {pid}: Process not found or access denied")
                     continue
-            main_data = {'cpu': cpu_usage, 'private': private_mem, "workset": workSet_mem,
-                         'gpu_Dedicated': round(main_gpu_dedicated_sum, 2), 'gpu_System': round(main_gpu_system_sum, 2),
-                         'gpu_Committed': round(main_gpu_committed_sum, 2), 'gpu_Usage': round(main_gpu_percent_sum, 2)}
             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),

{pmonitor-1.2.9 → pmonitor-1.3.0}/pmonitor.egg-info/PKG-INFO

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

{pmonitor-1.2.9 → pmonitor-1.3.0}/setup.py

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