github
/
ServerStatus
mirror of https://github.com/cppla/ServerStatus
1
0
Fork 0
Code Issues Releases Wiki Activity

fix calculate accurate memory

pull/55/head
macos 2019-05-16 17:27:01 +08:00
parent 2f92dd889e
commit 525eda6bc7
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clients/client-linux.py
View File

@ -40,11 +40,11 @@ def get_memory():
continue continue
key, value = match.groups(['key', 'value']) key, value = match.groups(['key', 'value'])
result[key] = int(value) result[key] = int(value)
# mem used refer to: htop software
# https://stackoverflow.com/questions/41224738/how-to-calculate-system-memory-usage-from-proc-meminfo-like-htop
MemTotal = float(result['MemTotal']) MemTotal = float(result['MemTotal'])
MemFree = float(result['MemFree']) MemExactCache = float(result['Cached'])+float(result['SReclaimable'])-float(result['Shmem'])
Cached = float(result['Cached']) MemUsed = MemTotal-float(result['MemFree'])-(float(result['Buffers'])+MemExactCache)
MemUsed = MemTotal - (Cached + MemFree)
SwapTotal = float(result['SwapTotal']) SwapTotal = float(result['SwapTotal'])
SwapFree = float(result['SwapFree']) SwapFree = float(result['SwapFree'])
return int(MemTotal), int(MemUsed), int(SwapTotal), int(SwapFree) return int(MemTotal), int(MemUsed), int(SwapTotal), int(SwapFree)

6
clients/client-psutil.py
View File

@ -28,11 +28,7 @@ def get_uptime():
def get_memory(): def get_memory():
Mem = psutil.virtual_memory() Mem = psutil.virtual_memory()
try: return int(Mem.total / 1024.0), int(Mem.used / 1024.0)
MemUsed = Mem.total - (Mem.cached + Mem.free)
except:
MemUsed = Mem.total - Mem.free
return int(Mem.total/1024.0), int(MemUsed/1024.0)
def get_swap(): def get_swap():
Mem = psutil.swap_memory() Mem = psutil.swap_memory()