examples/android/workloads: fix Android_Workloads notebook

 - There is no longer a get method for Workload, use getInstance
   instead.
 - All pre-/post-workload setup is now done in the benchmark's run
   method (start and stop tracing, unlocking, setting brightness, etc.).
   There is no need to have them in our experiment function.
 - Add a few other benchmark runs.

Signed-off-by: Ionela Voinescu <ionela.voinescu@arm.com>
diff --git a/ipynb/examples/android/workloads/Android_Workloads.ipynb b/ipynb/examples/android/workloads/Android_Workloads.ipynb
index cce3b94..964adb5 100644
--- a/ipynb/examples/android/workloads/Android_Workloads.ipynb
+++ b/ipynb/examples/android/workloads/Android_Workloads.ipynb
@@ -22,8 +22,8 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "2016-12-09 17:56:46,425 INFO    : root         : Using LISA logging configuration:\n",
-      "2016-12-09 17:56:46,426 INFO    : root         :   /home/vagrant/lisa/logging.conf\n"
+      "2017-03-14 11:05:03,363 INFO    : root         : Using LISA logging configuration:\n",
+      "2017-03-14 11:05:03,364 INFO    : root         :   /home/vagrant/lisa/logging.conf\n"
      ]
     }
    ],
@@ -61,8 +61,6 @@
     "import devlib\n",
     "from env import TestEnv\n",
     "\n",
-    "# from devlib.utils.android import adb_command\n",
-    "\n",
     "# Import support for Android devices\n",
     "from android import Screen, Workload, System\n",
     "\n",
@@ -135,7 +133,7 @@
     "                .replace('?t=', '_')\n",
     "            \n",
     "    # Check for workload being available\n",
-    "    wload = Workload.get(te, wload_kind)\n",
+    "    wload = Workload.getInstance(te, wload_kind)\n",
     "    if not wload:\n",
     "        return {}\n",
     "    \n",
@@ -144,96 +142,34 @@
     "    os.system('mkdir -p {}'.format(exp_dir));\n",
     "\n",
     "    # Configure governor\n",
-    "    confs[conf_name]['set']()\n",
-    "    \n",
-    "    # Unlock device screen (assume no password required)\n",
-    "    target.execute('input keyevent 82')\n",
-    "    # Configure screen to max brightness and no dimming\n",
-    "    Screen.set_brightness(target, percent=100)\n",
-    "    Screen.set_dim(target, auto=False)\n",
-    "    Screen.set_timeout(target, 60*60*10) # 10 hours should be enought for an experiment\n",
-    "    \n",
-    "    ####################################\n",
-    "    # Start the required tracing command\n",
-    "    \n",
-    "    if 'ftrace' in collect:\n",
-    "        # Start FTrace and Energy monitoring\n",
-    "        te.ftrace.start()\n",
-    "    elif 'systrace' in collect:\n",
-    "        # Get the systrace time\n",
-    "        match = re.search(r'systrace_([0-9]+)', collect)\n",
-    "        if match:\n",
-    "            systrace_time = match.group(1)\n",
-    "        else:\n",
-    "            logging.warning(\"Systrace time NOT defined, tracing for 10[s]\")\n",
-    "            systrace_time = 10\n",
-    "        # Start systrace\n",
-    "        trace_file = os.path.join(te.res_dir, 'trace.html')\n",
-    "        systrace_output = System.systrace_start(te, trace_file, systrace_time)\n",
-    "    \n",
+    "    confs[conf_name]['set']()    \n",
     "    \n",
     "    ###########################\n",
     "    # Run the required workload\n",
     "    \n",
     "    # Jankbench\n",
     "    if 'Jankbench' in wload_name:\n",
-    "        db_file, nrg_report = wload.run(exp_dir, wload_tag, iterations, collect)\n",
+    "        wload.run(exp_dir, wload_tag, iterations, collect)\n",
     "\n",
     "    # UiBench\n",
     "    elif 'UiBench' in wload_name:\n",
     "        test_name = wload_name.split()[2]\n",
     "        duration_s = int(wload_name.split()[3])\n",
-    "        db_file, nrg_report = wload.run(exp_dir, test_name, duration_s)\n",
+    "        wload.run(exp_dir, test_name, duration_s, collect)\n",
     "\n",
     "    # YouTube\n",
     "    elif 'YouTube' in wload_name:\n",
     "        video_url = wload_name.split()[2]\n",
     "        video_duration_s = int(wload_name.split()[3])\n",
-    "        db_file, nrg_report = wload.run(exp_dir, video_url, video_duration_s)\n",
+    "        wload.run(exp_dir, video_url, video_duration_s, collect)\n",
     "\n",
     "    # RTApp based workloads\n",
     "    elif 'RTApp' in wload_name:\n",
     "        rtapp_kind = wload_name.replace('RTApp ', '')\n",
-    "        db_file, nrg_report = rtapp_run(rtapp_kind)\n",
-    "\n",
-    "        \n",
-    "    ###########################\n",
-    "    # Reset and return results\n",
-    "\n",
-    "    # Stop the required trace command\n",
-    "    if 'ftrace' in collect:\n",
-    "        te.ftrace.stop()\n",
-    "        # Collect and keep track of the trace\n",
-    "        trace_file = os.path.join(exp_dir, 'trace.dat')\n",
-    "        te.ftrace.get_trace(trace_file)\n",
-    "    elif 'systrace' in collect:\n",
-    "        if systrace_output:\n",
-    "            logging.info('Waiting systrace report [%s]...', trace_file)\n",
-    "            systrace_output.wait()\n",
-    "        else:\n",
-    "            logging.warning('Systrace is not running!')\n",
-    "\n",
-    "    # Reset screen brightness and auto dimming\n",
-    "    Screen.set_defaults(target)\n",
+    "        rtapp_run(rtapp_kind)\n",
     "        \n",
     "    # Dump platform descriptor\n",
