From 9d0865d5d4ed433f629811e8372d307b46e6a6d5 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 5 Mar 2016 18:11:00 -0800 Subject: [PATCH] Tools: Fix closing a perf server --- tools/perf.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/perf.py b/tools/perf.py index 82e0713cd..fdf830a77 100755 --- a/tools/perf.py +++ b/tools/perf.py @@ -103,13 +103,16 @@ class PerfServer(object): self.results.append(next(self.reader)) self.iterations -= 1 if self.iterations == 0: - self.socket.send("\n"); - self.reader = None - self.socket.close() - time.sleep(5) - self.socket = None + self.finish() self.iterations = self.ITERATIONS_PER_INSTANCE + def finish(self): + self.socket.send("\n"); + self.reader = None + self.socket.close() + time.sleep(5) + self.socket = None + class Suite(object): def __init__(self, cwd, wall=None, game=None, renderer='software'): self.cwd = cwd @@ -153,6 +156,7 @@ class Suite(object): if test.results: results.append(test.results) if self.server: + self.server.finish() results.extend(self.server.results) return results