From 3b1e4b4bfd286c32be0a1413d22ddc991dc00d70 Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Wed, 19 Feb 2020 16:57:35 +0100 Subject: only parse csv output from non-server commands --- src/benchmark.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'src/benchmark.py') diff --git a/src/benchmark.py b/src/benchmark.py index a8ec0c4..8ab9f2b 100644 --- a/src/benchmark.py +++ b/src/benchmark.py @@ -500,6 +500,18 @@ class Benchmark: break os.remove("status") + + # parse perf output if available + if self.measure_cmd == Benchmark.measure_cmd or self.measure_cmd_csv: + csvreader = csv.reader(res.stderr.splitlines(), + delimiter=',') + for row in csvreader: + # Split of the user/kernel space info to be better portable + try: + result[row[2].split(":")[0]] = row[0] + except Exception as e: + print_warn("Exception", e, "occured on", row, "for", + alloc_name, "and", perm) else: result["server_status"] = [] for server in self.servers: @@ -512,17 +524,6 @@ class Benchmark: result[f"{server.get('name', 'Server')}_vmhwm"] = l.split()[1] break - # parse perf output if available - if self.measure_cmd == Benchmark.measure_cmd or self.measure_cmd_csv: - csvreader = csv.reader(res.stderr.splitlines(), - delimiter=',') - for row in csvreader: - # Split of the user/kernel space info to be better portable - try: - result[row[2].split(":")[0]] = row[0] - except Exception as e: - print_warn("Exception", e, "occured on", row, "for", - alloc_name, "and", perm) if hasattr(self, "process_output"): self.process_output(result, res.stdout, res.stderr, -- cgit v1.2.3