Add process start time and CPU time columns to task manager

chrome/browser/task_manager/sampling/shared_sampler_win.cc

 // Copyright 2016 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.
 
 #include "chrome/browser/task_manager/sampling/shared_sampler.h"
 
 #include <windows.h>
 #include <winternl.h>
 
 #include <algorithm>
 
 #include "base/bind.h"
+#include "base/bit_cast.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/time/time.h"
 #include "chrome/browser/task_manager/task_manager_observer.h"
 #include "chrome/common/chrome_constants.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace task_manager {
 
 namespace {
@@ skipping 190 matching lines @@
   ULONG context_switches;
 };
 
 // Per-process data extracted from SYSTEM_PROCESS_INFORMATION and stored in a
 // snapshot. This structure is accessed only on the worker thread.
 struct ProcessData {
   ProcessData() = default;
   ProcessData(ProcessData&&) = default;
 
   int64_t physical_bytes;
+  base::Time start_time;
+  base::TimeDelta cpu_time;
   std::vector<ThreadData> threads;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ProcessData);
 };
 
 typedef std::map<base::ProcessId, ProcessData> ProcessDataMap;
 
 ULONG CountContextSwitchesDelta(const ProcessData& prev_process_data,
   const ProcessData& new_process_data) {
@@ skipping 73 matching lines @@
   // This object will be created on the UI thread, however the sequenced checker
   // will be used to assert we're running the expensive operations on one of the
   // blocking pool threads.
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   worker_pool_sequenced_checker_.DetachFromSequence();
 }
 
 SharedSampler::~SharedSampler() {}
 
 int64_t SharedSampler::GetSupportedFlags() const {
-  return REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_PHYSICAL_MEMORY;
+  return REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_PHYSICAL_MEMORY |
+         REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME;
 }
 
 SharedSampler::Callbacks::Callbacks() {}
 
 SharedSampler::Callbacks::~Callbacks() {}
 
 SharedSampler::Callbacks::Callbacks(Callbacks&& other) {
   on_idle_wakeups = std::move(other.on_idle_wakeups);
   on_physical_memory = std::move(other.on_physical_memory);
+  on_start_time = std::move(other.on_start_time);
+  on_cpu_time = std::move(other.on_cpu_time);
 }
 
 void SharedSampler::RegisterCallbacks(
     base::ProcessId process_id,
     const OnIdleWakeupsCallback& on_idle_wakeups,
-    const OnPhysicalMemoryCallback& on_physical_memory) {
+    const OnPhysicalMemoryCallback& on_physical_memory,
+    const OnStartTimeCallback& on_start_time,
+    const OnCpuTimeCallback& on_cpu_time) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   if (process_id == 0)
     return;
 
   Callbacks callbacks;
   callbacks.on_idle_wakeups = on_idle_wakeups;
   callbacks.on_physical_memory = on_physical_memory;
+  callbacks.on_start_time = on_start_time;
+  callbacks.on_cpu_time = on_cpu_time;
   bool result = callbacks_map_.insert(
       std::make_pair(process_id, std::move(callbacks))).second;
   DCHECK(result);
 }
 
 void SharedSampler::UnregisterCallbacks(base::ProcessId process_id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   if (process_id == 0)
     return;
@@ skipping 76 matching lines @@
     base::FilePath::StringPieceType image_name) const {
   for (const base::FilePath supported_name : supported_image_names_) {
     if (base::FilePath::CompareEqualIgnoreCase(image_name,
                                                supported_name.value()))
       return true;
   }
 
   return false;
 }
 
+namespace {

[afakhry, 2017/01/09 21:03:42]

Nit: Usually we have a single anonymous namespace at the top of the file.

[chengx, 2017/01/10 00:39:27]

I have moved these two functions to the existing anonymous namespace above.

+// A wrapper function converting ticks (in units of 100 ns) to Time.
+base::Time ConvertTicksToTime(uint64_t ticks) {
+  FILETIME ft = bit_cast<FILETIME, uint64_t>(ticks);
+  return base::Time::FromFileTime(ft);
+}
+
+// A wrapper function converting ticks (in units of 100 ns) to TimeDelta.
+base::TimeDelta ConvertTicksToTimeDelta(uint64_t ticks) {
+  return base::TimeDelta::FromMicroseconds(ticks / 10);
+}
+}

[afakhry, 2017/01/09 21:03:42]

Nit: }  // namespace

[chengx, 2017/01/10 00:39:27]

Done.

