[Chromoting] Use ProcessStatsSender in DesktopSessionAgent (desktop process)

remoting/host/desktop_session_agent.cc

Index: remoting/host/desktop_session_agent.cc
diff --git a/remoting/host/desktop_session_agent.cc b/remoting/host/desktop_session_agent.cc
index 2c1baf6940f0b8187d876a0c05b3c4604568c35b..cc2d827ef9ebe6b7fbd7c18060c98cf0b22ca6f5 100644
--- a/remoting/host/desktop_session_agent.cc
+++ b/remoting/host/desktop_session_agent.cc
@@ -12,6 +12,7 @@
 #include "base/memory/ptr_util.h"
 #include "base/memory/shared_memory.h"
 #include "base/process/process_handle.h"
+#include "base/time/time.h"
 #include "build/build_config.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_message.h"
@@ -22,6 +23,7 @@
 #include "remoting/host/chromoting_messages.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/input_injector.h"
+#include "remoting/host/process_stats_sender.h"
 #include "remoting/host/remote_input_filter.h"
 #include "remoting/host/screen_controls.h"
 #include "remoting/host/screen_resolution.h"
@@ -163,6 +165,7 @@ DesktopSessionAgent::DesktopSessionAgent(
       caller_task_runner_(caller_task_runner),
       input_task_runner_(input_task_runner),
       io_task_runner_(io_task_runner),
+      current_process_stats_("DesktopSessionAgent"),
       weak_factory_(this) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 }
@@ -187,6 +190,10 @@ bool DesktopSessionAgent::OnMessageReceived(const IPC::Message& message) {
                           OnInjectTouchEvent)
       IPC_MESSAGE_HANDLER(ChromotingNetworkDesktopMsg_SetScreenResolution,
                           SetScreenResolution)
+      IPC_MESSAGE_HANDLER(ChromotingNetworkToAnyMsg_StartProcessStatsReport,
+                          StartProcessStatsReport)
+      IPC_MESSAGE_HANDLER(ChromotingNetworkToAnyMsg_StopProcessStatsReport,
+                          StopProcessStatsReport)
       IPC_MESSAGE_UNHANDLED(handled = false)
     IPC_END_MESSAGE_MAP()
   } else {
@@ -224,6 +231,7 @@ DesktopSessionAgent::~DesktopSessionAgent() {
   DCHECK(!network_channel_);
   DCHECK(!screen_controls_);
   DCHECK(!video_capturer_);
+  DCHECK(!stats_sender_);
 }
 
 const std::string& DesktopSessionAgent::client_jid() const {
@@ -249,6 +257,12 @@ void DesktopSessionAgent::SetDisableInputs(bool disable_inputs) {
   NOTREACHED();
 }
 
+void DesktopSessionAgent::OnProcessStats(
+    const protocol::AggregatedProcessResourceUsage& usage) {
+  SendToNetwork(
+      base::MakeUnique<ChromotingAnyToNetworkMsg_ReportProcessStats>(usage));
+}
+
 void DesktopSessionAgent::OnStartSessionAgent(
     const std::string& authenticated_jid,
     const ScreenResolution& resolution,
@@ -381,7 +395,8 @@ void DesktopSessionAgent::ProcessAudioPacket(
 mojo::ScopedMessagePipeHandle DesktopSessionAgent::Start(
     const base::WeakPtr<Delegate>& delegate) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
-  DCHECK(delegate_.get() == nullptr);
+  DCHECK(delegate);
+  DCHECK(!delegate_);
 
   delegate_ = delegate;
 
@@ -396,6 +411,8 @@ void DesktopSessionAgent::Stop() {
 
   delegate_.reset();
 
+  stats_sender_.reset();
+
   // Make sure the channel is closed.
   network_channel_.reset();
 
@@ -559,4 +576,24 @@ void DesktopSessionAgent::StopAudioCapturer() {
   audio_capturer_.reset();
 }
 
+void DesktopSessionAgent::StartProcessStatsReport(int interval_ms) {
+  DCHECK(caller_task_runner_->BelongsToCurrentThread());
+  DCHECK(!stats_sender_);
+
+  if (interval_ms <= 0) {
+    interval_ms = 2000;

[joedow, 2017/06/15 22:50:44]

Also, if this is the default value to be used for all process (not just
DesktopSessionAgent) then you probably want it in a central location.

[joedow, 2017/06/15 22:50:44]

Why 2000?  Why not 1 second?
A comment on why this is the default value would be good.  

[Hzj_jie, 2017/06/16 00:39:28]

Done.

[Hzj_jie, 2017/06/16 00:39:28]

Done.

+  }
+
+  stats_sender_.reset(new ProcessStatsSender(
+      this,
+      base::TimeDelta::FromMilliseconds(interval_ms),
+      { &current_process_stats_ }));
+}
+
+void DesktopSessionAgent::StopProcessStatsReport() {
+  DCHECK(caller_task_runner_->BelongsToCurrentThread());
+  DCHECK(stats_sender_);
+  stats_sender_.reset();
+}
+
 }  // namespace remoting