From 1bb96c51fe720e5ef8466aa0b2eb1619bd949204 Mon Sep 17 00:00:00 2001 From: Jelte Jansen Date: Thu, 9 Aug 2012 16:24:18 +0200 Subject: [PATCH] [2172] use 3-tuple instead of fixed-size list for loadavg --- src/bin/sysinfo/sysinfo.py.in | 3 +-- src/lib/python/isc/sysinfo/sysinfo.py | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/bin/sysinfo/sysinfo.py.in b/src/bin/sysinfo/sysinfo.py.in index 1de2a781a0..24cf309a31 100755 --- a/src/bin/sysinfo/sysinfo.py.in +++ b/src/bin/sysinfo/sysinfo.py.in @@ -90,8 +90,7 @@ def main(): write_value(f, ' + Hostname: %s\n', s.get_platform_hostname) write_value(f, ' + Uptime: %d seconds\n', s.get_uptime) - l = s.get_loadavg() - f.write(' + Loadavg: %f %f %f\n' % (l[0], l[1], l[2])) + write_value(f, ' + Loadavg: %f %f %f\n', s.get_loadavg) f.write('\nMemory\n'); write_value(f, ' + Total: %d bytes\n', s.get_mem_total) diff --git a/src/lib/python/isc/sysinfo/sysinfo.py b/src/lib/python/isc/sysinfo/sysinfo.py index 24b92237d3..c3238142a9 100644 --- a/src/lib/python/isc/sysinfo/sysinfo.py +++ b/src/lib/python/isc/sysinfo/sysinfo.py @@ -164,7 +164,7 @@ class SysInfoLinux(SysInfoPOSIX): with open('/proc/loadavg') as f: l = f.read().strip().split(' ') if len(l) >= 3: - self._loadavg = [float(l[0]), float(l[1]), float(l[2])] + self._loadavg = (float(l[0]), float(l[1]), float(l[2])) with open('/proc/meminfo') as f: m = f.readlines() @@ -315,7 +315,7 @@ class SysInfoOpenBSD(SysInfoBSD): s = subprocess.check_output(['sysctl', '-n', 'vm.loadavg']) l = s.decode('utf-8').strip().split(' ') if len(l) >= 3: - self._loadavg = [float(l[0]), float(l[1]), float(l[2])] + self._loadavg = (float(l[0]), float(l[1]), float(l[2])) except (subprocess.CalledProcessError, OSError): pass @@ -370,7 +370,7 @@ class SysInfoFreeBSDOSX(SysInfoBSD): else: la = l.split(' ') if len(la) >= 3: - self._loadavg = [float(la[0]), float(la[1]), float(la[2])] + self._loadavg = (float(la[0]), float(la[1]), float(la[2])) except (subprocess.CalledProcessError, OSError): pass -- GitLab