commit aac6479a43138809e8989dae7b3c4b407b806c90
author Hector Dearman <hjd@google.com> Mon Nov 12 17:33:28 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 12 17:33:28 2018 +0000
tree 6a3db064edae094a6059c937d4e9db6b6887fa78
parent d608c792b594a767f8e7c0fdf63a2a9e89490001
parent 5f8b64d15ffa19e0da67e4b9041bf323df2787b4

Merge "perfetto-ui: Avoid setting window_dur to 0ns"

ui/src/tracks/cpu_slices/controller.ts

diff --git a/ui/src/tracks/cpu_slices/controller.ts b/ui/src/tracks/cpu_slices/controller.ts
index 26e46ba..bb987f9 100644
--- a/ui/src/tracks/cpu_slices/controller.ts
+++ b/ui/src/tracks/cpu_slices/controller.ts
@@ -63,7 +63,7 @@
     if (isQuantized) {
       windowStartNs = Math.floor(windowStartNs / bucketSizeNs) * bucketSizeNs;
     }
-    const windowDurNs = endNs - windowStartNs;
+    const windowDurNs = Math.max(1, endNs - windowStartNs);
 
     this.query(`update window_${this.trackState.id} set
       window_start=${windowStartNs},

ui/src/tracks/process_summary/controller.ts

diff --git a/ui/src/tracks/process_summary/controller.ts b/ui/src/tracks/process_summary/controller.ts
index 462b525..b61838f 100644
--- a/ui/src/tracks/process_summary/controller.ts
+++ b/ui/src/tracks/process_summary/controller.ts
@@ -66,7 +66,7 @@
     // |resolution| is in s/px we want # ns for 10px window:
     const bucketSizeNs = Math.round(resolution * 10 * 1e9);
     const windowStartNs = Math.floor(startNs / bucketSizeNs) * bucketSizeNs;
-    const windowDurNs = endNs - windowStartNs;
+    const windowDurNs = Math.max(1, endNs - windowStartNs);
 
     this.query(`update ${this.tableName('window')} set
       window_start=${windowStartNs},