ipynb: fix resetting frame statistics

Frame statistics shall be reset before collecting them for the current
workload. This was done in the wrong way before, because the reset
option needs a double dash in front to work properly.

Signed-off-by: Michele Di Giorgio <michele.digiorgio@arm.com>
diff --git a/ipynb/android/workloads/Android_Recents_Fling.ipynb b/ipynb/android/workloads/Android_Recents_Fling.ipynb
index a680fea..6a9e614 100644
--- a/ipynb/android/workloads/Android_Recents_Fling.ipynb
+++ b/ipynb/android/workloads/Android_Recents_Fling.ipynb
@@ -167,24 +167,24 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "2016-04-04 09:41:48,357 INFO    :         Target - Using base path: /home/pippo/work/lisa\n",
-      "2016-04-04 09:41:48,358 INFO    :         Target - Loading custom (inline) target configuration\n",
-      "2016-04-04 09:41:48,359 INFO    :         Target - Loading custom (inline) test configuration\n",
-      "2016-04-04 09:41:48,359 INFO    :         Target - Devlib modules to load: ['bl', 'cpufreq']\n",
-      "2016-04-04 09:41:48,360 INFO    :         Target - Connecting Android target [DEFAULT]\n",
-      "2016-04-04 09:41:48,844 INFO    :         Target - Initializing target workdir:\n",
-      "2016-04-04 09:41:48,846 INFO    :         Target -    /data/local/tmp/devlib-target\n",
-      "2016-04-04 09:41:52,085 INFO    :         Target - Topology:\n",
-      "2016-04-04 09:41:52,087 INFO    :         Target -    [[0, 1, 2, 3], [4, 5]]\n",
-      "2016-04-04 09:41:53,842 INFO    :         FTrace - Enabled tracepoints:\n",
-      "2016-04-04 09:41:53,843 INFO    :         FTrace -   sched_switch\n",
-      "2016-04-04 09:41:53,843 INFO    :         FTrace -   sched_load_avg_cpu\n",
-      "2016-04-04 09:41:53,844 INFO    :         FTrace -   cpu_frequency\n",
-      "2016-04-04 09:41:53,845 INFO    :         FTrace -   cpu_capacity\n",
-      "2016-04-04 09:41:53,846 INFO    :        TestEnv - Set results folder to:\n",
-      "2016-04-04 09:41:53,846 INFO    :        TestEnv -    /home/pippo/work/lisa/results/Android_RecentsFling\n",
-      "2016-04-04 09:41:53,847 INFO    :        TestEnv - Experiment results available also in:\n",
-      "2016-04-04 09:41:53,848 INFO    :        TestEnv -    /home/pippo/work/lisa/results_latest\n"
+      "2016-04-12 15:13:56,738 INFO    :         Target - Using base path: /home/pippo/work/lisa\n",
+      "2016-04-12 15:13:56,740 INFO    :         Target - Loading custom (inline) target configuration\n",
+      "2016-04-12 15:13:56,740 INFO    :         Target - Loading custom (inline) test configuration\n",
+      "2016-04-12 15:13:56,741 INFO    :         Target - Devlib modules to load: ['bl', 'cpufreq']\n",
+      "2016-04-12 15:13:56,742 INFO    :         Target - Connecting Android target [DEFAULT]\n",
+      "2016-04-12 15:13:57,210 INFO    :         Target - Initializing target workdir:\n",
+      "2016-04-12 15:13:57,211 INFO    :         Target -    /data/local/tmp/devlib-target\n",
+      "2016-04-12 15:13:59,578 INFO    :         Target - Topology:\n",
+      "2016-04-12 15:13:59,579 INFO    :         Target -    [[0, 1, 2, 3], [4, 5]]\n",
+      "2016-04-12 15:14:00,205 INFO    :         FTrace - Enabled tracepoints:\n",
+      "2016-04-12 15:14:00,206 INFO    :         FTrace -   sched_switch\n",
+      "2016-04-12 15:14:00,207 INFO    :         FTrace -   sched_load_avg_cpu\n",
+      "2016-04-12 15:14:00,208 INFO    :         FTrace -   cpu_frequency\n",
+      "2016-04-12 15:14:00,208 INFO    :         FTrace -   cpu_capacity\n",
+      "2016-04-12 15:14:00,209 INFO    :        TestEnv - Set results folder to:\n",
+      "2016-04-12 15:14:00,210 INFO    :        TestEnv -    /home/pippo/work/lisa/results/Android_RecentsFling\n",
+      "2016-04-12 15:14:00,211 INFO    :        TestEnv - Experiment results available also in:\n",
+      "2016-04-12 15:14:00,211 INFO    :        TestEnv -    /home/pippo/work/lisa/results_latest\n"
      ]
     }
    ],
