diff --git a/wa/__init__.py b/wa/__init__.py index 5c13f199..5b25be90 100644 --- a/wa/__init__.py +++ b/wa/__init__.py @@ -8,8 +8,8 @@ from wa.framework.exception import (OutputProcessorError, ResourceError, from wa.framework.exception import (WAError, NotFoundError, ValidationError, WorkloadError) from wa.framework.exception import WorkerThreadError, PluginLoaderError -from wa.framework.instruments import (Instrument, very_slow, slow, normal, fast, - very_fast) +from wa.framework.instrument import (Instrument, very_slow, slow, normal, fast, + very_fast) from wa.framework.output import RunOutput, discover_wa_outputs from wa.framework.plugin import Plugin, Parameter from wa.framework.output_processor import OutputProcessor diff --git a/wa/framework/execution.py b/wa/framework/execution.py index 4657028b..10a8c548 100644 --- a/wa/framework/execution.py +++ b/wa/framework/execution.py @@ -20,7 +20,7 @@ from copy import copy from datetime import datetime import wa.framework.signal as signal -from wa.framework import instruments +from wa.framework import instrument from wa.framework.configuration.core import Status from wa.framework.exception import HostError, WorkloadError from wa.framework.job import Job @@ -302,9 +302,9 @@ class Executor(object): output.write_state() self.logger.info('Installing instruments') - for instrument in config_manager.get_instruments(self.target_manager.target): - instruments.install(instrument, context) - instruments.validate() + for instrument_name in config_manager.get_instruments(self.target_manager.target): + instrument.install(instrument_name, context) + instrument.validate() self.logger.info('Installing output processors') pm = ProcessorManager() diff --git a/wa/framework/instruments.py b/wa/framework/instrument.py similarity index 100% rename from wa/framework/instruments.py rename to wa/framework/instrument.py diff --git a/wa/framework/job.py b/wa/framework/job.py index e1dfe3f7..4d6d0ee3 100644 --- a/wa/framework/job.py +++ b/wa/framework/job.py @@ -2,7 +2,7 @@ import logging from copy import copy from datetime import datetime -from wa.framework import pluginloader, signal, instruments +from wa.framework import pluginloader, signal, instrument from wa.framework.configuration.core import Status # Because of use of Enum (dynamic attrs) @@ -72,7 +72,7 @@ class Job(object): def configure_augmentations(self, context, pm): instruments_to_enable = set() output_processors_to_enable = set() - enabled_instruments = set(i.name for i in instruments.get_enabled()) + enabled_instruments = set(i.name for i in instrument.get_enabled()) enabled_output_processors = set(p.name for p in pm.get_enabled()) for augmentation in self.spec.augmentations.values(): @@ -83,11 +83,11 @@ class Job(object): output_processors_to_enable.add(augmentation) # Disable unrequired instruments - for instrument in enabled_instruments.difference(instruments_to_enable): - instruments.disable(instrument) + for instrument_name in enabled_instruments.difference(instruments_to_enable): + instrument.disable(instrument_name) # Enable additional instruments - for instrument in instruments_to_enable.difference(enabled_instruments): - instruments.enable(instrument) + for instrument_name in instruments_to_enable.difference(enabled_instruments): + instrument.enable(instrument_name) # Disable unrequired output_processors for processor in enabled_output_processors.difference(output_processors_to_enable): diff --git a/wa/framework/output_processor.py b/wa/framework/output_processor.py index 7caab3a9..0fd84adb 100644 --- a/wa/framework/output_processor.py +++ b/wa/framework/output_processor.py @@ -2,7 +2,7 @@ import logging from wa.framework import pluginloader from wa.framework.exception import ConfigError -from wa.framework.instruments import is_installed +from wa.framework.instrument import is_installed from wa.framework.plugin import Plugin from wa.utils.log import log_error, indent, dedent from wa.utils.misc import isiterable diff --git a/wa/instruments/dmesg.py b/wa/instruments/dmesg.py index 8353188e..48036a83 100644 --- a/wa/instruments/dmesg.py +++ b/wa/instruments/dmesg.py @@ -18,7 +18,7 @@ import os from wa import Instrument, Parameter from wa.framework.exception import InstrumentError -from wa.framework.instruments import slow +from wa.framework.instrument import slow from wa.utils.misc import ensure_file_directory_exists as _f class DmesgInstrument(Instrument): diff --git a/wa/instruments/hwmon.py b/wa/instruments/hwmon.py index 33e80a22..8c6caebe 100644 --- a/wa/instruments/hwmon.py +++ b/wa/instruments/hwmon.py @@ -16,7 +16,7 @@ from devlib import HwmonInstrument as _Instrument from wa import Instrument -from wa.framework.instruments import fast +from wa.framework.instrument import fast MOMENTARY_QUANTITIES = ['temperature', 'power', 'voltage', 'current', 'fps'] CUMULATIVE_QUANTITIES = ['energy', 'tx', 'tx/rx', 'frames'] diff --git a/wa/instruments/misc.py b/wa/instruments/misc.py index eed3f642..f9eae9c5 100644 --- a/wa/instruments/misc.py +++ b/wa/instruments/misc.py @@ -39,7 +39,7 @@ from devlib.utils.android import ApkInfo from wa import Instrument, Parameter, very_fast from wa.framework.exception import ConfigError -from wa.framework.instruments import slow +from wa.framework.instrument import slow from wa.utils.misc import as_relative, diff_tokens, write_table from wa.utils.misc import ensure_file_directory_exists as _f from wa.utils.misc import ensure_directory_exists as _d diff --git a/wa/instruments/trace_cmd.py b/wa/instruments/trace_cmd.py index c2f5438e..f5190300 100644 --- a/wa/instruments/trace_cmd.py +++ b/wa/instruments/trace_cmd.py @@ -22,7 +22,7 @@ from devlib import FtraceCollector from wa import Instrument, Parameter from wa.framework import signal -from wa.framework.instruments import very_slow +from wa.framework.instrument import very_slow from wa.framework.exception import InstrumentError from wa.utils.types import list_of_strings from wa.utils.misc import which