Add support for process ID and process type to about:tracking2.

chrome/browser/resources/tracking.js

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 var g_browserBridge;
 var g_mainView;
 
+// TODO(eroman): Don't comma-separate PID numbers (since they aren't
+//               really quantities).
+
 /**
  * Main entry point called once the page has loaded.
  */
 function onLoad() {
   g_browserBridge = new BrowserBridge();
   g_mainView = new MainView();
 
   // Ask the browser to send us the current data.
   g_browserBridge.sendGetData();
 }
@@ skipping 93 matching lines @@
   var KEY_BIRTH_THREAD = 'birth_thread';
   var KEY_DEATH_THREAD = 'death_thread';
   var KEY_FUNCTION_NAME = 'location.function_name';
   var KEY_FILE_NAME = 'location.file_name';
   var KEY_LINE_NUMBER = 'location.line_number';
   var KEY_COUNT = 'death_data.count';
   var KEY_QUEUE_TIME = 'death_data.queue_ms';
   var KEY_MAX_QUEUE_TIME = 'death_data.queue_ms_max';
   var KEY_RUN_TIME = 'death_data.run_ms';
   var KEY_MAX_RUN_TIME = 'death_data.run_ms_max';
+  var KEY_PROCESS_ID = 'process_id';
+  var KEY_PROCESS_TYPE = 'process_type';
 
   // The following are computed properties which we add to each row. They
   // are not present in the original JSON stream.
   var KEY_AVG_QUEUE_TIME = 'avg_queue_ms';
   var KEY_AVG_RUN_TIME = 'avg_run_ms';
   var KEY_SOURCE_LOCATION = 'source_location';
 
   // --------------------------------------------------------------------------
   // Aggregators
   // --------------------------------------------------------------------------
@@ skipping 131 matching lines @@
       ]);
 
   /**
    * Enumerates information about various keys. Such as whether their data is
    * expected to be numeric or is a string, a descriptive name (title) for the
    * property, and what function should be used to aggregate the property when
    * displayed in a column.
    */
   var KEY_PROPERTIES = {};
 
+  KEY_PROPERTIES[KEY_PROCESS_ID] = {
+    name: 'PID',
+    type: 'number',
+    aggregator: UniquifyAggregator,
+  };
+
+  KEY_PROPERTIES[KEY_PROCESS_TYPE] = {
+    name: 'Process type',
+    type: 'string',
+    aggregator: UniquifyAggregator,
+  };
+
   KEY_PROPERTIES[KEY_BIRTH_THREAD] = {
     name: 'Birth thread',
     type: 'string',
     aggregator: UniquifyAggregator,
     comparator: threadNameComparator,
   };
 
   KEY_PROPERTIES[KEY_DEATH_THREAD] = {
     name: 'Death thread',
     type: 'string',
@@ skipping 84 matching lines @@
   var ALL_KEYS = [
     KEY_COUNT,
     KEY_RUN_TIME,
     KEY_AVG_RUN_TIME,
     KEY_MAX_RUN_TIME,
     KEY_QUEUE_TIME,
     KEY_AVG_QUEUE_TIME,
     KEY_MAX_QUEUE_TIME,
     KEY_BIRTH_THREAD,
     KEY_DEATH_THREAD,
+    KEY_PROCESS_TYPE,
+    KEY_PROCESS_ID,
     KEY_FUNCTION_NAME,
     KEY_SOURCE_LOCATION,
     KEY_FILE_NAME,
     KEY_LINE_NUMBER,
   ];
 
   // --------------------------------------------------------------------------
   // Default settings
   // --------------------------------------------------------------------------
 
   /**
    * List of keys for those properties which we want to initially omit
    * from the table. (They can be re-enabled by clicking [Edit columns]).
    */
   var INITIALLY_HIDDEN_KEYS = [
     KEY_FILE_NAME,
     KEY_LINE_NUMBER,
     KEY_QUEUE_TIME,
   ];
 
   /**
    * The ordered list of grouping choices to expose in the "Group by"
    * dropdowns. We don't include the numeric properties, since they
    * leads to awkward bucketing.
    */
   var GROUPING_DROPDOWN_CHOICES = [
+    KEY_PROCESS_TYPE,
+    KEY_PROCESS_ID,
     KEY_BIRTH_THREAD,
     KEY_DEATH_THREAD,
     KEY_FUNCTION_NAME,
     KEY_SOURCE_LOCATION,
     KEY_FILE_NAME,
     KEY_LINE_NUMBER,
   ];
 
   /**
    * The ordered list of sorting choices to expose in the "Sort by"
@@ skipping 515 matching lines @@
 
   /**
    * @constructor
    */
   function MainView() {
     this.init_();
   }
 
   MainView.prototype = {
     addData: function(data) {
-      if (this.allData_) {
-        // TODO(eroman): once the browser is calling receivedData() multiple
-        // times, will need to concatenate it. For now disregard any call after
-        // the first. This way when the C++ side change lands to call multiple
-        // times, the javascript will keep working until I upgrade it.
-        return;
+      var pid = data[KEY_PROCESS_ID];
+      var ptype = data[KEY_PROCESS_TYPE];
+
+      // Augment each data row with the process information.
+      var rows = data.list;
+      for (var i = 0; i < rows.length; ++i) {
+        var e = rows[i];
+        e[KEY_PROCESS_ID] = pid;
+        e[KEY_PROCESS_TYPE] = ptype;
       }
-      this.allData_ = data;
+
+      this.allData_ = this.allData_.concat(rows);
       this.redrawData_();
     },
 
     redrawData_: function() {
       var data = this.allData_;
 
       // Figure out what columns to include, based on the selected checkboxes.
       var columns = [];
       for (var i = 0; i < ALL_TABLE_COLUMNS.length; ++i) {
         var key = ALL_TABLE_COLUMNS[i];
         if (this.selectionCheckboxes_[key].checked) {
           columns.push(key);
         }
       }
 
       // Group, aggregate, filter, and sort the data.
       var groupedData = prepareData(
-          data.list, this.getGroupingFunction_(), this.getFilterFunction_(),
+          data, this.getGroupingFunction_(), this.getFilterFunction_(),
           this.getSortingFunction_());
 
       // Figure out a display order for the groups.
       var groupKeys = getDictionaryKeys(groupedData);
       groupKeys.sort(this.getGroupSortingFunction_());
 
       // Clear the results div, sine we may be overwriting older data.
       var parent = $(RESULTS_DIV_ID);
       parent.innerHTML = '';
 
@@ skipping 18 matching lines @@
         var groupKeyString = groupKeys[i];
         var groupData = groupedData[groupKeyString];
         var groupKey = JSON.parse(groupKeyString);
 
         drawGroup(parent, groupKey, groupData, columns,
                   columnOnClickHandler, this.currentSortKeys_);
       }
     },
 
     init_: function() {
+      this.allData_ = [];
       this.fillSelectionCheckboxes_($(COLUMN_TOGGLES_CONTAINER_ID));
 
       $(FILTER_SEARCH_ID).onsearch = this.onChangedFilter_.bind(this);
 
       this.currentSortKeys_ = INITIAL_SORT_KEYS.slice(0);
       this.currentGroupingKeys_ = INITIAL_GROUP_KEYS.slice(0);
 
       this.fillGroupingDropdowns_();
       this.fillSortingDropdowns_();
 
@@ skipping 256 matching lines @@
           groupKey.push(entry);
         }
 
         return JSON.stringify(groupKey);
       };
     },
   };
 
   return MainView;
 })();