@@ -292,7 +292,7 @@
     "    # Allow the activity to start\n",
     "    sleep(5)\n",
     "    # Reset framestats collection\n",
-    "    target.execute('dumpsys gfxinfo com.android.systemui reset')\n",
+    "    target.execute('dumpsys gfxinfo --reset')\n",
     "    \n",
     "    logging.info('Start Swiping Recents')\n",
     "    for i in range(5):\n",
@@ -376,20 +376,20 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "2016-04-04 09:41:57,105 INFO    : ------------------------\n",
-      "2016-04-04 09:41:57,106 INFO    : Run workload using performance governor\n",
-      "2016-04-04 09:42:04,021 INFO    : Start Swiping Recents\n",
-      "2016-04-04 09:42:28,027 INFO    : Swiping Recents Completed\n",
-      "2016-04-04 09:42:32,728 INFO    : Parsing FTrace format...\n",
-      "2016-04-04 09:42:39,708 INFO    : Collected events spans a 30.572 [s] time interval\n",
-      "2016-04-04 09:42:39,709 INFO    : Set plots time range to (0.000000, 30.572386)[s]\n",
-      "2016-04-04 09:42:40,464 INFO    : ------------------------\n",
-      "2016-04-04 09:42:40,465 INFO    : Run workload using interactive governor\n",
-      "2016-04-04 09:42:48,496 INFO    : Start Swiping Recents\n",
-      "2016-04-04 09:43:14,170 INFO    : Swiping Recents Completed\n",
-      "2016-04-04 09:43:21,224 INFO    : Parsing FTrace format...\n",
-      "2016-04-04 09:43:28,047 INFO    : Collected events spans a 32.606 [s] time interval\n",
-      "2016-04-04 09:43:28,047 INFO    : Set plots time range to (0.000000, 32.606496)[s]\n"
+      "2016-04-12 15:14:07,112 INFO    : ------------------------\n",
+      "2016-04-12 15:14:07,113 INFO    : Run workload using performance governor\n",
+      "2016-04-12 15:14:14,452 INFO    : Start Swiping Recents\n",
+      "2016-04-12 15:14:38,443 INFO    : Swiping Recents Completed\n",
+      "2016-04-12 15:14:44,128 INFO    : Parsing FTrace format...\n",
+      "2016-04-12 15:14:51,841 INFO    : Collected events spans a 30.689 [s] time interval\n",
+      "2016-04-12 15:14:51,842 INFO    : Set plots time range to (0.000000, 30.688793)[s]\n",
+      "2016-04-12 15:14:52,761 INFO    : ------------------------\n",
+      "2016-04-12 15:14:52,761 INFO    : Run workload using interactive governor\n",
+      "2016-04-12 15:15:00,321 INFO    : Start Swiping Recents\n",
+      "2016-04-12 15:15:25,884 INFO    : Swiping Recents Completed\n",
+      "2016-04-12 15:15:33,608 INFO    : Parsing FTrace format...\n",
+      "2016-04-12 15:15:41,310 INFO    : Collected events spans a 32.681 [s] time interval\n",
+      "2016-04-12 15:15:41,310 INFO    : Set plots time range to (0.000000, 32.681148)[s]\n"
      ]
     }
    ],
