get macos infomation build

This commit is contained in:
cppla 2022-11-30 11:17:12 +08:00
parent d5af5445df
commit 806b60bd6b

@ -46,7 +46,6 @@ def get_swap():
return int(Mem.total/1024.0), int(Mem.used/1024.0) return int(Mem.total/1024.0), int(Mem.used/1024.0)
def get_hdd(): def get_hdd():
# todo, 兼容macos ,beta
if "darwin" in sys.platform: if "darwin" in sys.platform:
return int(psutil.disk_usage("/").total/1024.0/1024.0), int((psutil.disk_usage("/").total-psutil.disk_usage("/").free)/1024.0/1024.0) return int(psutil.disk_usage("/").total/1024.0/1024.0), int((psutil.disk_usage("/").total-psutil.disk_usage("/").free)/1024.0/1024.0)
else: else:
@ -108,9 +107,8 @@ def tupd():
t = int(os.popen('netstat -an|find "TCP" /c').read()[:-1])-1 t = int(os.popen('netstat -an|find "TCP" /c').read()[:-1])-1
u = int(os.popen('netstat -an|find "UDP" /c').read()[:-1])-1 u = int(os.popen('netstat -an|find "UDP" /c').read()[:-1])-1
p = len(psutil.pids()) p = len(psutil.pids())
d = 0 # if you find cpu is high, please set d=0
# cpu is high, default: 0 d = sum([psutil.Process(k).num_threads() for k in psutil.pids()])
# d = sum([psutil.Process(k).num_threads() for k in psutil.pids()])
else: else:
t,u,p,d = 0,0,0,0 t,u,p,d = 0,0,0,0
return t,u,p,d return t,u,p,d
@ -221,7 +219,7 @@ def _disk_io():
比如我这里是机械硬盘大量做随机小文件读写那么很低的读写也就能造成硬盘长时间的等待 比如我这里是机械硬盘大量做随机小文件读写那么很低的读写也就能造成硬盘长时间的等待
如果这里做连续性IO那么普通机械硬盘写入到100Mb/s那么也能造成硬盘长时间的等待 如果这里做连续性IO那么普通机械硬盘写入到100Mb/s那么也能造成硬盘长时间的等待
磁盘读写有误差4k8k https://stackoverflow.com/questions/34413926/psutil-vs-dd-monitoring-disk-i-o 磁盘读写有误差4k8k https://stackoverflow.com/questions/34413926/psutil-vs-dd-monitoring-disk-i-o
macos暂不处理 macos/win暂不处理
""" """
if "darwin" in sys.platform or "win" in sys.platform: if "darwin" in sys.platform or "win" in sys.platform:
diskIO["read"] = 0 diskIO["read"] = 0