fix huge pages info in report tool

Author: vadv

mamonsu/tools/report/format.py

@@ -33,7 +33,7 @@ def __getattr__(self, name):
 
 # int (bytes) => str (human readable)
 def humansize_bytes(nbytes):
-    fmt = '{0:6} {1}'
+    fmt = '{0:>6} {1}'
     if not isinstance(nbytes, int):
         return 'ERROR'
     if nbytes == 0:

mamonsu/tools/report/os_linux.py

@@ -57,7 +57,8 @@ def printable_info(self):
         out += key_val_h1('Cached', humansize_bytes(self.meminfo['_CACHED']))
         out += key_val_h1('Buffers', humansize_bytes(self.meminfo['_BUFFERS']))
         out += key_val_h1('Dirty', humansize_bytes(self.meminfo['_DIRTY']))
-        out += key_val_h1('HugePages', humansize_bytes(self.meminfo['_HUGEPAGES']))
+        out += key_val_h1('HP Total', humansize_bytes(self.meminfo['_HUGEPAGES_SIZE']))
+        out += key_val_h1('HP Free', humansize_bytes(self.meminfo['_HUGEPAGES_FREE']))
         out += key_val_h1('SwapTotal', humansize_bytes(self.meminfo['_SWAPTOTAL']))
         out += key_val_h1('SwapUsed', humansize_bytes(self.meminfo['_SWAPUSED']))
         out += header_h1('TOP (by memory)')

mamonsu/tools/sysinfo/linux.py

@@ -319,7 +319,8 @@ def _meminfo(self):
                 '_RAW', '_TOTAL', '_COMMITED', '_COMMITEDLIMIT',
                 '_FREE', '_SWAPUSED', '_SLAB'
                 '_SWAPTOTAL', '_CACHED', '_DIRTY', '_BUFFERS',
-                '_HUGEPAGES', '_SHMEM', '_PAGETABLES']:
+                '_HUGEPAGES_SIZE', '_HUGEPAGES_FREE',
+                '_SHMEM', '_PAGETABLES']:
             result[key] = NA
 
         if self.is_empty(data):
@@ -328,6 +329,8 @@ def _meminfo(self):
         result['_RAW'] = data
         for info in re.findall(r'^(\S+)\:\s+(\d+)\s+kB$', data, re.M):
             result[info[0]] = int(info[1]) * 1024
+        for info in re.findall(r'^(\S+)\:\s+(\d+)$', data, re.M):
+            result[info[0]] = int(info[1])
         if 'MemTotal' in result:
             result['_TOTAL'] = result['MemTotal']
         if 'CommitLimit' in result:
@@ -340,8 +343,11 @@ def _meminfo(self):
             result['_SWAPTOTAL'] = result['SwapTotal']
         if 'SwapTotal' in result and 'SwapFree' in result:
             result['_SWAPUSED'] = result['SwapTotal'] - result['SwapFree']
-        if 'HugePages_Total' in result:
-            result['_HUGEPAGES'] = result['HugePages_Total']
+        if 'Hugepagesize' in result:
+            if 'HugePages_Total' in result:
+                result['_HUGEPAGES_SIZE'] = result['Hugepagesize'] * result['HugePages_Total']
+            if 'HugePages_Free' in result:
+                result['_HUGEPAGES_FREE'] = result['Hugepagesize'] * result['HugePages_Free']
         if 'Cached' in result:
             result['_CACHED'] = result['Cached']
         if 'Dirty' in result: