From 2d863ab102ddec8cd0bc6c2103ba0da5db40d387 Mon Sep 17 00:00:00 2001 From: "Bryan C. Ward" Date: Thu, 18 Apr 2013 16:16:23 -0400 Subject: Minor modifications to run/experiment.py --- config/config.py | 2 +- run/experiment.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/config/config.py b/config/config.py index eed3648..7b6abc2 100644 --- a/config/config.py +++ b/config/config.py @@ -48,6 +48,6 @@ SCHED_EVENTS = range(501, 513) OVH_BASE_EVENTS = ['SCHED', 'RELEASE', 'SCHED2', 'TICK', 'CXS', 'LOCK', 'UNLOCK'] OVH_ALL_EVENTS = ["%s_%s" % (e, t) for (e,t) in itertools.product(OVH_BASE_EVENTS, ["START","END"])] -OVH_ALL_EVENTS += ['RELEASE_LATENCY'] +OVH_ALL_EVENTS += ['RELEASE_LATENCY', 'LOCK_SUSPEND', 'LOCK_RESUME'] # This event doesn't have a START and END OVH_BASE_EVENTS += ['RELEASE_LATENCY'] diff --git a/run/experiment.py b/run/experiment.py index ff0e9f3..7a973f6 100644 --- a/run/experiment.py +++ b/run/experiment.py @@ -157,6 +157,7 @@ class Experiment(object): succ = False try: self.__setup() + time.sleep(1) try: self.__run_tasks() @@ -196,13 +197,15 @@ class Experiment(object): def __setup(self): self.log("Writing %d proc entries" % len(self.proc_entries)) map(methodcaller('write_proc'), self.proc_entries) + + self.log("Starting %d regular tracers" % len(self.regular_tracers)) + map(methodcaller('start_tracing'), self.regular_tracers) + + time.sleep(1) self.log("Switching to %s" % self.scheduler) lu.switch_scheduler(self.scheduler) - self.log("Starting %d regular tracers" % len(self.regular_tracers)) - map(methodcaller('start_tracing'), self.regular_tracers) - self.exec_out = open('%s/exec-out.txt' % self.working_dir, 'w') self.exec_err = open('%s/exec-err.txt' % self.working_dir, 'w') def set_out(executable): -- cgit v1.2.2