-    "    te.platform_dump(exp_dir)\n",
-    "\n",
-    "    # return all the experiment data\n",
-    "    if 'trace' in collect:\n",
-    "        return {\n",
-    "            'dir'             : exp_dir,\n",
-    "            'db_file'         : db_file,\n",
-    "            'nrg_report'      : nrg_report,\n",
-    "            'trace_file'      : trace_file,\n",
-    "        }\n",
-    "    else:\n",
-    "        return {\n",
-    "            'dir'             : exp_dir,\n",
-    "            'db_file'         : db_file,\n",
-    "            'nrg_report'      : nrg_report,\n",
-    "            'nrg_file'        : nrg_file,\n",
-    "        }"
+    "    te.platform_dump(exp_dir)"
    ]
   },
   {
@@ -259,9 +195,6 @@
     "    else:\n",
     "        LisaLogging.setup(level=logging.INFO)\n",
     "\n",
-    "    # The set of results for each comparison test\n",
-    "    results = collections.defaultdict(dict)\n",
-    "\n",
     "    # Run the benchmark in all the configured configurations\n",
     "    for conf_name in test_confs:\n",
     "\n",
@@ -310,13 +243,7 @@
     "                         idx, wload_kind.upper(), conf_name.upper())\n",
     "            logging.info('        %s', wload_name)\n",
     "            \n",
-    "            res = experiment(wl, te.res_dir, conf_name, wload_name, collect)\n",
-    "            results[conf_name][wload_name] = copy.deepcopy(res)\n",
-    "\n",
-    "        # Save collected results\n",
-    "        res_file = os.path.join(te.res_dir, conf_name, 'results.json')\n",
-    "        with open(res_file, 'w') as fh:\n",
-    "            json.dump(results[conf_name], fh, indent=4)"
+    "            experiment(wl, te.res_dir, conf_name, wload_name, collect)"
    ]
   },
   {
@@ -354,7 +281,7 @@
     "\n",
     "    # Target platform and board\n",
     "    \"platform\"      : 'android',\n",
-    "    \"device\"        : \"HT6670300102\",\n",
+    "    \"device\"        : \"FA6A10306347\",\n",
     "    \"ANDROID_HOME\"  : '/home/vagrant/lisa/tools/android-sdk-linux/',\n",
     "\n",
     "    # Folder where all the results will be collected\n",
@@ -460,15 +387,25 @@
     "#     NOTE: energy is automatically enabled in case an \"emeter\" configuration is defined in my_conf\n",
     "\n",
     "confs = {\n",
-    "     'std' : {\n",
+    "     'j_std' : {\n",
     "         'set'     : set_interactive,\n",
     "         'wloads'  : ['Jankbench 1 list_view'],\n",
     "         'collect' : 'ftrace',\n",
     "     },\n",
-    "     'eas' : {\n",
+    "     'j_eas' : {\n",
     "        'set'      :  set_sched,\n",
     "        'wloads'   : ['Jankbench 1 list_view'],\n",
     "        'collect'  : 'ftrace',\n",
+    "     },\n",
+    "     'y_std' : {\n",
+    "         'set'     : set_interactive,\n",
+    "         'wloads'  : ['YouTube 1 https://youtu.be/XSGBVzeBUbk?t=45s'],\n",
+    "         'collect' : 'ftrace',\n",
+    "     },\n",
+    "     'u_eas' : {\n",
+    "        'set'      :  set_sched,\n",
+    "        'wloads'   : ['UiBench 1 TrivialAnimationActivity'],\n",
+    "        'collect'  : 'systrace',\n",
     "     }\n",
     "}"
    ]
