[BattOr] Retry battor_agent commands when they fail.

tools/battor_agent/battor_agent.h

Index: tools/battor_agent/battor_agent.h
diff --git a/tools/battor_agent/battor_agent.h b/tools/battor_agent/battor_agent.h
index 87be4fccfcee206daeb1fe4593b6d7562571f1f6..eb65c89485c992975f0db44ad8e81340b349cf01 100644
--- a/tools/battor_agent/battor_agent.h
+++ b/tools/battor_agent/battor_agent.h
@@ -126,8 +126,6 @@ class BattOrAgent : public BattOrConnection::Listener,
   // Performs an action after a delay.
   void PerformDelayedAction(Action action, base::TimeDelta delay);
 
-
-
   // Requests a connection to the BattOr.
   void BeginConnect();
 
@@ -136,12 +134,18 @@ class BattOrAgent : public BattOrConnection::Listener,
                           uint16_t param1,
                           uint16_t param2);
 
+  // Retry the last command.
+  void RetryCommand();
+
   // Completes the command with the specified error.
   void CompleteCommand(BattOrError error);
 
   // Returns a formatted version of samples_ with timestamps and real units.
   std::string SamplesToString();
 
+  // Sets and restarts the action timeout timer.
+  void setActionTimeout(const uint16_t timeout_seconds);

[charliea (OOO until 10-5), 2017/05/15 19:03:10]

s/setActionTimeout/SetActionTimeout

[charliea (OOO until 10-5), 2017/05/15 19:03:10]

nit: for consistency, maybe just use uint16_t (see SendControlMessage above). I
have no idea if there was an original reason that we used the non-const version,
but it seems worth it to not people wonder why one method used const and another
didn't when neither actually modified the parameter

[aschulman, 2017/05/15 22:26:25]

Done.

[aschulman, 2017/05/15 22:26:25]

Done.

+
   // The listener that handles the commands' results. It must outlive the agent.
   Listener* listener_;
 
@@ -180,14 +184,8 @@ class BattOrAgent : public BattOrConnection::Listener,
   // we receive frames in order.
   uint32_t next_sequence_number_;
 
-  // The number of times we've attempted to init the BattOr.
-  uint8_t num_init_attempts_;
-
-  // The number of times we've attempted the BattOr StartTracing command.
-  uint8_t num_start_tracing_attempts_;
-
-  // The number of times that we've attempted to read the last message.
-  uint8_t num_read_attempts_;
+  // The number of times we've attempted a command.
+  uint8_t num_command_attempts_;
 
   // The timeout that's run when an action times out.
   base::CancelableClosure timeout_callback_;