diff options
Diffstat (limited to 'libs/utils/executor.py')
| -rw-r--r-- | libs/utils/executor.py | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/libs/utils/executor.py b/libs/utils/executor.py index 7c7060b..4170669 100644 --- a/libs/utils/executor.py +++ b/libs/utils/executor.py @@ -166,10 +166,17 @@ class Executor(): Number of iterations for each workload/conf combination. Default is 1. :type experiments_conf: dict + + :ivar experiments: After calling `meth`:run:, the list of + :class:`Experiment` s that were run + + :ivar iterations: The number of iterations run for each wload/conf pair + (i.e. ``experiments_conf['iterations']``. + """ critical_tasks = { - 'linux': ['init', 'systemd', 'sh', 'ssh'], + 'linux': ['init', 'systemd', 'sh', 'ssh', 'rsyslogd', 'jbd2'], 'android': [ 'sh', 'adbd', 'usb', 'transport', @@ -215,9 +222,9 @@ class Executor(): self.te = test_env self.target = self.te.target - self._iterations = self._experiments_conf.get('iterations', 1) + self.iterations = self._experiments_conf.get('iterations', 1) # Compute total number of experiments - self._exp_count = self._iterations \ + self._exp_count = self.iterations \ * len(self._experiments_conf['wloads']) \ * len(self._experiments_conf['confs']) @@ -233,7 +240,7 @@ class Executor(): self._log.info(' %3d workloads (%d iterations each)', len(self._experiments_conf['wloads']), - self._iterations) + self.iterations) wload_confs = ', '.join(self._experiments_conf['wloads']) self._log.info(' %s', wload_confs) @@ -261,7 +268,7 @@ class Executor(): for wl_idx in self._experiments_conf['wloads']: # TEST: configuration wload, test_dir = self._wload_init(tc, wl_idx) - for itr_idx in range(1, self._iterations + 1): + for itr_idx in range(1, self.iterations + 1): exp = Experiment( wload_name=wl_idx, wload=wload, @@ -578,10 +585,10 @@ class Executor(): if conf['class'] == 'custom': rtapp = wlgen.RTA(self.target, - wl_idx, calibration = self.te.calib) + wl_idx, calibration = self.te.calibration()) rtapp.conf(kind='custom', params=conf['json'], - duration=conf['duration'], + duration=conf.get('duration'), loadref=loadref, cpus=cpus, run_dir=self.te.run_dir) return rtapp @@ -663,7 +670,7 @@ class Executor(): self._print_title('Experiment {}/{}, [{}:{}] {}/{}'\ .format(exp_idx, self._exp_count, tc_idx, experiment.wload_name, - experiment.iteration, self._iterations)) + experiment.iteration, self.iterations)) # Setup local results folder self._log.debug('out_dir set to [%s]', experiment.out_dir) |