[PATCH] rteval: services: Iterate through items in MakeReport

[PATCH] rteval: services: Iterate through items in MakeReport

[John Kacur]

Iterate through items instead of keys in MakeReport.

Signed-off-by: John Kacur <jkacur@redhat.com>
---
 rteval/sysinfo/services.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rteval/sysinfo/services.py b/rteval/sysinfo/services.py
index 283109b9b234..e5de22efc342 100644
--- a/rteval/sysinfo/services.py
+++ b/rteval/sysinfo/services.py
@@ -111,10 +111,10 @@ class SystemServices:
         rep_n = libxml2.newNode("Services")
         rep_n.newProp("init", self.__init)
 
-        for s in srvs:
+        for service, val in srvs.items():
             srv_n = libxml2.newNode("Service")
-            srv_n.newProp("state", srvs[s])
-            srv_n.addContent(s)
+            srv_n.newProp("state", val)
+            srv_n.addContent(service)
             rep_n.addChild(srv_n)
 
         return rep_n
-- 
2.31.1

[PATCH] rteval: Remove mult from hackbench.py

[John Kacur]

The method for calculating the number of jobs to run for hackbench was
changed with the following commit.
commit 67629a1b69ffe72af6bfb3a0d4362ac1920005a7

However, the mult variable which was used to calculate the number of
jobs using the older method was not removed.

Remove it now and simplify the logic.

Signed-off-by: John Kacur <jkacur@redhat.com>
---
 rteval/modules/loads/hackbench.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/rteval/modules/loads/hackbench.py b/rteval/modules/loads/hackbench.py
index ab028c495d8b..8119d50f626a 100644
--- a/rteval/modules/loads/hackbench.py
+++ b/rteval/modules/loads/hackbench.py
@@ -41,7 +41,6 @@ class Hackbench(CommandLineLoad):
     def __init__(self, config, logger):
         CommandLineLoad.__init__(self, "hackbench", config, logger)
 
-
     def _WorkloadSetup(self):
         'calculate arguments based on input parameters'
         (mem, units) = self.memsize
@@ -51,12 +50,10 @@ class Hackbench(CommandLineLoad):
             mem = mem / 1024.0
         elif units == 'TB':
             mem = mem * 1024
+
         ratio = float(mem) / float(self.num_cpus)
-        if ratio >= 0.75:
-            mult = float(self._cfg.setdefault('jobspercore', 2))
-        else:
+        if ratio < 0.75:
             self._log(Log.WARN, "Low memory system (%f GB/core)!" % ratio)
-            mult = 0
 
         sysTop = SysTopology()
         # get the number of nodes
-- 
2.31.1

[PATCH] rteval: Remove self.__err_sleep

[John Kacur]

commit 5ed68ae77ec05786aab99fbed35d0347a5d25997
changed the code to exit gracefully if hackbench failed from memory
errors. No attempt is made anymore to wait to see if memory pressures
ease. The variable __err_sleep however was not removed at the time.
Remove it now, as it is now longer used.

Signed-off-by: John Kacur <jkacur@redhat.com>
---
 rteval/modules/loads/hackbench.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rteval/modules/loads/hackbench.py b/rteval/modules/loads/hackbench.py
index 8119d50f626a..2fb90c1946a5 100644
--- a/rteval/modules/loads/hackbench.py
+++ b/rteval/modules/loads/hackbench.py
@@ -97,7 +97,6 @@ class Hackbench(CommandLineLoad):
                      '-l', str(self._cfg.setdefault('loops', '1000')),
                      '-s', str(self._cfg.setdefault('datasize', '1000'))
                      ]
-        self.__err_sleep = 5.0
 
     def _WorkloadBuild(self):
         # Nothing to build, so we're basically ready
-- 
2.31.1