@@ -482,7 +419,7 @@
    "outputs": [],
    "source": [
     "# List of experiments to run\n",
-    "experiments = ['std', 'eas']"
+    "experiments = ['j_std', 'j_eas', 'y_std', 'u_eas']"
    ]
   },
   {
@@ -497,37 +434,37 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "2016-12-09 17:56:54,280 INFO    : TestEnv      : Using base path: /home/vagrant/lisa\n",
-      "2016-12-09 17:56:54,282 INFO    : TestEnv      : Loading custom (inline) target configuration\n",
-      "2016-12-09 17:56:54,283 INFO    : TestEnv      : External tools using:\n",
-      "2016-12-09 17:56:54,284 INFO    : TestEnv      :    ANDROID_HOME: /home/vagrant/lisa/tools/android-sdk-linux/\n",
-      "2016-12-09 17:56:54,284 INFO    : TestEnv      :    CATAPULT_HOME: /home/vagrant/lisa/tools/catapult\n",
-      "2016-12-09 17:56:54,284 INFO    : TestEnv      : Devlib modules to load: ['cpufreq']\n",
-      "2016-12-09 17:56:54,285 INFO    : TestEnv      : Connecting Android target [HT6670300102]\n",
-      "2016-12-09 17:56:54,285 INFO    : TestEnv      : Connection settings:\n",
-      "2016-12-09 17:56:54,286 INFO    : TestEnv      :    {'device': 'HT6670300102'}\n",
-      "2016-12-09 17:56:54,468 INFO    : android      : ls command is set to ls -1\n",
-      "2016-12-09 17:56:55,511 INFO    : TestEnv      : Initializing target workdir:\n",
-      "2016-12-09 17:56:55,513 INFO    : TestEnv      :    /data/local/tmp/devlib-target\n",
-      "2016-12-09 17:56:58,803 INFO    : TestEnv      : Topology:\n",
-      "2016-12-09 17:56:58,806 INFO    : TestEnv      :    [[0, 1], [2, 3]]\n",
-      "2016-12-09 17:56:59,847 INFO    : TestEnv      : Enabled tracepoints:\n",
-      "2016-12-09 17:56:59,848 INFO    : TestEnv      :    sched_switch\n",
-      "2016-12-09 17:56:59,848 INFO    : TestEnv      :    sched_overutilized\n",
-      "2016-12-09 17:56:59,848 INFO    : TestEnv      :    sched_contrib_scale_f\n",
-      "2016-12-09 17:56:59,849 INFO    : TestEnv      :    sched_load_avg_cpu\n",
-      "2016-12-09 17:56:59,849 INFO    : TestEnv      :    sched_load_avg_task\n",
-      "2016-12-09 17:56:59,850 INFO    : TestEnv      :    sched_tune_tasks_update\n",
-      "2016-12-09 17:56:59,850 INFO    : TestEnv      :    sched_boost_cpu\n",
-      "2016-12-09 17:56:59,850 INFO    : TestEnv      :    sched_boost_task\n",
-      "2016-12-09 17:56:59,851 INFO    : TestEnv      :    sched_energy_diff\n",
-      "2016-12-09 17:56:59,852 INFO    : TestEnv      :    cpu_frequency\n",
-      "2016-12-09 17:56:59,854 INFO    : TestEnv      :    cpu_idle\n",
-      "2016-12-09 17:56:59,855 INFO    : TestEnv      :    cpu_capacity\n",
-      "2016-12-09 17:56:59,856 INFO    : TestEnv      : Set results folder to:\n",
-      "2016-12-09 17:56:59,856 INFO    : TestEnv      :    /home/vagrant/lisa/results/Android_Multiple_Workloads\n",
-      "2016-12-09 17:56:59,857 INFO    : TestEnv      : Experiment results available also in:\n",
-      "2016-12-09 17:56:59,857 INFO    : TestEnv      :    /home/vagrant/lisa/results_latest\n"
+      "2017-03-14 11:05:12,767 INFO    : TestEnv      : Using base path: /home/vagrant/lisa\n",
+      "2017-03-14 11:05:12,767 INFO    : TestEnv      : Loading custom (inline) target configuration\n",
+      "2017-03-14 11:05:12,768 INFO    : TestEnv      : External tools using:\n",
+      "2017-03-14 11:05:12,769 INFO    : TestEnv      :    ANDROID_HOME: /home/vagrant/lisa/tools/android-sdk-linux/\n",
+      "2017-03-14 11:05:12,769 INFO    : TestEnv      :    CATAPULT_HOME: /home/vagrant/lisa/tools/catapult\n",
+      "2017-03-14 11:05:12,770 INFO    : TestEnv      : Devlib modules to load: ['cpufreq']\n",
+      "2017-03-14 11:05:12,770 INFO    : TestEnv      : Connecting Android target [FA6A10306347]\n",
+      "2017-03-14 11:05:12,770 INFO    : TestEnv      : Connection settings:\n",
+      "2017-03-14 11:05:12,771 INFO    : TestEnv      :    {'device': 'FA6A10306347'}\n",
+      "2017-03-14 11:05:12,914 INFO    : android      : ls command is set to ls -1\n",
+      "2017-03-14 11:05:13,430 INFO    : TestEnv      : Initializing target workdir:\n",
+      "2017-03-14 11:05:13,431 INFO    : TestEnv      :    /data/local/tmp/devlib-target\n",
+      "2017-03-14 11:05:14,701 INFO    : TestEnv      : Topology:\n",
+      "2017-03-14 11:05:14,702 INFO    : TestEnv      :    [[0, 1], [2, 3]]\n",
+      "2017-03-14 11:05:15,291 INFO    : TestEnv      : Enabled tracepoints:\n",
+      "2017-03-14 11:05:15,292 INFO    : TestEnv      :    sched_switch\n",
+      "2017-03-14 11:05:15,292 INFO    : TestEnv      :    sched_overutilized\n",
+      "2017-03-14 11:05:15,293 INFO    : TestEnv      :    sched_contrib_scale_f\n",
+      "2017-03-14 11:05:15,293 INFO    : TestEnv      :    sched_load_avg_cpu\n",
+      "2017-03-14 11:05:15,294 INFO    : TestEnv      :    sched_load_avg_task\n",
+      "2017-03-14 11:05:15,294 INFO    : TestEnv      :    sched_tune_tasks_update\n",
+      "2017-03-14 11:05:15,295 INFO    : TestEnv      :    sched_boost_cpu\n",
+      "2017-03-14 11:05:15,295 INFO    : TestEnv      :    sched_boost_task\n",
+      "2017-03-14 11:05:15,295 INFO    : TestEnv      :    sched_energy_diff\n",
+      "2017-03-14 11:05:15,296 INFO    : TestEnv      :    cpu_frequency\n",
+      "2017-03-14 11:05:15,296 INFO    : TestEnv      :    cpu_idle\n",
+      "2017-03-14 11:05:15,297 INFO    : TestEnv      :    cpu_capacity\n",
+      "2017-03-14 11:05:15,297 INFO    : TestEnv      : Set results folder to:\n",
+      "2017-03-14 11:05:15,298 INFO    : TestEnv      :    /home/vagrant/lisa/results/Android_Multiple_Workloads\n",
+      "2017-03-14 11:05:15,298 INFO    : TestEnv      : Experiment results available also in:\n",
+      "2017-03-14 11:05:15,299 INFO    : TestEnv      :    /home/vagrant/lisa/results_latest\n"
      ]
     }
    ],