@@ -425,20 +425,20 @@
      "output_type": "stream",
      "text": [
       "Frame Statistics for PERFORMANCE governor\n",
-      "Stats since: 2531514142885ns\n",
-      "Total frames rendered: 1172\n",
-      "Janky frames: 59 (5.03%)\n",
-      "90th percentile: 14ms\n",
-      "95th percentile: 16ms\n",
-      "99th percentile: 21ms\n",
+      "Stats since: 26524169207ns\n",
+      "Total frames rendered: 10425\n",
+      "Janky frames: 1175 (11.27%)\n",
+      "90th percentile: 18ms\n",
+      "95th percentile: 24ms\n",
+      "99th percentile: 40ms\n",
       "\n",
       "Frame Statistics for INTERACTIVE governor\n",
-      "Stats since: 2575988935420ns\n",
-      "Total frames rendered: 1181\n",
-      "Janky frames: 101 (8.55%)\n",
-      "90th percentile: 16ms\n",
-      "95th percentile: 19ms\n",
-      "99th percentile: 26ms\n",
+      "Stats since: 26524169207ns\n",
+      "Total frames rendered: 11673\n",
+      "Janky frames: 1265 (10.84%)\n",
+      "90th percentile: 17ms\n",
+      "95th percentile: 24ms\n",
+      "99th percentile: 40ms\n",
       "\n"
      ]
     }
@@ -469,6 +469,12 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython2",
    "version": "2.7.6"
+  },
+  "toc": {
+   "toc_cell": false,
+   "toc_number_sections": true,
+   "toc_threshold": 6,
+   "toc_window_display": false
   }
  },
  "nbformat": 4,
diff --git a/ipynb/android/workloads/Android_YouTube.ipynb b/ipynb/android/workloads/Android_YouTube.ipynb
index ed065c6..1f0b6c7 100644
--- a/ipynb/android/workloads/Android_YouTube.ipynb
+++ b/ipynb/android/workloads/Android_YouTube.ipynb
@@ -198,26 +198,26 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "2016-04-04 09:53:50,297 INFO    :         Target - Using base path: /home/pippo/work/lisa\n",
-      "2016-04-04 09:53:50,298 INFO    :         Target - Loading custom (inline) target configuration\n",
-      "2016-04-04 09:53:50,299 INFO    :         Target - Loading custom (inline) test configuration\n",
-      "2016-04-04 09:53:50,299 INFO    :         Target - Devlib modules to load: ['bl', 'cpufreq']\n",
-      "2016-04-04 09:53:50,300 INFO    :         Target - Connecting Android target [DEFAULT]\n",
-      "2016-04-04 09:53:50,601 INFO    :         Target - Initializing target workdir:\n",
-      "2016-04-04 09:53:50,602 INFO    :         Target -    /data/local/tmp/devlib-target\n",
-      "2016-04-04 09:53:51,497 INFO    :         Target - Topology:\n",
-      "2016-04-04 09:53:51,498 INFO    :         Target -    [[0, 1, 2, 3], [4, 5]]\n",
-      "2016-04-04 09:53:51,917 INFO    :         FTrace - Enabled tracepoints:\n",
-      "2016-04-04 09:53:51,918 INFO    :         FTrace -   sched_switch\n",
-      "2016-04-04 09:53:51,919 INFO    :         FTrace -   sched_load_avg_cpu\n",
-      "2016-04-04 09:53:51,920 INFO    :         FTrace -   cpu_frequency\n",
-      "2016-04-04 09:53:51,920 INFO    :         FTrace -   cpu_capacity\n",
-      "2016-04-04 09:53:51,921 WARNING :        TestEnv - Wipe previous contents of the results folder:\n",
-      "2016-04-04 09:53:51,922 WARNING :        TestEnv -    /home/pippo/work/lisa/results/Android_Youtube\n",
-      "2016-04-04 09:53:51,923 INFO    :        TestEnv - Set results folder to:\n",
-      "2016-04-04 09:53:51,923 INFO    :        TestEnv -    /home/pippo/work/lisa/results/Android_Youtube\n",
-      "2016-04-04 09:53:51,924 INFO    :        TestEnv - Experiment results available also in:\n",
-      "2016-04-04 09:53:51,925 INFO    :        TestEnv -    /home/pippo/work/lisa/results_latest\n"
+      "2016-04-12 15:20:10,656 INFO    :         Target - Using base path: /home/pippo/work/lisa\n",
+      "2016-04-12 15:20:10,657 INFO    :         Target - Loading custom (inline) target configuration\n",
+      "2016-04-12 15:20:10,658 INFO    :         Target - Loading custom (inline) test configuration\n",
+      "2016-04-12 15:20:10,659 INFO    :         Target - Devlib modules to load: ['bl', 'cpufreq']\n",
+      "2016-04-12 15:20:10,660 INFO    :         Target - Connecting Android target [DEFAULT]\n",
+      "2016-04-12 15:20:11,142 INFO    :         Target - Initializing target workdir:\n",
+      "2016-04-12 15:20:11,144 INFO    :         Target -    /data/local/tmp/devlib-target\n",
+      "2016-04-12 15:20:13,757 INFO    :         Target - Topology:\n",
+      "2016-04-12 15:20:13,759 INFO    :         Target -    [[0, 1, 2, 3], [4, 5]]\n",
+      "2016-04-12 15:20:14,399 INFO    :         FTrace - Enabled tracepoints:\n",
+      "2016-04-12 15:20:14,400 INFO    :         FTrace -   sched_switch\n",
+      "2016-04-12 15:20:14,401 INFO    :         FTrace -   sched_load_avg_cpu\n",
+      "2016-04-12 15:20:14,402 INFO    :         FTrace -   cpu_frequency\n",
+      "2016-04-12 15:20:14,402 INFO    :         FTrace -   cpu_capacity\n",
+      "2016-04-12 15:20:14,403 WARNING :        TestEnv - Wipe previous contents of the results folder:\n",
+      "2016-04-12 15:20:14,404 WARNING :        TestEnv -    /home/pippo/work/lisa/results/Android_Youtube\n",
+      "2016-04-12 15:20:14,434 INFO    :        TestEnv - Set results folder to:\n",
+      "2016-04-12 15:20:14,435 INFO    :        TestEnv -    /home/pippo/work/lisa/results/Android_Youtube\n",
+      "2016-04-12 15:20:14,435 INFO    :        TestEnv - Experiment results available also in:\n",
+      "2016-04-12 15:20:14,435 INFO    :        TestEnv -    /home/pippo/work/lisa/results_latest\n"
      ]
     }
    ],
