diff --git a/tools/profiling/microbenchmarks/bm_diff/bm_diff.py b/tools/profiling/microbenchmarks/bm_diff/bm_diff.py index 796ddac7147859a2aff47cecf179301e1ef21017..c389d03adb4c72a76d9e56cd5ecf1e2ce90776ad 100755 --- a/tools/profiling/microbenchmarks/bm_diff/bm_diff.py +++ b/tools/profiling/microbenchmarks/bm_diff/bm_diff.py @@ -129,9 +129,9 @@ class Benchmark: def row(self, flds): return [self.final[f] if f in self.final else '' for f in flds] - def _read_json(filename): try: + with open(filename) as f: return json.loads(f.read()) except ValueError, e: diff --git a/tools/profiling/microbenchmarks/bm_diff/bm_run.py b/tools/profiling/microbenchmarks/bm_diff/bm_run.py index 9873df04121042e8f3632bdf6c4bccfcc13faf9f..59429299853aa159ac882306cedf88502a4f8e50 100755 --- a/tools/profiling/microbenchmarks/bm_diff/bm_run.py +++ b/tools/profiling/microbenchmarks/bm_diff/bm_run.py @@ -107,7 +107,8 @@ def _collect_bm_data(bm, cfg, name, reps, idx, loops): shortname='%s %s %s %s %d/%d' % (bm, line, cfg, name, idx + 1, loops), verbose_success=True, - timeout_seconds=None)) + timeout_seconds=60*10, + timeout_retries=3)) return jobs_list