@@ -556,86 +493,142 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "2016-12-09 17:57:12,090 INFO    : Workload     : Workloads available on target:\n",
-      "2016-12-09 17:57:12,093 INFO    : Workload     :   ['YouTube', 'Jankbench', 'UiBench']\n",
-      "2016-12-09 17:57:12,098 INFO    : root         : Using LISA logging configuration:\n",
-      "2016-12-09 17:57:12,099 INFO    : root         :   /home/vagrant/lisa/logging.conf\n",
-      "2016-12-09 17:57:12,101 INFO    : root         : Enabling collection of: ftrace\n",
-      "2016-12-09 17:57:12,102 DEBUG   : root         : Workload [YouTube 1 https://youtu.be/XSGBVzeBUbk?t=45s   60] disabled\n",
-      "2016-12-09 17:57:12,103 INFO    : root         : ------------------------\n",
-      "2016-12-09 17:57:12,104 INFO    : root         : Test 1: JANKBENCH in STD configuration\n",
-      "2016-12-09 17:57:12,104 INFO    : root         :         Jankbench 1 list_view\n",
-      "2016-12-09 17:57:12,105 DEBUG   : Jankbench    : Workload created\n",
-      "2016-12-09 17:57:13,628 INFO    : Screen       : Set brightness: 100%\n",
-      "2016-12-09 17:57:14,052 INFO    : Screen       : Dim screen mode: OFF\n",
-      "2016-12-09 17:57:14,495 INFO    : Screen       : Screen timeout: 36000 [s]\n",
-      "2016-12-09 17:57:18,243 INFO    : Screen       : Force manual orientation\n",
-      "2016-12-09 17:57:18,245 INFO    : Screen       : Set orientation: PORTRAIT\n",
-      "2016-12-09 17:57:19,220 DEBUG   : Jankbench    : Start Jank Benchmark [0:list_view]\n",
-      "2016-12-09 17:57:19,222 INFO    : Jankbench    : am start -n \"com.android.benchmark/.app.RunLocalBenchmarksActivity\" --eia \"com.android.benchmark.EXTRA_ENABLED_BENCHMARK_IDS\" 0 --ei \"com.android.benchmark.EXTRA_RUN_COUNT\" 1\n",
-      "2016-12-09 17:57:19,672 INFO    : Jankbench    : adb -s HT6670300102 logcat ActivityManager:* System.out:I *:S BENCH:*\n",
-      "2016-12-09 17:57:19,673 DEBUG   : Jankbench    : Iterations:\n",
-      "2016-12-09 17:57:19,763 DEBUG   : Jankbench    : Benchmark started!\n",
-      "2016-12-09 17:57:20,781 DEBUG   : Jankbench    : Iteration  1:\n",
-      "2016-12-09 17:57:54,518 INFO    : Jankbench    :    Mean:  54.182 JankP:   0.061 StdDev:   0.000 Count Bad:    1 Count Jank:    1\n",
-      "2016-12-09 17:57:55,554 DEBUG   : Jankbench    : Benchmark done!\n",
-      "2016-12-09 17:57:57,168 INFO    : Screen       : Set orientation: AUTO\n",
-      "2016-12-09 17:58:08,777 INFO    : Screen       : Set orientation: AUTO\n",
-      "2016-12-09 17:58:10,025 INFO    : Screen       : Set brightness: AUTO\n",
-      "2016-12-09 17:58:10,439 INFO    : Screen       : Dim screen mode: ON\n",
-      "2016-12-09 17:58:10,869 INFO    : Screen       : Screen timeout: 30 [s]\n",
-      "2016-12-09 17:58:10,871 DEBUG   : root         : Workload [Jankbench 1 image_list_view] disabled\n",
-      "2016-12-09 17:58:10,871 DEBUG   : root         : Workload [Jankbench 1 shadow_grid] disabled\n",
-      "2016-12-09 17:58:10,872 DEBUG   : root         : Workload [Jankbench 1 low_hitrate_text] disabled\n",
-      "2016-12-09 17:58:10,873 DEBUG   : root         : Workload [Jankbench 1 high_hitrate_text] disabled\n",
-      "2016-12-09 17:58:10,873 DEBUG   : root         : Workload [Jankbench 1 edit_text] disabled\n",
-      "2016-12-09 17:58:10,874 DEBUG   : root         : Workload [Jankbench 3 list_view] disabled\n",
-      "2016-12-09 17:58:10,875 DEBUG   : root         : Workload [Jankbench 3 image_list_view] disabled\n",
-      "2016-12-09 17:58:10,875 DEBUG   : root         : Workload [Jankbench 3 shadow_grid] disabled\n",
-      "2016-12-09 17:58:10,876 DEBUG   : root         : Workload [Jankbench 3 low_hitrate_text] disabled\n",
-      "2016-12-09 17:58:10,877 DEBUG   : root         : Workload [Jankbench 3 high_hitrate_text] disabled\n",
-      "2016-12-09 17:58:10,877 DEBUG   : root         : Workload [Jankbench 3 edit_text] disabled\n",
-      "2016-12-09 17:58:10,878 DEBUG   : root         : Workload [UiBench 1 TrivialAnimation 10] disabled\n",
-      "2016-12-09 17:58:10,879 DEBUG   : root         : Workload [RTApp STAccount 6] disabled\n",
-      "2016-12-09 17:58:10,879 DEBUG   : root         : Workload [RTApp RAMP] disabled\n",
-      "2016-12-09 17:58:10,880 INFO    : root         : Enabling collection of: ftrace\n",
-      "2016-12-09 17:58:10,880 DEBUG   : root         : Workload [YouTube 1 https://youtu.be/XSGBVzeBUbk?t=45s   60] disabled\n",
-      "2016-12-09 17:58:10,881 INFO    : root         : ------------------------\n",
-      "2016-12-09 17:58:10,881 INFO    : root         : Test 1: JANKBENCH in EAS configuration\n",
-      "2016-12-09 17:58:10,881 INFO    : root         :         Jankbench 1 list_view\n",
-      "2016-12-09 17:58:10,882 DEBUG   : Jankbench    : Workload created\n",
-      "2016-12-09 17:58:12,286 INFO    : Screen       : Set brightness: 100%\n",
-      "2016-12-09 17:58:12,701 INFO    : Screen       : Dim screen mode: OFF\n",
-      "2016-12-09 17:58:13,566 INFO    : Screen       : Screen timeout: 36000 [s]\n",
-      "2016-12-09 17:58:21,439 INFO    : Screen       : Force manual orientation\n",
-      "2016-12-09 17:58:21,440 INFO    : Screen       : Set orientation: PORTRAIT\n",
-      "2016-12-09 17:58:22,871 DEBUG   : Jankbench    : Start Jank Benchmark [0:list_view]\n",
-      "2016-12-09 17:58:22,874 INFO    : Jankbench    : am start -n \"com.android.benchmark/.app.RunLocalBenchmarksActivity\" --eia \"com.android.benchmark.EXTRA_ENABLED_BENCHMARK_IDS\" 0 --ei \"com.android.benchmark.EXTRA_RUN_COUNT\" 1\n",
-      "2016-12-09 17:58:23,476 INFO    : Jankbench    : adb -s HT6670300102 logcat ActivityManager:* System.out:I *:S BENCH:*\n",
-      "2016-12-09 17:58:23,477 DEBUG   : Jankbench    : Iterations:\n",
-      "2016-12-09 17:58:23,574 DEBUG   : Jankbench    : Benchmark started!\n",
-      "2016-12-09 17:58:24,622 DEBUG   : Jankbench    : Iteration  1:\n",
-      "2016-12-09 17:58:58,616 INFO    : Jankbench    :    Mean:  40.867 JankP:   0.061 StdDev:  47.953 Count Bad:    3 Count Jank:    1\n",
-      "2016-12-09 17:58:59,668 DEBUG   : Jankbench    : Benchmark done!\n",
-      "2016-12-09 17:59:01,499 INFO    : Screen       : Set orientation: AUTO\n",
-      "2016-12-09 17:59:20,392 INFO    : Screen       : Set orientation: AUTO\n",
-      "2016-12-09 17:59:22,002 INFO    : Screen       : Set brightness: AUTO\n",
-      "2016-12-09 17:59:22,484 INFO    : Screen       : Dim screen mode: ON\n",
-      "2016-12-09 17:59:23,025 INFO    : Screen       : Screen timeout: 30 [s]\n",
-      "2016-12-09 17:59:23,026 DEBUG   : root         : Workload [Jankbench 1 image_list_view] disabled\n",
-      "2016-12-09 17:59:23,027 DEBUG   : root         : Workload [Jankbench 1 shadow_grid] disabled\n",
-      "2016-12-09 17:59:23,029 DEBUG   : root         : Workload [Jankbench 1 low_hitrate_text] disabled\n",
-      "2016-12-09 17:59:23,031 DEBUG   : root         : Workload [Jankbench 1 high_hitrate_text] disabled\n",
-      "2016-12-09 17:59:23,032 DEBUG   : root         : Workload [Jankbench 1 edit_text] disabled\n",
-      "2016-12-09 17:59:23,034 DEBUG   : root         : Workload [Jankbench 3 list_view] disabled\n",
-      "2016-12-09 17:59:23,035 DEBUG   : root         : Workload [Jankbench 3 image_list_view] disabled\n",
-      "2016-12-09 17:59:23,035 DEBUG   : root         : Workload [Jankbench 3 shadow_grid] disabled\n",
-      "2016-12-09 17:59:23,036 DEBUG   : root         : Workload [Jankbench 3 low_hitrate_text] disabled\n",
-      "2016-12-09 17:59:23,036 DEBUG   : root         : Workload [Jankbench 3 high_hitrate_text] disabled\n",
-      "2016-12-09 17:59:23,036 DEBUG   : root         : Workload [Jankbench 3 edit_text] disabled\n",
-      "2016-12-09 17:59:23,037 DEBUG   : root         : Workload [UiBench 1 TrivialAnimation 10] disabled\n",
-      "2016-12-09 17:59:23,037 DEBUG   : root         : Workload [RTApp STAccount 6] disabled\n",
-      "2016-12-09 17:59:23,037 DEBUG   : root         : Workload [RTApp RAMP] disabled\n"
+      "2017-03-14 11:05:17,641 INFO    : root         : Using LISA logging configuration:\n",
+      "2017-03-14 11:05:17,642 INFO    : root         :   /home/vagrant/lisa/logging.conf\n",
+      "2017-03-14 11:05:17,642 INFO    : root         : Enabling collection of: ftrace\n",
+      "2017-03-14 11:05:17,643 DEBUG   : root         : Workload [YouTube 1 https://youtu.be/XSGBVzeBUbk?t=45s   60] disabled\n",
+      "2017-03-14 11:05:17,643 INFO    : root         : ------------------------\n",
+      "2017-03-14 11:05:17,644 INFO    : root         : Test 1: JANKBENCH in J_STD configuration\n",
+      "2017-03-14 11:05:17,645 INFO    : root         :         Jankbench 1 list_view\n",
+      "2017-03-14 11:05:18,248 INFO    : Workload     : Supported workloads available on target:\n",
+      "2017-03-14 11:05:18,249 INFO    : Workload     :   jankbench, youtube, geekbench, uibench, gmaps, vellamo\n",
+      "2017-03-14 11:05:18,250 DEBUG   : Jankbench    : Workload created\n",
+      "2017-03-14 11:05:22,760 INFO    : Screen       : Set brightness: 0%\n",
+      "2017-03-14 11:05:22,761 INFO    : Screen       : Force manual orientation\n",
+      "2017-03-14 11:05:22,763 INFO    : Screen       : Set orientation: PORTRAIT\n",
+      "2017-03-14 11:05:23,610 DEBUG   : Jankbench    : Start Jank Benchmark [0:list_view]\n",
+      "2017-03-14 11:05:23,610 INFO    : Jankbench    : am start -n \"com.android.benchmark/.app.RunLocalBenchmarksActivity\" --eia \"com.android.benchmark.EXTRA_ENABLED_BENCHMARK_IDS\" 0 --ei \"com.android.benchmark.EXTRA_RUN_COUNT\" 1\n",
+      "2017-03-14 11:05:23,992 INFO    : Jankbench    : adb -s FA6A10306347 logcat ActivityManager:* System.out:I *:S BENCH:*\n",
+      "2017-03-14 11:05:23,994 DEBUG   : Jankbench    : Iterations:\n",
+      "2017-03-14 11:05:24,047 INFO    : Jankbench    : FTrace START\n",
+      "2017-03-14 11:05:25,177 DEBUG   : Jankbench    : Benchmark started!\n",
+      "2017-03-14 11:05:25,178 DEBUG   : Jankbench    : Iteration  1:\n",
+      "2017-03-14 11:05:58,847 INFO    : Jankbench    :    Mean:  27.681 JankP:   0.061 StdDev:  23.413 Count Bad:    3 Count Jank:    1\n",
+      "2017-03-14 11:05:59,890 DEBUG   : Jankbench    : Benchmark done!\n",
+      "2017-03-14 11:06:00,002 INFO    : Jankbench    : FTrace STOP\n",
+      "2017-03-14 11:06:04,833 INFO    : Screen       : Set orientation: AUTO\n",
+      "2017-03-14 11:06:06,981 INFO    : Screen       : Set brightness: AUTO\n",
+      "2017-03-14 11:06:06,982 DEBUG   : root         : Workload [Jankbench 1 image_list_view] disabled\n",
+      "2017-03-14 11:06:06,983 DEBUG   : root         : Workload [Jankbench 1 shadow_grid] disabled\n",
+      "2017-03-14 11:06:06,983 DEBUG   : root         : Workload [Jankbench 1 low_hitrate_text] disabled\n",
+      "2017-03-14 11:06:06,984 DEBUG   : root         : Workload [Jankbench 1 high_hitrate_text] disabled\n",
+      "2017-03-14 11:06:06,984 DEBUG   : root         : Workload [Jankbench 1 edit_text] disabled\n",
+      "2017-03-14 11:06:06,984 DEBUG   : root         : Workload [Jankbench 3 list_view] disabled\n",
+      "2017-03-14 11:06:06,985 DEBUG   : root         : Workload [Jankbench 3 image_list_view] disabled\n",
+      "2017-03-14 11:06:06,985 DEBUG   : root         : Workload [Jankbench 3 shadow_grid] disabled\n",
+      "2017-03-14 11:06:06,986 DEBUG   : root         : Workload [Jankbench 3 low_hitrate_text] disabled\n",
+      "2017-03-14 11:06:06,986 DEBUG   : root         : Workload [Jankbench 3 high_hitrate_text] disabled\n",
+      "2017-03-14 11:06:06,987 DEBUG   : root         : Workload [Jankbench 3 edit_text] disabled\n",
+      "2017-03-14 11:06:06,987 DEBUG   : root         : Workload [UiBench 1 TrivialAnimationActivity 10] disabled\n",
+      "2017-03-14 11:06:06,987 DEBUG   : root         : Workload [RTApp STAccount 6] disabled\n",
+      "2017-03-14 11:06:06,988 DEBUG   : root         : Workload [RTApp RAMP] disabled\n",
+      "2017-03-14 11:06:06,988 INFO    : root         : Enabling collection of: ftrace\n",
+      "2017-03-14 11:06:06,989 DEBUG   : root         : Workload [YouTube 1 https://youtu.be/XSGBVzeBUbk?t=45s   60] disabled\n",
+      "2017-03-14 11:06:06,989 INFO    : root         : ------------------------\n",
+      "2017-03-14 11:06:06,989 INFO    : root         : Test 1: JANKBENCH in J_EAS configuration\n",
+      "2017-03-14 11:06:06,990 INFO    : root         :         Jankbench 1 list_view\n",
+      "2017-03-14 11:06:06,990 DEBUG   : Jankbench    : Workload created\n",
+      "2017-03-14 11:06:10,964 INFO    : Screen       : Set brightness: 0%\n",
+      "2017-03-14 11:06:10,966 INFO    : Screen       : Force manual orientation\n",
+      "2017-03-14 11:06:10,966 INFO    : Screen       : Set orientation: PORTRAIT\n",
+      "2017-03-14 11:06:11,776 DEBUG   : Jankbench    : Start Jank Benchmark [0:list_view]\n",
+      "2017-03-14 11:06:11,777 INFO    : Jankbench    : am start -n \"com.android.benchmark/.app.RunLocalBenchmarksActivity\" --eia \"com.android.benchmark.EXTRA_ENABLED_BENCHMARK_IDS\" 0 --ei \"com.android.benchmark.EXTRA_RUN_COUNT\" 1\n",
+      "2017-03-14 11:06:12,241 INFO    : Jankbench    : adb -s FA6A10306347 logcat ActivityManager:* System.out:I *:S BENCH:*\n",
+      "2017-03-14 11:06:12,242 DEBUG   : Jankbench    : Iterations:\n",
+      "2017-03-14 11:06:12,305 INFO    : Jankbench    : FTrace START\n",
+      "2017-03-14 11:06:13,552 DEBUG   : Jankbench    : Benchmark started!\n",
+      "2017-03-14 11:06:13,553 DEBUG   : Jankbench    : Iteration  1:\n",
+      "2017-03-14 11:06:47,377 INFO    : Jankbench    :    Mean:  38.852 JankP:   0.061 StdDev:  40.832 Count Bad:    3 Count Jank:    1\n",
+      "2017-03-14 11:06:48,464 DEBUG   : Jankbench    : Benchmark done!\n",
+      "2017-03-14 11:06:48,645 INFO    : Jankbench    : FTrace STOP\n",
+      "2017-03-14 11:06:54,096 INFO    : Screen       : Set orientation: AUTO\n",
+      "2017-03-14 11:06:57,305 INFO    : Screen       : Set brightness: AUTO\n",
+      "2017-03-14 11:06:57,306 DEBUG   : root         : Workload [Jankbench 1 image_list_view] disabled\n",
+      "2017-03-14 11:06:57,307 DEBUG   : root         : Workload [Jankbench 1 shadow_grid] disabled\n",
+      "2017-03-14 11:06:57,307 DEBUG   : root         : Workload [Jankbench 1 low_hitrate_text] disabled\n",
+      "2017-03-14 11:06:57,308 DEBUG   : root         : Workload [Jankbench 1 high_hitrate_text] disabled\n",
+      "2017-03-14 11:06:57,308 DEBUG   : root         : Workload [Jankbench 1 edit_text] disabled\n",
+      "2017-03-14 11:06:57,309 DEBUG   : root         : Workload [Jankbench 3 list_view] disabled\n",
+      "2017-03-14 11:06:57,309 DEBUG   : root         : Workload [Jankbench 3 image_list_view] disabled\n",
+      "2017-03-14 11:06:57,309 DEBUG   : root         : Workload [Jankbench 3 shadow_grid] disabled\n",
+      "2017-03-14 11:06:57,310 DEBUG   : root         : Workload [Jankbench 3 low_hitrate_text] disabled\n",
+      "2017-03-14 11:06:57,310 DEBUG   : root         : Workload [Jankbench 3 high_hitrate_text] disabled\n",
+      "2017-03-14 11:06:57,311 DEBUG   : root         : Workload [Jankbench 3 edit_text] disabled\n",
+      "2017-03-14 11:06:57,311 DEBUG   : root         : Workload [UiBench 1 TrivialAnimationActivity 10] disabled\n",
+      "2017-03-14 11:06:57,312 DEBUG   : root         : Workload [RTApp STAccount 6] disabled\n",
+      "2017-03-14 11:06:57,312 DEBUG   : root         : Workload [RTApp RAMP] disabled\n",
+      "2017-03-14 11:06:57,313 INFO    : root         : Enabling collection of: ftrace\n",
+      "2017-03-14 11:06:57,313 INFO    : root         : ------------------------\n",
+      "2017-03-14 11:06:57,313 INFO    : root         : Test 1: YOUTUBE in Y_STD configuration\n",
+      "2017-03-14 11:06:57,314 INFO    : root         :         YouTube 1 https://youtu.be/XSGBVzeBUbk?t=45s   60\n",
+      "2017-03-14 11:06:57,315 DEBUG   : YouTube      : Workload created\n",
+      "2017-03-14 11:06:58,842 INFO    : Screen       : Force manual orientation\n",
+      "2017-03-14 11:06:58,843 INFO    : Screen       : Set orientation: LANDSCAPE\n",
+      "2017-03-14 11:07:00,540 INFO    : Screen       : Set brightness: 0%\n",
+      "2017-03-14 11:07:03,003 INFO    : YouTube      : FTrace START\n",
+      "2017-03-14 11:07:05,037 INFO    : YouTube      : Play video for 60 [s]\n",
+      "2017-03-14 11:08:05,226 INFO    : YouTube      : FTrace STOP\n",
+      "2017-03-14 11:08:09,174 INFO    : Screen       : Set orientation: AUTO\n",
+      "2017-03-14 11:08:10,336 INFO    : Screen       : Set brightness: AUTO\n",
+      "2017-03-14 11:08:10,337 DEBUG   : root         : Workload [Jankbench 1 list_view] disabled\n",
+      "2017-03-14 11:08:10,338 DEBUG   : root         : Workload [Jankbench 1 image_list_view] disabled\n",
+      "2017-03-14 11:08:10,338 DEBUG   : root         : Workload [Jankbench 1 shadow_grid] disabled\n",
+      "2017-03-14 11:08:10,338 DEBUG   : root         : Workload [Jankbench 1 low_hitrate_text] disabled\n",
+      "2017-03-14 11:08:10,339 DEBUG   : root         : Workload [Jankbench 1 high_hitrate_text] disabled\n",
+      "2017-03-14 11:08:10,339 DEBUG   : root         : Workload [Jankbench 1 edit_text] disabled\n",
+      "2017-03-14 11:08:10,340 DEBUG   : root         : Workload [Jankbench 3 list_view] disabled\n",
+      "2017-03-14 11:08:10,340 DEBUG   : root         : Workload [Jankbench 3 image_list_view] disabled\n",
+      "2017-03-14 11:08:10,340 DEBUG   : root         : Workload [Jankbench 3 shadow_grid] disabled\n",
+      "2017-03-14 11:08:10,341 DEBUG   : root         : Workload [Jankbench 3 low_hitrate_text] disabled\n",
+      "2017-03-14 11:08:10,341 DEBUG   : root         : Workload [Jankbench 3 high_hitrate_text] disabled\n",
+      "2017-03-14 11:08:10,342 DEBUG   : root         : Workload [Jankbench 3 edit_text] disabled\n",
+      "2017-03-14 11:08:10,342 DEBUG   : root         : Workload [UiBench 1 TrivialAnimationActivity 10] disabled\n",
+      "2017-03-14 11:08:10,342 DEBUG   : root         : Workload [RTApp STAccount 6] disabled\n",
+      "2017-03-14 11:08:10,343 DEBUG   : root         : Workload [RTApp RAMP] disabled\n",
+      "2017-03-14 11:08:10,343 INFO    : root         : Enabling collection of: systrace\n",
+      "2017-03-14 11:08:10,344 DEBUG   : root         : Workload [YouTube 1 https://youtu.be/XSGBVzeBUbk?t=45s   60] disabled\n",
+      "2017-03-14 11:08:10,344 DEBUG   : root         : Workload [Jankbench 1 list_view] disabled\n",
+      "2017-03-14 11:08:10,345 DEBUG   : root         : Workload [Jankbench 1 image_list_view] disabled\n",
+      "2017-03-14 11:08:10,345 DEBUG   : root         : Workload [Jankbench 1 shadow_grid] disabled\n",
+      "2017-03-14 11:08:10,345 DEBUG   : root         : Workload [Jankbench 1 low_hitrate_text] disabled\n",
+      "2017-03-14 11:08:10,346 DEBUG   : root         : Workload [Jankbench 1 high_hitrate_text] disabled\n",
+      "2017-03-14 11:08:10,346 DEBUG   : root         : Workload [Jankbench 1 edit_text] disabled\n",
+      "2017-03-14 11:08:10,346 DEBUG   : root         : Workload [Jankbench 3 list_view] disabled\n",
+      "2017-03-14 11:08:10,347 DEBUG   : root         : Workload [Jankbench 3 image_list_view] disabled\n",
+      "2017-03-14 11:08:10,347 DEBUG   : root         : Workload [Jankbench 3 shadow_grid] disabled\n",
+      "2017-03-14 11:08:10,348 DEBUG   : root         : Workload [Jankbench 3 low_hitrate_text] disabled\n",
+      "2017-03-14 11:08:10,348 DEBUG   : root         : Workload [Jankbench 3 high_hitrate_text] disabled\n",
+      "2017-03-14 11:08:10,349 DEBUG   : root         : Workload [Jankbench 3 edit_text] disabled\n",
+      "2017-03-14 11:08:10,349 INFO    : root         : ------------------------\n",
+      "2017-03-14 11:08:10,349 INFO    : root         : Test 1: UIBENCH in U_EAS configuration\n",
+      "2017-03-14 11:08:10,350 INFO    : root         :         UiBench 1 TrivialAnimationActivity 10\n",
+      "2017-03-14 11:08:10,350 DEBUG   : UiBench      : Workload created\n",
+      "2017-03-14 11:08:15,709 INFO    : Screen       : Set brightness: 0%\n",
+      "2017-03-14 11:08:16,376 INFO    : Screen       : Force manual orientation\n",
+      "2017-03-14 11:08:16,376 INFO    : Screen       : Set orientation: PORTRAIT\n",
+      "2017-03-14 11:08:18,614 DEBUG   : UiBench      : START string [ActivityManager: START.*cmp=com.android.test.uibench/.TrivialAnimationActivity]\n",
+      "2017-03-14 11:08:18,615 INFO    : UiBench      : adb -s FA6A10306347 logcat ActivityManager:* System.out:I *:S BENCH:*\n",
+      "2017-03-14 11:08:19,125 WARNING : UiBench      : Systrace time NOT defined, tracing for 10[s]\n",
+      "2017-03-14 11:08:19,126 INFO    : UiBench      : Systrace START\n",
+      "2017-03-14 11:08:19,126 INFO    : System       : SysTrace: /home/vagrant/lisa/tools/catapult/systrace/systrace/run_systrace.py -e FA6A10306347 -o /home/vagrant/lisa/results/Android_Multiple_Workloads/u_eas/UiBench_TrivialAnimationActivity/trace.html gfx view sched freq idle -t 10\n",
+      "2017-03-14 11:08:19,132 DEBUG   : UiBench      : Benchmark started!\n",
+      "2017-03-14 11:08:19,133 INFO    : UiBench      : Benchmark [.TrivialAnimationActivity] started, waiting 10 [s]\n",
+      "2017-03-14 11:08:29,140 DEBUG   : UiBench      : Benchmark done!\n",
+      "2017-03-14 11:08:29,141 INFO    : UiBench      : Waiting systrace report [/home/vagrant/lisa/results/Android_Multiple_Workloads/u_eas/UiBench_TrivialAnimationActivity/trace.html]...\n",
+      "2017-03-14 11:08:37,315 INFO    : Screen       : Set orientation: AUTO\n",
+      "2017-03-14 11:08:39,617 INFO    : Screen       : Set brightness: AUTO\n",
+      "2017-03-14 11:08:39,718 DEBUG   : root         : Workload [RTApp STAccount 6] disabled\n",
+      "2017-03-14 11:08:39,719 DEBUG   : root         : Workload [RTApp RAMP] disabled\n"
      ]
     }
    ],