@@ -332,7 +332,7 @@
     "    # Allow the activity to start\n",
     "    sleep(3)\n",
     "    # Reset framestats collection\n",
-    "    target.execute('dumpsys gfxinfo com.google.android.youtube reset')\n",
+    "    target.execute('dumpsys gfxinfo --reset')\n",
     "    # Wait until the end of the video\n",
     "    sleep(video_duration_s)\n",
     "    \n",
@@ -424,20 +424,20 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "2016-04-04 09:53:55,572 INFO    : ------------------------\n",
-      "2016-04-04 09:53:55,573 INFO    : Run workload using performance governor\n",
-      "2016-04-04 09:53:55,602 INFO    : SysTrace: /home/pippo/work/catapult/systrace/systrace/systrace.py -o /home/pippo/work/lisa/results/Android_Youtube/performance/trace.html gfx view sched freq idle -t 15\n",
-      "2016-04-04 09:54:17,569 INFO    : Waiting systrace report [/home/pippo/work/lisa/results/Android_Youtube/performance/trace.html]...\n",
-      "2016-04-04 09:54:25,690 INFO    : Parsing SysTrace format...\n",
-      "2016-04-04 09:54:27,453 INFO    : Collected events spans a 1.990 [s] time interval\n",
-      "2016-04-04 09:54:27,454 INFO    : Set plots time range to (0.000000, 1.989924)[s]\n",
-      "2016-04-04 09:54:27,728 INFO    : ------------------------\n",
-      "2016-04-04 09:54:27,729 INFO    : Run workload using interactive governor\n",
-      "2016-04-04 09:54:27,760 INFO    : SysTrace: /home/pippo/work/catapult/systrace/systrace/systrace.py -o /home/pippo/work/lisa/results/Android_Youtube/interactive/trace.html gfx view sched freq idle -t 15\n",
-      "2016-04-04 09:54:49,578 INFO    : Waiting systrace report [/home/pippo/work/lisa/results/Android_Youtube/interactive/trace.html]...\n",
-      "2016-04-04 09:54:55,677 INFO    : Parsing SysTrace format...\n",
-      "2016-04-04 09:54:57,496 INFO    : Collected events spans a 3.916 [s] time interval\n",
-      "2016-04-04 09:54:57,496 INFO    : Set plots time range to (0.000000, 3.915946)[s]\n"
+      "2016-04-12 15:20:15,080 INFO    : ------------------------\n",
+      "2016-04-12 15:20:15,081 INFO    : Run workload using performance governor\n",
+      "2016-04-12 15:20:15,219 INFO    : SysTrace: /home/pippo/work/catapult/systrace/systrace/systrace.py -o /home/pippo/work/lisa/results/Android_Youtube/performance/trace.html gfx view sched freq idle -t 15\n",
+      "2016-04-12 15:20:37,068 INFO    : Waiting systrace report [/home/pippo/work/lisa/results/Android_Youtube/performance/trace.html]...\n",
+      "2016-04-12 15:20:42,981 INFO    : Parsing SysTrace format...\n",
+      "2016-04-12 15:20:44,844 INFO    : Collected events spans a 3.673 [s] time interval\n",
+      "2016-04-12 15:20:44,845 INFO    : Set plots time range to (0.000000, 3.672542)[s]\n",
+      "2016-04-12 15:20:45,134 INFO    : ------------------------\n",
+      "2016-04-12 15:20:45,135 INFO    : Run workload using interactive governor\n",
+      "2016-04-12 15:20:45,177 INFO    : SysTrace: /home/pippo/work/catapult/systrace/systrace/systrace.py -o /home/pippo/work/lisa/results/Android_Youtube/interactive/trace.html gfx view sched freq idle -t 15\n",
+      "2016-04-12 15:21:08,083 INFO    : Waiting systrace report [/home/pippo/work/lisa/results/Android_Youtube/interactive/trace.html]...\n",
+      "2016-04-12 15:21:25,486 INFO    : Parsing SysTrace format...\n",
+      "2016-04-12 15:21:27,296 INFO    : Collected events spans a 3.450 [s] time interval\n",
+      "2016-04-12 15:21:27,296 INFO    : Set plots time range to (0.000000, 3.449909)[s]\n"
      ]
     }
    ],