+
 std::unique_ptr<ProcessDataSnapshot> SharedSampler::CaptureSnapshot() {
   DCHECK(worker_pool_sequenced_checker_.CalledOnValidSequence());
 
   // Preallocate the buffer with the size determined on the previous call to
   // QuerySystemProcessInformation. This should be sufficient most of the time.
   // QuerySystemProcessInformation will grow the buffer if necessary.
   ByteBuffer data_buffer(previous_buffer_size_);
 
   if (!QuerySystemProcessInformation(&data_buffer))
     return std::unique_ptr<ProcessDataSnapshot>();
@@ skipping 34 matching lines @@
         // terminated the total number of context switches for the process might
         // go down and the delta would be negative.
         // To avoid that we need to compare thread IDs between two snapshots and
         // not count context switches for threads that are missing in the most
         // recent snapshot.
         ProcessData process_data;
 
         process_data.physical_bytes =
             static_cast<int64_t>(pi->WorkingSetPrivateSize);
 
+        process_data.start_time = ConvertTicksToTime(pi->CreateTime);
+
+        process_data.cpu_time =
+            ConvertTicksToTimeDelta(pi->KernelTime + pi->UserTime);
+
         // Iterate over threads and store each thread's ID and number of context
         // switches.
         for (ULONG thread_index = 0; thread_index < pi->NumberOfThreads;
              ++thread_index) {
           const SYSTEM_THREAD_INFORMATION* ti = &pi->Threads[thread_index];
           if (ti->ClientId.UniqueProcess != pi->ProcessId)
             continue;
 
           ThreadData thread_data;
           thread_data.thread_id = static_cast<base::PlatformThreadId>(
@@ skipping 57 matching lines @@
       // Process is missing in the previous snapshot.
       // Use entire number of context switches of the current process.
       idle_wakeups_delta = CountContextSwitchesDelta(ProcessData(), process);
     }
 
     RefreshResult result;
     result.process_id = process_id;
     result.idle_wakeups_per_second =
         static_cast<int>(round(idle_wakeups_delta / time_delta));
     result.physical_bytes = process.physical_bytes;
+    result.start_time = process.start_time;
+    result.cpu_time = process.cpu_time;
     results->push_back(result);
   }
 }
 
 void SharedSampler::MakeResultsFromSnapshot(const ProcessDataSnapshot& snapshot,
                                             RefreshResults* results) {
   for (const auto& pair : snapshot.processes) {
     RefreshResult result;
     result.process_id = pair.first;
     // Use 0 for Idle Wakeups / sec in this case. This is consistent with
     // ProcessMetrics::CalculateIdleWakeupsPerSecond implementation.
     result.idle_wakeups_per_second = 0;
     result.physical_bytes = pair.second.physical_bytes;
+    result.start_time = pair.second.start_time;
+    result.cpu_time = pair.second.cpu_time;
     results->push_back(result);
   }
 }
 
 void SharedSampler::OnRefreshDone(
     std::unique_ptr<RefreshResults> refresh_results) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK_NE(0, refresh_flags_);
 
   size_t result_index = 0;
 
   for (const auto& callback_entry : callbacks_map_) {
     base::ProcessId process_id = callback_entry.first;
     // A sentinel value of -1 is used when the result isn't available.
-    // Task manager will use this to display 'N/A'.
+    // Task manager will use this to display '-'.
     int idle_wakeups_per_second = -1;
     int64_t physical_bytes = -1;
+    base::Time start_time;
+    base::TimeDelta cpu_time;
 
     // Match refresh result by |process_id|.
     // This relies on refresh results being ordered by Process ID.
     // Please note that |refresh_results| might contain some extra entries that
     // don't exist in |callbacks_map_| if there is more than one instance of
     // Chrome. It might be missing some entries too if there is a race condition
     // between getting process information on the worker thread and adding a
     // corresponding TaskGroup to the task manager.
     for (; result_index < refresh_results->size(); ++result_index) {
       const auto& result = (*refresh_results)[result_index];
       if (result.process_id == process_id) {
         // Data matched in |refresh_results|.
         idle_wakeups_per_second = result.idle_wakeups_per_second;
         physical_bytes = result.physical_bytes;
+        start_time = result.start_time;
+        cpu_time = result.cpu_time;
         ++result_index;
         break;
       }
 
       if (result.process_id > process_id) {
         // An entry corresponding to |process_id| is missing. See above.
         break;
       }
     }
 
     if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS,
                                                       refresh_flags_)) {
       DCHECK(callback_entry.second.on_idle_wakeups);
       callback_entry.second.on_idle_wakeups.Run(idle_wakeups_per_second);
     }
 
     if (TaskManagerObserver::IsResourceRefreshEnabled(
         REFRESH_TYPE_PHYSICAL_MEMORY, refresh_flags_)) {
       DCHECK(callback_entry.second.on_physical_memory);
       callback_entry.second.on_physical_memory.Run(physical_bytes);
     }
+
+    if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_START_TIME,
+                                                      refresh_flags_)) {
+      DCHECK(callback_entry.second.on_start_time);
+      callback_entry.second.on_start_time.Run(start_time);
+    }
+
+    if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_CPU_TIME,
+                                                      refresh_flags_)) {
+      DCHECK(callback_entry.second.on_cpu_time);
+      callback_entry.second.on_cpu_time.Run(cpu_time);
+    }
   }
 
   // Reset refresh_results_ to trigger RefreshOnWorkerThread next time Refresh
   // is called.
   refresh_flags_ = 0;
 }
 
 }  // namespace task_manager