plumb network upload into the task manager

chrome/browser/task_manager/sampling/task_manager_impl.cc

 // Copyright 2015 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/task_manager_impl.h"
 
 #include <algorithm>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
@@ skipping 218 matching lines @@
 void TaskManagerImpl::GetTerminationStatus(TaskId task_id,
                                            base::TerminationStatus* out_status,
                                            int* out_error_code) const {
   GetTaskByTaskId(task_id)->GetTerminationStatus(out_status, out_error_code);
 }
 
 int64_t TaskManagerImpl::GetNetworkUsage(TaskId task_id) const {
   return GetTaskByTaskId(task_id)->network_usage();
 }
 
+int64_t TaskManagerImpl::GetTotalNetworkUsage(TaskId task_id) const {
+  return GetTaskByTaskId(task_id)->total_network_usage();
+}
+
 int64_t TaskManagerImpl::GetProcessTotalNetworkUsage(TaskId task_id) const {
   return GetTaskGroupByTaskId(task_id)->per_process_network_usage();
 }
 
+int64_t TaskManagerImpl::GetTotalProcessTotalNetworkUsage(
+    TaskId task_id) const {
+  return GetTaskGroupByTaskId(task_id)->total_per_process_network_usage();
+}
+
 int64_t TaskManagerImpl::GetSqliteMemoryUsed(TaskId task_id) const {
   return GetTaskByTaskId(task_id)->GetSqliteMemoryUsed();
 }
 
 bool TaskManagerImpl::GetV8Memory(TaskId task_id,
                                   int64_t* allocated,
                                   int64_t* used) const {
   const Task* task = GetTaskByTaskId(task_id);
   if (!task->ReportsV8Memory())
     return false;
@@ skipping 192 matching lines @@
   sorted_task_ids_.clear();
 }
 
 void TaskManagerImpl::TaskUnresponsive(Task* task) {
   DCHECK(task);
   NotifyObserversOnTaskUnresponsive(task->task_id());
 }
 
 // static
 void TaskManagerImpl::OnMultipleBytesReadUI(
-    std::vector<BytesReadParam>* params) {
+    std::vector<BytesTransferedParam>* params) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(params);
 
-  for (BytesReadParam& param : *params) {
+  for (BytesTransferedParam& param : *params) {
     if (!GetInstance()->UpdateTasksWithBytesRead(param)) {
       // We can't match a task to the notification.  That might mean the
       // tab that started a download was closed, or the request may have had
       // no originating task associated with it in the first place.
       // We attribute orphaned/unaccounted activity to the Browser process.
       DCHECK(param.origin_pid || (param.child_id != -1));
 
       param.origin_pid = 0;
       param.child_id = param.route_id = -1;
 
       GetInstance()->UpdateTasksWithBytesRead(param);
     }
   }
 }
 
+// static
+void TaskManagerImpl::OnMultipleBytesSentUI(

[ncarter (slow), 2017/06/08 23:37:18]

Once BytesTransferedParam holds both send and read data, merge this with
OnMultipleBytesReadUI.

Possible name suggestion: AscribeNetworkUsageOnUI?

[cburn, 2017/06/14 18:04:37]

Done. Named it OnMultipleBytesTransfered to try to keep parallel naming and if
anyone is searching or grepping around for OnMultipleBytes looking for the old
name something will still come up. 

+    std::vector<BytesTransferedParam>* params) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  DCHECK(params);
+
+  for (BytesTransferedParam& param : *params) {
+    if (!GetInstance()->UpdateTasksWithBytesSent(param)) {
+      // We can't match a task to the notification.  That might mean the
+      // tab that started a download was closed, or the request may have had
+      // no originating task associated with it in the first place.
+      // We attribute orphaned/unaccounted activity to the Browser process.
+      DCHECK(param.origin_pid || (param.child_id != -1));
+
+      param.origin_pid = 0;
+      param.child_id = param.route_id = -1;
+
+      GetInstance()->UpdateTasksWithBytesSent(param);
+    }
+  }
+}
+
 void TaskManagerImpl::OnVideoMemoryUsageStatsUpdate(
     const gpu::VideoMemoryUsageStats& gpu_memory_stats) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   gpu_memory_stats_ = gpu_memory_stats;
 }
 
 void TaskManagerImpl::Refresh() {
   if (IsResourceRefreshEnabled(REFRESH_TYPE_GPU_MEMORY)) {
     content::GpuDataManager::GetInstance()->RequestVideoMemoryUsageStatsUpdate(
@@ skipping 43 matching lines @@
                                            int route_id) const {
   for (const auto& task_provider : task_providers_) {
     Task* task =
         task_provider->GetTaskOfUrlRequest(origin_pid, child_id, route_id);
     if (task)
       return task;
   }
   return nullptr;
 }
 
-bool TaskManagerImpl::UpdateTasksWithBytesRead(const BytesReadParam& param) {
+bool TaskManagerImpl::UpdateTasksWithBytesRead(

[ncarter (slow), 2017/06/08 23:37:18]

Merge this function with TaskManagerImpl::UpdateTasksWithBytesSent.
(UpdateTasksWithNetworkUsage ? )

[cburn, 2017/06/14 18:04:38]

Done. I went with UpdateTasksWithBytesTransfered to try to keep naming
predictable for searching.

+    const BytesTransferedParam& param) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   Task* task =
       GetTaskByPidOrRoute(param.origin_pid, param.child_id, param.route_id);
   if (task) {
     task->OnNetworkBytesRead(param.byte_count);

[ncarter (slow), 2017/06/08 23:37:18]

This might be the natural spot to split off into separate Read/Sent methods.
We've already looked up the Task, so we can just have two calls here:

if (task) {
  task->OnNetworkBytesRead(param.bytes_read);
  task->OnNetworkBytesSent(param.bytes_sent);
  return true;
}

[cburn, 2017/06/14 18:04:38]

Done.

     return true;
   }
 
   // Couldn't match the bytes to any existing task.
   return false;
 }
 
+bool TaskManagerImpl::UpdateTasksWithBytesSent(
+    const BytesTransferedParam& param) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+
+  Task* task =
+      GetTaskByPidOrRoute(param.origin_pid, param.child_id, param.route_id);
+  if (task) {
+    task->OnNetworkBytesSent(param.byte_count);
+    return true;
+  }
+
+  // Couldn't match the bytes to any existing task.
+  return false;
+}
+
 TaskGroup* TaskManagerImpl::GetTaskGroupByTaskId(TaskId task_id) const {
   auto it = task_groups_by_task_id_.find(task_id);
   DCHECK(it != task_groups_by_task_id_.end());
   return it->second;
 }
 
 Task* TaskManagerImpl::GetTaskByTaskId(TaskId task_id) const {
   return GetTaskGroupByTaskId(task_id)->GetTaskById(task_id);
 }
 
 void TaskManagerImpl::OnTaskGroupBackgroundCalculationsDone() {
   // TODO(afakhry): There should be a better way for doing this!
   bool are_all_processes_data_ready = true;
   for (const auto& groups_itr : task_groups_by_proc_id_) {
     are_all_processes_data_ready &=
         groups_itr.second->AreBackgroundCalculationsDone();
   }
   if (are_all_processes_data_ready) {
     NotifyObserversOnRefreshWithBackgroundCalculations(GetTaskIdsList());
     for (const auto& groups_itr : task_groups_by_proc_id_)
       groups_itr.second->ClearCurrentBackgroundCalculationsFlags();
   }
 }
 
 }  // namespace task_manager