@@ -470,20 +470,20 @@
      "output_type": "stream",
      "text": [
       "Frame Statistics for PERFORMANCE governor\n",
-      "Stats since: 3248251288653ns\n",
-      "Total frames rendered: 24\n",
-      "Janky frames: 0 (0.00%)\n",
-      "90th percentile: 15ms\n",
-      "95th percentile: 15ms\n",
-      "99th percentile: 16ms\n",
+      "Stats since: 6429956328009ns\n",
+      "Total frames rendered: 549\n",
+      "Janky frames: 65 (11.84%)\n",
+      "90th percentile: 17ms\n",
+      "95th percentile: 34ms\n",
+      "99th percentile: 89ms\n",
       "\n",
       "Frame Statistics for INTERACTIVE governor\n",
-      "Stats since: 3280611378849ns\n",
-      "Total frames rendered: 52\n",
-      "Janky frames: 8 (15.38%)\n",
-      "90th percentile: 21ms\n",
-      "95th percentile: 22ms\n",
-      "99th percentile: 85ms\n",
+      "Stats since: 6429956328009ns\n",
+      "Total frames rendered: 665\n",
+      "Janky frames: 88 (13.23%)\n",
+      "90th percentile: 18ms\n",
+      "95th percentile: 36ms\n",
+      "99th percentile: 89ms\n",
       "\n"
      ]
     }
@@ -498,7 +498,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 14,
    "metadata": {
     "collapsed": true
    },
@@ -526,6 +526,12 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython2",
    "version": "2.7.6"
+  },
+  "toc": {
+   "toc_cell": false,
+   "toc_number_sections": true,
+   "toc_threshold": 6,
+   "toc_window_display": false
   }
  },
  "nbformat": 4,