plumb network upload into the task manager

chrome/browser/task_manager/providers/task.h

 // 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.
 
 #ifndef CHROME_BROWSER_TASK_MANAGER_PROVIDERS_TASK_H_
 #define CHROME_BROWSER_TASK_MANAGER_PROVIDERS_TASK_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 67 matching lines @@
 
   // Will be called to let the task refresh itself between refresh cycles.
   // |update_interval| is the time since the last task manager refresh.
   // the |refresh_flags| indicate which resources should be calculated on each
   // refresh.
   virtual void Refresh(const base::TimeDelta& update_interval,
                        int64_t refresh_flags);
 
   // Will receive this notification through the task manager from
   // |ChromeNetworkDelegate::OnNetworkBytesReceived()|. The task will add to the
-  // |current_byte_count_| in this refresh cycle.
+  // |cummulative_read_bytes_|.
   void OnNetworkBytesRead(int64_t bytes_read);
 
+  // Will receive this notification through the task manager from
+  // |ChromeNetworkDelegate::OnNetworkBytesSent()|. The task will add to the
+  // |cummulative_sent_bytes_| in this refresh cycle.
+  void OnNetworkBytesSent(int64_t bytes_sent);
+
   // Returns the task type.
   virtual Type GetType() const = 0;
 
   // This is the unique ID of the BrowserChildProcessHost/RenderProcessHost. It
   // is not the PID nor the handle of the process.
   // For a task that represents the browser process, the return value is 0. For
   // other tasks that represent renderers and other child processes, the return
   // value is whatever unique IDs of their hosts in the browser process.
   virtual int GetChildProcessUniqueID() const = 0;
 
@@ skipping 30 matching lines @@
   virtual int64_t GetV8MemoryUsed() const;
 
   // Checking if the task reports Webkit resource cache statistics and getting
   // them if it does.
   virtual bool ReportsWebCacheStats() const;
   virtual blink::WebCache::ResourceTypeStats GetWebCacheStats() const;
 
   // Returns the keep-alive counter if the Task is an event page, -1 otherwise.
   virtual int GetKeepaliveCount() const;
 
-  // Checking whether the task reports network usage.
-  bool ReportsNetworkUsage() const;
+  int64_t task_id() const { return task_id_; }
 
-  int64_t task_id() const { return task_id_; }
-  int64_t network_usage() const { return network_usage_; }
+  // Returns the instantaneous rate, in bytes per second, of network usage
+  // (sent and recieved), as measured over the last refresh cycle.

[ncarter (slow), 2017/06/20 19:52:27]

received is still typo

[cburn, 2017/06/20 21:34:55]

Done.

+  int64_t network_usage_rate() const {
+    return network_sent_rate_ + network_read_rate_;
+  }
+
+  // Returns the cumulative number of bytes of network use (sent and received)
+  // over the tasks lifetime. It is calculated independently of refreshes and
+  // is based on the current |cumulative_bytes_read_| and
+  // |cumulative_bytes_sent_|.
+  int64_t cumulative_network_usage() const {
+    return cumulative_bytes_sent_ + cumulative_bytes_read_;
+  }
+
   const base::string16& title() const { return title_; }
   const std::string& rappor_sample_name() const { return rappor_sample_name_; }
   const gfx::ImageSkia& icon() const { return icon_; }
   const base::ProcessHandle& process_handle() const { return process_handle_; }
   const base::ProcessId& process_id() const { return process_id_; }
 
  protected:
   void set_title(const base::string16& new_title) { title_ = new_title; }
   void set_rappor_sample_name(const std::string& sample) {
     rappor_sample_name_ = sample;
   }
   void set_icon(const gfx::ImageSkia& new_icon) { icon_ = new_icon; }
 
  private:
   // The unique ID of this task.
   const int64_t task_id_;
 
-  // The task's network usage in the current refresh cycle measured in bytes per
-  // second. A value of -1 means this task doesn't report network usage data.
-  int64_t network_usage_;
+  // The sum of all bytes that have been uploaded from this task calculated at
+  // the last refresh.
+  int64_t last_refresh_cumulative_bytes_sent_;
 
-  // The current network bytes received by this task during the current refresh
-  // cycle. A value of -1 means this task has never been notified of any network
-  // usage.
-  int64_t current_byte_count_;
+  // The sum of all bytes that have been downloaded from this task calculated
+  // at the last refresh.
+  int64_t last_refresh_cumulative_bytes_read_;
+
+  // A continuously updating sum of all bytes that have been uploaded from this
+  // task. It is assigned to |last_refresh_cumulative_bytes_sent_| at the end
+  // of a refresh.
+  int64_t cumulative_bytes_sent_;
+
+  // A continuously updating sum of all bytes that have been downloaded from
+  // this task. It is assigned to |last_refresh_cumulative_bytes_sent_| at the
+  // end of a refresh.
+  int64_t cumulative_bytes_read_;
+
+  // The upload rate (in bytes per second) for this task during the latest
+  // refresh.
+  int64_t network_sent_rate_;
+
+  // The download rate (in bytes per second) for this task during the latest
+  // refresh.
+  int64_t network_read_rate_;
 
   // The title of the task.
   base::string16 title_;
 
   // The name of the sample representing this task when a Rappor sample needs to
   // be recorded for it.
   std::string rappor_sample_name_;
 
   // The favicon.
   gfx::ImageSkia icon_;
 
   // The handle of the process on which this task is running.
   const base::ProcessHandle process_handle_;
 
   // The PID of the process on which this task is running.
   const base::ProcessId process_id_;
 
   DISALLOW_COPY_AND_ASSIGN(Task);
 };
 
 }  // namespace task_manager
 
 #endif  // CHROME_BROWSER_TASK_MANAGER_PROVIDERS_TASK_H_