[WIP] ApkWorkload: Support multiple activities

We must specify a single activity for each possible uibench activity to
run, which is inconvenient if we want to batch run them in one go.

This is an attempt to allow some flexibility, but I realize this could
be affecting more users and while I did some auditing and did test with
various workloads (geekbench, gfxbench, pcmark) and nothing broke, but
more coverage is required still.

Major question is whether such change makes sense and whether the
approach I've taken is in the right direction?

Signed-off-by: Qais Yousef <[email protected]>

Author: Qais Yousef

wa/framework/workload.py

@@ -178,6 +178,7 @@ class ApkWorkload(Workload):
     package_names = []
     supported_versions = []
     activity = None
+    duration = None
     view = None
     clear_data_on_reset = True
 
@@ -271,10 +272,16 @@ def __init__(self, target, **kwargs):
 
         super(ApkWorkload, self).__init__(target, **kwargs)
 
-        if self.activity is not None and '.' not in self.activity:
-            # If we're receiving just the activity name, it's taken relative to
-            # the package namespace:
-            self.activity = '.' + self.activity
+        if self.activity is not None:
+            activities = self.activity.split()
+            self.activity = ''
+            for activity in activities:
+                if '.' not in activity:
+                    # If we're receiving just the activity name, it's taken relative to
+                    # the package namespace:
+                    self.activity += ' .' + activity
+                else:
+                    self.activity += ' ' + activity
 
         self.apk = PackageHandler(self,
                                   package_name=self.package_name,
@@ -288,6 +295,7 @@ def __init__(self, target, **kwargs):
                                   prefer_host_package=self.prefer_host_package,
                                   clear_data_on_reset=self.clear_data_on_reset,
                                   activity=self.activity,
+                                  duration=self.duration,
                                   min_version=self.min_version,
                                   max_version=self.max_version)
 
@@ -686,7 +694,7 @@ def activity(self):
     def __init__(self, owner, install_timeout=300, version=None, variant=None,
                  package_name=None, strict=False, force_install=False, uninstall=False,
                  exact_abi=False, prefer_host_package=True, clear_data_on_reset=True,
-                 activity=None, min_version=None, max_version=None):
+                 activity=None, duration=None, min_version=None, max_version=None):
         self.logger = logging.getLogger('apk')
         self.owner = owner
         self.target = self.owner.target
@@ -703,6 +711,7 @@ def __init__(self, owner, install_timeout=300, version=None, variant=None,
         self.prefer_host_package = prefer_host_package
         self.clear_data_on_reset = clear_data_on_reset
         self._activity = activity
+        self.duration = duration
         self.supported_abi = self.target.supported_abi
         self.apk_file = None
         self.apk_info = None
@@ -852,18 +861,27 @@ def initialize_package(self, context):
                     self.target.grant_package_permission(self.apk_info.package, permission)
         self.apk_version = host_version
 
-    def start_activity(self):
-        if not self.activity:
-            cmd = 'am start -W {}'.format(self.apk_info.package)
-        else:
-            cmd = 'am start -W -n {}/{}'.format(self.apk_info.package,
-                                                self.activity)
+    def _start_activity(self, cmd):
         output = self.target.execute(cmd)
         if 'Error:' in output:
             # this will dismiss any error dialogs
             self.target.execute('am force-stop {}'.format(self.apk_info.package))
             raise WorkloadError(output)
         self.logger.debug(output)
+        if self.duration:
+            self.target.sleep(self.duration)
+            self.target.execute('am force-stop {}'.format(self.apk_info.package))
+
+    def start_activity(self):
+        if not self.activity:
+            cmd = 'am start -W {}'.format(self.apk_info.package)
+            self._start_activity(cmd)
+        else:
+            for activity in self.activity.split():
+                self.logger.info("Launching {} activity for {} seconds".format(activity, self.duration))
+                cmd = 'am start -W -n {}/{}'.format(self.apk_info.package,
+                                                    activity)
+                self._start_activity(cmd)
 
     def restart_activity(self):
         self.target.execute('am force-stop {}'.format(self.apk_info.package))

wa/workloads/uibench/__init__.py

@@ -49,4 +49,3 @@ class Uibench(ApkWorkload):
 
     def run(self, context):
         super(Uibench, self).run(context)
-        self.target.sleep(self.duration)