Initial priority implementation

- Fixed up some of the signal map for instrumentation
- Changed how priorites are specified -- no longer method name prefixes
  but dedicated decorators, including an easy way of specifying a custom
  priority level (no longer need to manually connect signals)
- Updated ExecutionTimeInstrument to work with the new system
- Also removed some dead code

wa/framework/execution.py

@@ -189,132 +189,6 @@ class ExecutionContext(object):
                          classifiers=None):
         self.run_output.add_artifact(name, path, kind, description, classifiers)
 
-class OldExecutionContext(object):
-    """
-    Provides a context for instrumentation. Keeps track of things like
-    current workload and iteration.
-
-    This class also provides two status members that can be used by workloads
-    and instrumentation to keep track of arbitrary state. ``result``
-    is reset on each new iteration of a workload; run_status is maintained
-    throughout a Workload Automation run.
-
-    """
-
-    # These are the artifacts generated by the core framework.
-    default_run_artifacts = [
-        Artifact('runlog', 'run.log', 'log', mandatory=True,
-                 description='The log for the entire run.'),
-    ]
-
-    @property
-    def current_iteration(self):
-        if self.current_job:
-            spec_id = self.current_job.spec.id
-            return self.job_iteration_counts[spec_id]
-        else:
-            return None
-
-    @property
-    def job_status(self):
-        if not self.current_job:
-            return None
-        return self.current_job.result.status
-
-    @property
-    def workload(self):
-        return getattr(self.spec, 'workload', None)
-
-    @property
-    def spec(self):
-        return getattr(self.current_job, 'spec', None)
-
-    @property
-    def result(self):
-        return getattr(self.current_job, 'result', self.run_result)
-
-    def __init__(self, device_manager, config):
-        self.device_manager = device_manager
-        self.device = self.device_manager.target
-        self.config = config
-        self.reboot_policy = config.reboot_policy
-        self.output_directory = None
-        self.current_job = None
-        self.resolver = None
-        self.last_error = None
-        self.run_info = None
-        self.run_result = None
-        self.run_output_directory = self.config.output_directory
-        self.host_working_directory = self.config.meta_directory
-        self.iteration_artifacts = None
-        self.run_artifacts = copy(self.default_run_artifacts)
-        self.job_iteration_counts = defaultdict(int)
-        self.aborted = False
-        self.runner = None
-
-    def initialize(self):
-        if not os.path.isdir(self.run_output_directory):
-            os.makedirs(self.run_output_directory)
-        self.output_directory = self.run_output_directory
-        self.resolver = ResourceResolver(self.config)
-        self.run_info = RunInfo(self.config)
-        self.run_result = RunResult(self.run_info, self.run_output_directory)
-
-    def next_job(self, job):
-        """Invoked by the runner when starting a new iteration of workload execution."""
-        self.current_job = job
-        self.job_iteration_counts[self.spec.id] += 1
-        if not self.aborted:
-            outdir_name = '_'.join(map(str, [self.spec.label, self.spec.id, self.current_iteration]))
-            self.output_directory = _d(os.path.join(self.run_output_directory, outdir_name))
-            self.iteration_artifacts = [wa for wa in self.workload.artifacts]
-        self.current_job.result.iteration = self.current_iteration
-        self.current_job.result.output_directory = self.output_directory
-
-    def end_job(self):
-        if self.current_job.result.status == JobStatus.ABORTED:
-            self.aborted = True
-        self.current_job = None
-        self.output_directory = self.run_output_directory
-
-    def add_metric(self, *args, **kwargs):
-        self.result.add_metric(*args, **kwargs)
-
-    def add_artifact(self, name, path, kind, *args, **kwargs):
-        if self.current_job is None:
-            self.add_run_artifact(name, path, kind, *args, **kwargs)
-        else:
-            self.add_iteration_artifact(name, path, kind, *args, **kwargs)
-
-    def add_run_artifact(self, name, path, kind, *args, **kwargs):
-        path = _check_artifact_path(path, self.run_output_directory)
-        self.run_artifacts.append(Artifact(name, path, kind, Artifact.ITERATION, *args, **kwargs))
-
-    def add_iteration_artifact(self, name, path, kind, *args, **kwargs):
-        path = _check_artifact_path(path, self.output_directory)
-        self.iteration_artifacts.append(Artifact(name, path, kind, Artifact.RUN, *args, **kwargs))
-
-    def get_artifact(self, name):
-        if self.iteration_artifacts:
-            for art in self.iteration_artifacts:
-                if art.name == name:
-                    return art
-        for art in self.run_artifacts:
-            if art.name == name:
-                return art
-        return None
-
-
-def _check_artifact_path(path, rootpath):
-    if path.startswith(rootpath):
-        return os.path.abspath(path)
-    rootpath = os.path.abspath(rootpath)
-    full_path = os.path.join(rootpath, path)
-    if not os.path.isfile(full_path):
-        msg = 'Cannot add artifact because {} does not exist.'
-        raise ValueError(msg.format(full_path))
-    return full_path
-
 
 class Executor(object):
     """
@@ -380,7 +254,10 @@ class Executor(object):
 
         self.logger.info('Starting run')
         runner = Runner(context)
+        signal.send(signal.RUN_STARTED, self)
         runner.run()
+        #TODO: postamble goes here.
+        signal.send(signal.RUN_COMPLETED, self)
 
     def execute_postamble(self):
         """
@@ -430,7 +307,6 @@ class Runner(object):
         self.config = self.context.cm
 
     def run(self):
-        self.send(signal.RUN_STARTED)
         try:
             self.initialize_run()
             self.send(signal.RUN_INITIALIZED)
@@ -446,7 +322,7 @@ class Runner(object):
             raise e
         finally:
             self.finalize_run()
-            self.send(signal.RUN_COMPLETED)
+            self.send(signal.RUN_FINALIZED)
 
     def initialize_run(self):
         self.logger.info('Initializing run')