Reporting of policy errors via host-offline-reason: part 3

remoting/host/heartbeat_sender.cc

Index: remoting/host/heartbeat_sender.cc
diff --git a/remoting/host/heartbeat_sender.cc b/remoting/host/heartbeat_sender.cc
index c64f2f49cf1c6b536afa13481ebde83f6dea8882..0622e0caafb25bd4fdf332420d230785db81a295 100644
--- a/remoting/host/heartbeat_sender.cc
+++ b/remoting/host/heartbeat_sender.cc
@@ -7,10 +7,10 @@
 #include <math.h>
 
 #include "base/bind.h"
-#include "base/message_loop/message_loop_proxy.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringize_macros.h"
+#include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "remoting/base/constants.h"
 #include "remoting/base/logging.h"
@@ -54,13 +54,13 @@ HeartbeatSender::HeartbeatSender(
     const base::Closure& on_unknown_host_id_error,
     const std::string& host_id,
     SignalStrategy* signal_strategy,
-    scoped_refptr<RsaKeyPair> key_pair,
+    const scoped_refptr<const RsaKeyPair>& host_key_pair,
     const std::string& directory_bot_jid)
     : on_heartbeat_successful_callback_(on_heartbeat_successful_callback),
       on_unknown_host_id_error_(on_unknown_host_id_error),
       host_id_(host_id),
       signal_strategy_(signal_strategy),
-      key_pair_(key_pair),
+      host_key_pair_(host_key_pair),
       directory_bot_jid_(directory_bot_jid),
       interval_ms_(kDefaultHeartbeatIntervalMs),
       sequence_id_(0),
@@ -69,7 +69,7 @@ HeartbeatSender::HeartbeatSender(
       heartbeat_succeeded_(false),
       failed_startup_heartbeat_count_(0) {
   DCHECK(signal_strategy_);
-  DCHECK(key_pair_.get());
+  DCHECK(host_key_pair_.get());
   DCHECK(thread_checker_.CalledOnValidThread());
 
   signal_strategy_->AddListener(this);
@@ -102,13 +102,43 @@ bool HeartbeatSender::OnSignalStrategyIncomingStanza(
   return false;
 }
 
+void HeartbeatSender::OnHostOfflineReasonTimeout() {
+  DCHECK(!host_offline_reason_ack_callback_.is_null());
+
+  base::Callback<void(bool)> local_callback = host_offline_reason_ack_callback_;
+  host_offline_reason_ack_callback_.Reset();
+  local_callback.Run(false /* success */);

[Wez, 2015/01/08 01:49:50]

s/success/failure :)

[Łukasz Anforowicz, 2015/01/08 23:50:31]

Ok, I can see the ambiguity now.  What I meant was that success == false.  Let
me just remove this comment to avoid the ambiguity (and the comment for "true"
below as well).

[Wez, 2015/01/09 02:55:45]

Actually what I meant was that you comment /* success */ on both the true and
false values!  In general I'd expect a function with a bool return-value to
convey success (i.e. true == succeeded) rather than failure.  Of course, this is
good motivation for using an enum after all, for clarity, I suppose. :-/

[Łukasz Anforowicz, 2015/01/09 19:00:13]

Yes - avoiding this kind of confusion was why I wanted to introduce the
AckOrTimeout enum.

The "/* success */" comment was meant to say that "false" is bound to "success"
parameter, not that "false" indicates success.  C#'s named parameters address
this case nicely (+ give compile-time validation so that names used here do not
get out of sync with parameter declaration [unlike what can easily happen to
comments]).

I'll leave it as-is, but without a /* success */ or a /* failure */ comment
(saing "failure" would be just as confusing - is failure=false [and therefore
success=true]?  or does false mean failure [i.e. success=false]).

+}
+
+void HeartbeatSender::OnHostOfflineReasonAck() {
+  if (host_offline_reason_ack_callback_.is_null()) {
+    DCHECK(!host_offline_reason_timeout_timer_.IsRunning());
+    return;
+  }
+
+  DCHECK(host_offline_reason_timeout_timer_.IsRunning());
+  host_offline_reason_timeout_timer_.Stop();
+
+  // Run the ACK callback under a clean stack via PostTask() (because the
+  // callback can end up deleting |this| HeartbeatSender [i.e. when used from
+  // HostSignalingManager]).
+  base::Closure fully_bound_ack_callback =
+      base::Bind(host_offline_reason_ack_callback_, true /* success */);
+  host_offline_reason_ack_callback_.Reset();
+  base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+                                                fully_bound_ack_callback);
+}
+
 void HeartbeatSender::SetHostOfflineReason(
     const std::string& host_offline_reason,
-    const base::Closure& ack_callback) {
+    const base::TimeDelta& timeout,
+    const base::Callback<void(bool success)>& ack_callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(host_offline_reason_ack_callback_.is_null());
   host_offline_reason_ = host_offline_reason;
   host_offline_reason_ack_callback_ = ack_callback;
+  host_offline_reason_timeout_timer_.Start(
+      FROM_HERE, timeout, this, &HeartbeatSender::OnHostOfflineReasonTimeout);
   if (signal_strategy_->GetState() == SignalStrategy::CONNECTED) {
     DoSendStanza();
   }
@@ -230,12 +260,7 @@ void HeartbeatSender::ProcessResponse(
 
       // Notify caller of SetHostOfflineReason that we got an ack.
       if (is_offline_heartbeat_response) {
-        if (!host_offline_reason_ack_callback_.is_null()) {
-          base::MessageLoop::current()->PostTask(
-              FROM_HERE,
-              host_offline_reason_ack_callback_);
-          host_offline_reason_ack_callback_.Reset();
-        }
+        OnHostOfflineReasonAck();
       }
     }
   }
@@ -310,7 +335,7 @@ scoped_ptr<XmlElement> HeartbeatSender::CreateSignature() {
 
   std::string message = signal_strategy_->GetLocalJid() + ' ' +
       base::IntToString(sequence_id_);
-  std::string signature(key_pair_->SignMessage(message));
+  std::string signature(host_key_pair_->SignMessage(message));
   signature_tag->AddText(signature);
 
   return signature_tag.Pass();