@@ -645,7 +638,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 13,
    "metadata": {
     "collapsed": false
    },
@@ -655,20 +648,28 @@
      "output_type": "stream",
      "text": [
       "/home/vagrant/lisa/results/Android_Multiple_Workloads\r\n",
-      "├── eas\r\n",
-      "│   ├── Jankbench_list_view\r\n",
-      "│   │   ├── BenchmarkResults\r\n",
-      "│   │   ├── platform.json\r\n",
-      "│   │   └── trace.dat\r\n",
-      "│   └── results.json\r\n",
-      "└── std\r\n",
-      "    ├── Jankbench_list_view\r\n",
-      "    │   ├── BenchmarkResults\r\n",
-      "    │   ├── platform.json\r\n",
-      "    │   └── trace.dat\r\n",
-      "    └── results.json\r\n",
+      "├── j_eas\r\n",
+      "│   └── Jankbench_list_view\r\n",
+      "│       ├── BenchmarkResults\r\n",
+      "│       ├── platform.json\r\n",
+      "│       └── trace.dat\r\n",
+      "├── j_std\r\n",
+      "│   └── Jankbench_list_view\r\n",
+      "│       ├── BenchmarkResults\r\n",
+      "│       ├── platform.json\r\n",
+      "│       └── trace.dat\r\n",
+      "├── u_eas\r\n",
+      "│   └── UiBench_TrivialAnimationActivity\r\n",
+      "│       ├── framestats.txt\r\n",
+      "│       ├── platform.json\r\n",
+      "│       └── trace.html\r\n",
+      "└── y_std\r\n",
+      "    └── YouTube_XSGBVzeBUbk_45s\r\n",
+      "        ├── framestats.txt\r\n",
+      "        ├── platform.json\r\n",
+      "        └── trace.dat\r\n",
       "\r\n",
-      "4 directories, 8 files\r\n"
+      "8 directories, 12 files\r\n"
      ]
     }
    ],