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

fix memory cal

pull/55/head
macos 2019-05-16 17:50:16 +08:00
parent 525eda6bc7
commit fa84260a61
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clients/client-linux.py
View File

@ -40,11 +40,8 @@ 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'])
MemExactCache = float(result['Cached'])+float(result['SReclaimable'])-float(result['Shmem']) MemUsed = MemTotal-float(result['MemFree'])-float(result['Buffers'])-float(result['Cached'])-float(result['SReclaimable'])
MemUsed = MemTotal-float(result['MemFree'])-(float(result['Buffers'])+MemExactCache)
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)