diff --git a/dom0/qmemman/qmemman.py b/dom0/qmemman/qmemman.py index 8ec73715..b352d95a 100755 --- a/dom0/qmemman/qmemman.py +++ b/dom0/qmemman/qmemman.py @@ -50,7 +50,7 @@ class SystemState: dict[string.rstrip(l2[0], ":")] = l2[1] try: - for i in ('MemFree', 'Buffers', 'Cached', 'SwapTotal', 'SwapFree'): + for i in ('MemTotal', 'MemFree', 'Buffers', 'Cached', 'SwapTotal', 'SwapFree'): val = int(dict[i])*1024 if (val < 0): return None diff --git a/dom0/qmemman/qmemman_algo.py b/dom0/qmemman/qmemman_algo.py index b0c9cd1e..c34a1f95 100755 --- a/dom0/qmemman/qmemman_algo.py +++ b/dom0/qmemman/qmemman_algo.py @@ -2,7 +2,7 @@ def is_suspicious(dom): ret = False if dom.meminfo['SwapTotal'] < dom.meminfo['SwapFree']: ret = True - if dom.memory_actual < dom.meminfo['MemFree'] + dom.meminfo['Cached'] + dom.meminfo['Buffers']: + if dom.meminfo['MemTotal'] < dom.meminfo['MemFree'] + dom.meminfo['Cached'] + dom.meminfo['Buffers']: ret = True if ret: print 'suspicious meminfo for domain', dom.id, 'mem actual', dom.memory_actual, dom.meminfo @@ -17,7 +17,7 @@ def recalc_mem_used(domdict): dom.meminfo = None dom.mem_used = None else: - dom.mem_used = dom.memory_actual - dom.meminfo['MemFree'] - dom.meminfo['Cached'] - dom.meminfo['Buffers'] + dom.meminfo['SwapTotal'] - dom.meminfo['SwapFree'] + dom.mem_used = dom.meminfo['MemTotal'] - dom.meminfo['MemFree'] - dom.meminfo['Cached'] - dom.meminfo['Buffers'] + dom.meminfo['SwapTotal'] - dom.meminfo['SwapFree'] def prefmem(dom): if dom.meminfo_updated: