aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--wa/framework/execution.py12
-rw-r--r--wa/framework/workload.py8
-rw-r--r--wa/instruments/poller/__init__.py2
-rw-r--r--wa/workloads/dhrystone/__init__.py2
-rw-r--r--wa/workloads/hackbench/__init__.py2
-rw-r--r--wa/workloads/hwuitest/__init__.py2
-rw-r--r--wa/workloads/meabo/__init__.py2
-rw-r--r--wa/workloads/memcpy/__init__.py2
-rw-r--r--wa/workloads/openssl/__init__.py2
-rw-r--r--wa/workloads/recentfling/__init__.py4
-rw-r--r--wa/workloads/rt_app/__init__.py6
-rw-r--r--wa/workloads/stress_ng/__init__.py2
-rw-r--r--wa/workloads/sysbench/__init__.py2
13 files changed, 30 insertions, 18 deletions
diff --git a/wa/framework/execution.py b/wa/framework/execution.py
index 7895513f..a2ebdb54 100644
--- a/wa/framework/execution.py
+++ b/wa/framework/execution.py
@@ -15,6 +15,7 @@
# pylint: disable=no-member
+import hashlib
import logging
import os
import shutil
@@ -181,6 +182,17 @@ class ExecutionContext(object):
def write_state(self):
self.run_output.write_state()
+ def get_resource(self, resource, strict=True):
+ result = self.resolver.get(resource, strict)
+ if os.path.isfile(result):
+ with open(result, 'rb') as fh:
+ md5hash = hashlib.md5(fh.read())
+ key = '{}/{}'.format(resource.owner, os.path.basename(result))
+ self.update_metadata('hashes', key, md5hash.hexdigest())
+ return result
+
+ get = get_resource # alias to allow a context to act as a resolver
+
def get_metric(self, name):
try:
return self.output.get_metric(name)
diff --git a/wa/framework/workload.py b/wa/framework/workload.py
index c6ed4006..4bc02e0d 100644
--- a/wa/framework/workload.py
+++ b/wa/framework/workload.py
@@ -73,7 +73,7 @@ class Workload(TargetedPlugin):
self.asset_files = []
self.deployed_assets = []
- def init_resources(self, context):
+ def init_resources(self, resolver):
"""
This method may be used to perform early resource discovery and
initialization. This is invoked during the initial loading stage and
@@ -83,7 +83,7 @@ class Workload(TargetedPlugin):
"""
for asset in self.deployable_assets:
- self.asset_files.append(context.resolver.get(File(self, asset)))
+ self.asset_files.append(resolver.get(File(self, asset)))
@once_per_instance
def initialize(self, context):
@@ -689,7 +689,7 @@ class PackageHandler(object):
def resolve_package_from_host(self, context):
self.logger.debug('Resolving package on host system')
if self.package_name:
- self.apk_file = context.resolver.get(ApkFile(self.owner,
+ self.apk_file = context.get_resource(ApkFile(self.owner,
variant=self.variant,
version=self.version,
package=self.package_name,
@@ -699,7 +699,7 @@ class PackageHandler(object):
else:
available_packages = []
for package in self.owner.package_names:
- apk_file = context.resolver.get(ApkFile(self.owner,
+ apk_file = context.get_resource(ApkFile(self.owner,
variant=self.variant,
version=self.version,
package=package,
diff --git a/wa/instruments/poller/__init__.py b/wa/instruments/poller/__init__.py
index d88b3fc0..6a76c48a 100644
--- a/wa/instruments/poller/__init__.py
+++ b/wa/instruments/poller/__init__.py
@@ -70,7 +70,7 @@ class FilePoller(Instrument):
def initialize(self, context):
if not self.target.is_rooted and self.as_root:
raise ConfigError('The target is not rooted, cannot run poller as root.')
- host_poller = context.resolver.get(Executable(self, self.target.abi,
+ host_poller = context.get_resource(Executable(self, self.target.abi,
"poller"))
target_poller = self.target.install(host_poller)
diff --git a/wa/workloads/dhrystone/__init__.py b/wa/workloads/dhrystone/__init__.py
index 23b98b88..7e194194 100644
--- a/wa/workloads/dhrystone/__init__.py
+++ b/wa/workloads/dhrystone/__init__.py
@@ -76,7 +76,7 @@ class Dhrystone(Workload):
@once
def initialize(self, context):
resource = Executable(self, self.target.abi, 'dhrystone')
- host_exe = context.resolver.get(resource)
+ host_exe = context.get_resource(resource)
Dhrystone.target_exe = self.target.install(host_exe)
def setup(self, context):
diff --git a/wa/workloads/hackbench/__init__.py b/wa/workloads/hackbench/__init__.py
index 2c8eebfc..70a2550f 100644
--- a/wa/workloads/hackbench/__init__.py
+++ b/wa/workloads/hackbench/__init__.py
@@ -62,7 +62,7 @@ class Hackbench(Workload):
@once
def initialize(self, context):
- host_binary = context.resolver.get(Executable(self, self.target.abi, self.binary_name))
+ host_binary = context.get_resource(Executable(self, self.target.abi, self.binary_name))
Hackbench.target_binary = self.target.install(host_binary)
def setup(self, context):
diff --git a/wa/workloads/hwuitest/__init__.py b/wa/workloads/hwuitest/__init__.py
index df886318..074153f2 100644
--- a/wa/workloads/hwuitest/__init__.py
+++ b/wa/workloads/hwuitest/__init__.py
@@ -63,7 +63,7 @@ class HWUITest(Workload):
@once
def initialize(self, context):
- host_exe = context.resolver.get(Executable(self,
+ host_exe = context.get_resource(Executable(self,
self.target.abi,
BINARY))
HWUITest.target_exe = self.target.install(host_exe)
diff --git a/wa/workloads/meabo/__init__.py b/wa/workloads/meabo/__init__.py
index 524e709c..c3b8244e 100644
--- a/wa/workloads/meabo/__init__.py
+++ b/wa/workloads/meabo/__init__.py
@@ -308,7 +308,7 @@ class Meabo(Workload):
@once
def _install_executable(self, context):
resource = Executable(self, self.target.abi, 'meabo')
- host_exe = context.resolver.get(resource)
+ host_exe = context.get_resource(resource)
Meabo.target_exe = self.target.install(host_exe)
@once
diff --git a/wa/workloads/memcpy/__init__.py b/wa/workloads/memcpy/__init__.py
index 6861dbf0..d97f7969 100644
--- a/wa/workloads/memcpy/__init__.py
+++ b/wa/workloads/memcpy/__init__.py
@@ -65,7 +65,7 @@ class Memcpy(Workload):
def initialize(self, context):
self.binary_name = 'memcpy'
resource = Executable(self, self.target.abi, self.binary_name)
- host_binary = context.resolver.get(resource)
+ host_binary = context.get_resource(resource)
Memcpy.target_exe = self.target.install_if_needed(host_binary)
def setup(self, context):
diff --git a/wa/workloads/openssl/__init__.py b/wa/workloads/openssl/__init__.py
index 6ecbb81a..6a011389 100644
--- a/wa/workloads/openssl/__init__.py
+++ b/wa/workloads/openssl/__init__.py
@@ -62,7 +62,7 @@ class Openssl(Workload):
Openssl.target_exe = 'openssl'
else:
resource = Executable(self, self.target.abi, 'openssl')
- host_exe = context.resolver.get(resource)
+ host_exe = context.get_resource(resource)
Openssl.target_exe = self.target.install(host_exe)
def setup(self, context):
diff --git a/wa/workloads/recentfling/__init__.py b/wa/workloads/recentfling/__init__.py
index 634c376d..31e5437a 100644
--- a/wa/workloads/recentfling/__init__.py
+++ b/wa/workloads/recentfling/__init__.py
@@ -71,9 +71,9 @@ class Recentfling(Workload):
raise WorkloadError("This workload relies on ``dumpsys gfxinfo`` \
only present in Android M and onwards")
- defs_host = context.resolver.get(File(self, "defs.sh"))
+ defs_host = context.get_resource(File(self, "defs.sh"))
Recentfling.defs_target = self.target.install(defs_host)
- recentfling_host = context.resolver.get(File(self, "recentfling.sh"))
+ recentfling_host = context.get_resource(File(self, "recentfling.sh"))
Recentfling.recentfling_target = self.target.install(recentfling_host)
def setup(self, context):
diff --git a/wa/workloads/rt_app/__init__.py b/wa/workloads/rt_app/__init__.py
index 7fb6caaf..217e3249 100644
--- a/wa/workloads/rt_app/__init__.py
+++ b/wa/workloads/rt_app/__init__.py
@@ -149,10 +149,10 @@ class RtApp(Workload):
# available to other instances of the workload
RtApp.target_working_directory = self.target.path.join(self.target.working_directory,
'rt-app-working')
- RtApp.host_binary = context.resolver.get(Executable(self,
+ RtApp.host_binary = context.get_resource(Executable(self,
self.target.abi,
BINARY_NAME), strict=False)
- RtApp.workgen_script = context.resolver.get(File(self, 'workgen'))
+ RtApp.workgen_script = context.get_resource(File(self, 'workgen'))
self.target.execute('mkdir -p {}'.format(self.target_working_directory))
self._deploy_rt_app_binary_if_necessary()
@@ -228,7 +228,7 @@ class RtApp(Workload):
RtApp.target_binary = self.target.install(self.host_binary)
def _load_json_config(self, context):
- user_config_file = self._get_raw_json_config(context.resolver)
+ user_config_file = self._get_raw_json_config(context)
config_file = self._generate_workgen_config(user_config_file,
context.output_directory)
with open(config_file) as fh:
diff --git a/wa/workloads/stress_ng/__init__.py b/wa/workloads/stress_ng/__init__.py
index 885e66e2..b4a9d53d 100644
--- a/wa/workloads/stress_ng/__init__.py
+++ b/wa/workloads/stress_ng/__init__.py
@@ -80,7 +80,7 @@ class StressNg(Workload):
raise WorkloadError('stress-ng requires root premissions to run')
resource = Executable(self, self.target.abi, 'stress-ng')
- host_exe = context.resolver.get(resource)
+ host_exe = context.get_resource(resource)
StressNg.binary = self.target.install(host_exe)
def setup(self, context):
diff --git a/wa/workloads/sysbench/__init__.py b/wa/workloads/sysbench/__init__.py
index 749b23c4..5ebb7b5b 100644
--- a/wa/workloads/sysbench/__init__.py
+++ b/wa/workloads/sysbench/__init__.py
@@ -106,7 +106,7 @@ class Sysbench(Workload):
@once
def initialize(self, context):
exe = Executable(self, self.target.abi, 'sysbench')
- host_binary = context.resolver.get(exe)
+ host_binary = context.get_resource(exe)
Sysbench.target_binary = self.target.install(host_binary)
def setup(self, context):
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-19 17:05:10 +0000