mirror of
https://github.com/nicolargo/glances.git
synced 2026-03-13 19:39:08 -04:00
Little hack for a PsUtil issue #152
This commit is contained in:
@@ -747,11 +747,16 @@ class GlancesStats:
|
||||
'cached': cached}
|
||||
|
||||
# Swap
|
||||
virtmem = psutil.swap_memory()
|
||||
self.memswap = {'total': virtmem.total,
|
||||
'used': virtmem.used,
|
||||
'free': virtmem.free,
|
||||
'percent': virtmem.percent}
|
||||
# try... is an hack for issue #152
|
||||
try:
|
||||
virtmem = psutil.swap_memory()
|
||||
except:
|
||||
self.memswap = {}
|
||||
else:
|
||||
self.memswap = {'total': virtmem.total,
|
||||
'used': virtmem.used,
|
||||
'free': virtmem.free,
|
||||
'percent': virtmem.percent}
|
||||
else:
|
||||
# psutil < 0.6
|
||||
# RAM
|
||||
@@ -1709,7 +1714,7 @@ class glancesScreen:
|
||||
|
||||
def displayMem(self, mem, memswap, proclist, offset_x=0):
|
||||
# Memory
|
||||
if not mem or not memswap:
|
||||
if not mem:
|
||||
return 0
|
||||
screen_x = self.screen.getmaxyx()[1]
|
||||
screen_y = self.screen.getmaxyx()[0]
|
||||
@@ -1806,6 +1811,9 @@ class glancesScreen:
|
||||
# If space is NOT available then mind the gap...
|
||||
offset_x -= extblocksize
|
||||
|
||||
if not memswap:
|
||||
return 0
|
||||
|
||||
# Swap
|
||||
self.term_window.addnstr(self.mem_y,
|
||||
self.mem_x + offset_x + 32, _("Swap"), 4,
|
||||
|
||||
@@ -25,6 +25,9 @@
|
||||
|
||||
import unittest
|
||||
import multiprocessing
|
||||
import os
|
||||
import signal
|
||||
import time
|
||||
import glances
|
||||
|
||||
|
||||
@@ -115,6 +118,5 @@ class TestGlancesStat(unittest.TestCase):
|
||||
self.assertTrue(type(sensors) == list)
|
||||
#~ self.assertTrue(len(sensors) > 0)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
Reference in New Issue
Block a user