pmonitor 1.1.7__tar.gz → 1.1.9__tar.gz

{pmonitor-1.1.7 → pmonitor-1.1.9}/PKG-INFO

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

{pmonitor-1.1.7 → pmonitor-1.1.9}/monitor/monitor_pids.py

@@ -6,6 +6,7 @@ import sys
 import asyncio
 import platform
 import ctypes
+import os
 
 
 class PidsPerf:
@@ -85,8 +86,8 @@ class PidsPerf:
         return 0, 0
 
     def get_win_perf(self):
-        from monitor.WinPidUtil import PidWinPerformance,FILETIME
-        from ctypes import byref
+        from monitor.WinPidUtil import PidWinPerformance, FILETIME
+        from ctypes import CDLL, c_int, c_char_p, byref
         pidWinPerf = PidWinPerformance()
         system_time_pre = pidWinPerf.filetime_to_100nano_seconds(FILETIME())
         p_pid = self.processUtil.find_main_process_pid(self.process_name)
@@ -94,7 +95,11 @@ class PidsPerf:
         child_pids.add(p_pid)  # app内所有pid
         process_cpu_times_pre = {pid: pidWinPerf.get_process_cpu_time(pid) for pid in child_pids}
         process_io_counters_pre = {pid: pidWinPerf.get_io_counters(pid) for pid in child_pids}
-        monitor_interval_seconds = 1  # 监控间隔（秒）
+
+        dll_path = os.path.join(os.path.dirname(__file__), 'DLL', 'GpuMonitorLib.dll')
+        gpu_monitor_dll = CDLL(dll_path)
+        gpu_monitor_dll.GetGpuUtilizationByPid.argtypes = [c_int]
+        gpu_monitor_dll.GetGpuUtilizationByPid.restype = c_char_p
         while True:
             minor_cpu_sum = 0
             minor_workSet_mem_sum = 0
@@ -103,6 +108,10 @@ class PidsPerf:
             minor_thread_count_sum = 0
             minor_io_read_sum = 0
             minor_io_write_sum = 0
+            minor_gpu_dedicated_sum = 0  # （专用内存）
+            minor_gpu_system_sum = 0  # (共享内存)
+            minor_gpu_committed_sum = 0  # (总使用内存)
+            minor_gpu_percent_sum = 0  # (GPU内存占比)
 
             current_pids = self.processUtil.get_children_pids(p_pid)  # 获取所有子进程
             current_pids.add(p_pid)  # 将主进程及子进程添加到list中
@@ -146,6 +155,8 @@ class PidsPerf:
                     pid].ReadTransferCount) / self.interval
                 write_bytes_sec = (io_counters.WriteTransferCount - process_io_counters_pre[
                     pid].WriteTransferCount) / self.interval
+                gpu_info_json = gpu_monitor_dll.GetGpuUtilizationByPid(pid).decode()
+                gpu_info = json.loads(gpu_info_json)
                 if process_cpu_time_post:
                     # 计算CPU使用率
                     cpu_usage = round((process_cpu_time_post - process_cpu_times_pre[pid]) / (
@@ -155,7 +166,29 @@ class PidsPerf:
                     workSet_mem = round(memory_info.WorkingSetSize / 1024 / 1024, 2)  # MB
                     private_mem = round(memory_info.PrivateUsage / 1024 / 1024, 2)  # MB
                     if pid == p_pid:
-                        main_data = {'cpu': cpu_usage, 'private': private_mem, "workset": workSet_mem}
+                        if gpu_info['GPUUtilizationPercent'] < 0:
+                            gpu_Dedicated = 0
+                            gpu_System = 0
+                            gpu_Committed = 0
+                            gpu_Usage = 0
+                            # print('主进程pid：', gpu_info['ProcessID'], 'Dedicated:', 0,
+                            #       'System:', 0,
+                            #       'Committed:', 0, 'GPU Usage:',
+                            #       0)
+                        else:
+                            gpu_Dedicated = gpu_info['GPUProcessMemoryLocalUsage']
+                            gpu_System = gpu_info['GPUProcessMemorySharedUsage']
+                            gpu_Committed = gpu_info['GPUProcessMemoryTotalCommitted']
+                            gpu_Usage = gpu_info['GPUUtilizationPercent']
+                            # print('主进程pid：', gpu_info['ProcessID'], 'Dedicated:',
+                            #       gpu_info['GPUProcessMemoryLocalUsage'],
+                            #       'System:', gpu_info['GPUProcessMemorySharedUsage'],
+                            #       'Committed:', gpu_info['GPUProcessMemoryTotalCommitted'], 'GPU Usage:',
+                            #       gpu_info['GPUUtilizationPercent'])
+                        main_data = {'cpu': cpu_usage, 'private': private_mem, "workset": workSet_mem,
+                                     'gpu_Dedicated': round(gpu_Dedicated, 2), 'gpu_System': round(gpu_System, 2),
+                                     'gpu_Committed': round(gpu_Committed, 2), 'gpu_Usage': round(gpu_Usage, 2)}
+
                         # print(
                         #     f'主进程数据：cpu：{cpu_usage}，workSet：{workSet_mem}，private：{private_mem}，mem_percent：{mem_percent}，thread_count：{thread_count}')
                     else:
@@ -164,6 +197,25 @@ class PidsPerf:
                         minor_private_mem_sum += private_mem  # 子进程private内存
                         minor_mem_percent_sum += mem_percent  # 子进程内存使用率
                         minor_thread_count_sum += thread_count  # 子进程线程总数
+                        if gpu_info['GPUUtilizationPercent'] < 0:
+                            # print('子进程pid：', gpu_info['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:
+                            # print('子进程pid：', gpu_info['ProcessID'], 'Dedicated:',
+                            #       gpu_info['GPUProcessMemoryLocalUsage'],
+                            #       'System:', gpu_info['GPUProcessMemorySharedUsage'],
+                            #       'Committed:', gpu_info['GPUProcessMemoryTotalCommitted'], 'GPU Usage:',
+                            #       gpu_info['GPUUtilizationPercent'])
+                            minor_gpu_dedicated_sum += gpu_info['GPUProcessMemoryLocalUsage']
+                            minor_gpu_system_sum += gpu_info['GPUProcessMemorySharedUsage']
+                            minor_gpu_committed_sum += gpu_info['GPUProcessMemoryTotalCommitted']
+                            minor_gpu_percent_sum += gpu_info['GPUUtilizationPercent']
                     minor_io_read_sum += read_bytes_sec  # 所有进程IO读取速率总数
                     minor_io_write_sum += write_bytes_sec  # 所有进程IO写入速率总数
 
@@ -174,7 +226,11 @@ class PidsPerf:
             other_data = {'cpu': minor_cpu_sum, 'private': round(float(minor_private_mem_sum), 2),
                           'workset': round(float(minor_workSet_mem_sum), 2),
                           'memory percent': round(float(minor_mem_percent_sum), 2),
-                          'thread count': minor_thread_count_sum}
+                          '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)}
             data = {'main': main_data, 'other': other_data, 'disk': disk_data}
             json_data = json.dumps(data)
             print(json_data)
@@ -190,4 +246,3 @@ class PidsPerf:
             await asyncio.gather(self.get_win_perf())
         else:
             await asyncio.gather(self.get_mac_perf())
-

{pmonitor-1.1.7 → pmonitor-1.1.9}/monitor/run_monitor.py

@@ -1,8 +1,7 @@
 import argparse
-import sys
 
 from monitor.sys_info import SysInfo
-from monitor. monitor_pids import *
+from monitor.monitor_pids import *
 from monitor.get_process_name import *
 import asyncio
 
@@ -18,7 +17,6 @@ def main():
     if args.info:
         print(SysInfo().get_device_info())
         exit()
-
     process = None
     if args.name:
         process = args.name
@@ -29,6 +27,8 @@ def main():
     if args.time:
         interval = args.time
 
+    # process = 'ColorByte.exe'
+    # interval = 1
     process_name = ProcessName()
     if process is not None:
         print('监测进程<{}>，采集数据间隔<{}s>'.format(process, interval))
@@ -47,21 +47,6 @@ def main():
     print('开始监测进程<{}>，主进程pid<{}>'.format(process, pid))
     pidsPerf = PidsPerf(process, interval)
     asyncio.run(pidsPerf.start_perf())
-    # if platform.system() == 'Windows':
-    #     monitor = WinPerformance(pid=int(pid))
-    # else:
-    #     monitor = MacPerformance(pid=int(pid))
-    # print(f'{"   ".join(monitor.header)}')
-    # while True:
-    #     try:
-    #         result = asyncio.run(monitor.get_all_monitor())
-    #     except Exception as e:
-    #         result = monitor.get_all_usage()
-    #     result.insert(0, time.strftime('%H:%M:%S'))
-    #     line = [str(item) for item in result]
-    #     info = "        ".join(line)
-    #     print(info)
-    #     sys.stdout.flush()
 
 
 if __name__ == '__main__':

{pmonitor-1.1.7 → pmonitor-1.1.9}/pmonitor.egg-info/PKG-INFO

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

pmonitor-1.1.9/pmonitor.egg-info/SOURCES.txt

@@ -0,0 +1,31 @@
+README.md
+setup.py
+monitor/WinPidUtil.py
+monitor/__init__.py
+monitor/get_process_name.py
+monitor/monitor_mac.py
+monitor/monitor_pids.py
+monitor/monitor_win.py
+monitor/run_monitor.py
+monitor/sys_info.py
+monitor/DLL/GpuMonitorLib.dll
+monitor/DLL/KernelBase.dll
+monitor/DLL/__init__.py
+monitor/DLL/advapi32.dll
+monitor/DLL/bcrypt.dll
+monitor/DLL/kernel.appcore.dll
+monitor/DLL/kernel32.dll
+monitor/DLL/msvcirt.dll
+monitor/DLL/msvcp140.dll
+monitor/DLL/ntdll.dll
+monitor/DLL/pdh.dll
+monitor/DLL/rpcrt4.dll
+monitor/DLL/sechost.dll
+monitor/DLL/ucrtbased.dll
+monitor/DLL/vcruntime140.dll
+monitor/DLL/vcruntime140_1.dll
+pmonitor.egg-info/PKG-INFO
+pmonitor.egg-info/SOURCES.txt
+pmonitor.egg-info/dependency_links.txt
+pmonitor.egg-info/entry_points.txt
+pmonitor.egg-info/top_level.txt

{pmonitor-1.1.7 → pmonitor-1.1.9}/setup.py

@@ -5,7 +5,7 @@ with open('README.md', 'r') as f:
     long_description = f.read()
 
 setup(name='pmonitor',
-      version='1.1.7',
+      version='1.1.9',
       description='pc monitor',
       long_description=long_description,
       author='cfr',
@@ -13,6 +13,9 @@ setup(name='pmonitor',
       install_requires=[],
       license='MIT',
       packages=find_packages(),
+      package_data={
+          'monitor': ['DLL/*'],
+      },
       platforms=['all'],
       classifiers=[],
       python_requires='>=3.6',
@@ -21,4 +24,4 @@ setup(name='pmonitor',
           'console_scripts': ['pmonitor=monitor.run_monitor:main']  # 增加命令行指令运行的参数设置
       },
 
-)
+      )

pmonitor-1.1.7/pmonitor.egg-info/SOURCES.txt

@@ -1,15 +0,0 @@
-README.md
-setup.py
-monitor/WinPidUtil.py
-monitor/__init__.py
-monitor/get_process_name.py
-monitor/monitor_mac.py
-monitor/monitor_pids.py
-monitor/monitor_win.py
-monitor/run_monitor.py
-monitor/sys_info.py
-pmonitor.egg-info/PKG-INFO
-pmonitor.egg-info/SOURCES.txt
-pmonitor.egg-info/dependency_links.txt
-pmonitor.egg-info/entry_points.txt
-pmonitor.egg-info/top_level.txt