Merge pull request google#92 from google/benvanik

Fixing system event times.
ichthyos · Dec 10, 2012 · cce4ed7 · cce4ed7
2 parents 2cc536a + d3f99fc
commit cce4ed7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/injector/wtf-injector-chrome/manifest.json b/injector/wtf-injector-chrome/manifest.json
@@ -4,7 +4,7 @@
   // These can be copy/pasted directly between them.
   // ---------------------------------------------------------------------------
   "manifest_version": 2,
-  "version": "0.0.23",
+  "version": "0.0.24",
   "minimum_chrome_version": "21",
   "offline_enabled": true,
   "incognito": "split",
@@ -24,7 +24,7 @@
   },
   "page_action": {
     "workaround": "https://code.google.com/p/chromium/issues/detail?id=86449"
-  },
+},
   "icons": {
   },
   //"homepage_url": "",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tracing-framework",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "description": "Web Tracing Framework instrumentation and analysis library.",
   "keywords": [
     "javascript",

diff --git a/src/wtf/analysis/db/eventdatatable.js b/src/wtf/analysis/db/eventdatatable.js
@@ -352,7 +352,11 @@ wtf.analysis.db.ScopeEventDataEntry.prototype.getUserTime = function() {
  */
 wtf.analysis.db.ScopeEventDataEntry.prototype.getMeanTime = function() {
   if (this.count) {
-    return this.userTime_ / this.count;
+    if (this.eventType.flags & wtf.data.EventFlag.SYSTEM_TIME) {
+      return this.totalTime_ / this.count;
+    } else {
+      return this.userTime_ / this.count;
+    }
   } else {
     return 0;
   }

diff --git a/src/wtf/app/ui/tracks/trackinfobar.js b/src/wtf/app/ui/tracks/trackinfobar.js
@@ -206,17 +206,23 @@ wtf.app.ui.tracks.TrackInfoBar.prototype.buildTableRow_ = function(
   var content = '';
   if (entry instanceof wtf.analysis.db.ScopeEventDataEntry) {
     var totalTime = Math.round(entry.getTotalTime());
-    if (totalTime < 1) {
+    if (!totalTime) {
+      totalTime = '0';
+    } else if (totalTime < 1) {
       totalTime = '<1';
     }
     totalTime += 'ms';
     var userTime = Math.round(entry.getUserTime());
-    if (userTime < 1) {
+    if (!userTime) {
+      userTime = '0';
+    } else if (userTime < 1) {
       userTime = '<1';
     }
     userTime += 'ms';
     var meanTime = Math.round(entry.getMeanTime());
-    if (meanTime < 1) {
+    if (!meanTime) {
+      meanTime = '0';
+    } else if (meanTime < 1) {
       meanTime = '<1';
     }
     meanTime += 'ms';