tcp: Replaced timer structs with Timer class 58d0345

Author: AndreasAakesson

api/net/tcp/connection.hpp

@@ -26,6 +26,7 @@
 #include "tcp_errors.hpp"
 #include "write_queue.hpp"
 #include <delegate>
+#include <util/timer.hpp>
 
 namespace net {
   class TCP;
@@ -477,20 +478,11 @@ class Connection : public std::enable_shared_from_this<Connection> {
   /** State if connection is in TCP write queue or not. */
   bool queued_;
 
-  /** When time-wait timer was started. Used in start_time_wait_timeout */
-  uint64_t time_wait_started;
-
   /** Retransmission timer */
-  struct {
-    uint32_t id;
-    bool active = false;
-  } rtx_timer;
+  Timer rtx_timer;
 
   /** Time Wait timeout timer */
-  struct {
-    uint32_t id;
-    bool active = false;
-  } timewait_timer;
+  Timer timewait_timer;
 
   /** Number of retransmission attempts on the packet first in RT-queue */
   size_t rtx_attempt_ = 0;
@@ -853,20 +845,20 @@ class Connection : public std::enable_shared_from_this<Connection> {
   /*
     Start retransmission timer.
   */
-  void rtx_start();
+  void rtx_start()
+  { rtx_timer.start(rttm.rto_ms()); }
 
   /*
     Stop retransmission timer.
   */
-  void rtx_stop();
+  void rtx_stop()
+  { rtx_timer.stop(); }
 
   /*
     Restart retransmission timer.
   */
-  void rtx_reset() {
-    rtx_stop();
-    rtx_start();
-  }
+  void rtx_reset()
+  { rtx_timer.restart(rttm.rto_ms()); }
 
   /*
     Retransmission timeout limit reached

src/net/tcp/connection.cpp

@@ -25,8 +25,6 @@
 #include <net/tcp/packet.hpp>
 #include <net/tcp/tcp.hpp>
 #include <net/tcp/tcp_errors.hpp>
-#include <timers>
-
 
 using namespace net::tcp;
 using namespace std;
@@ -45,7 +43,8 @@ Connection::Connection(TCP& host, port_t local_port, Socket remote) :
   writeq(),
   bytes_rx_(0), bytes_tx_(0),
   queued_(false),
-  time_wait_started(0)
+  rtx_timer({this, &Connection::rtx_timeout}),
+  timewait_timer({this, &Connection::timewait_timeout})
 {
   setup_congestion_control();
   setup_default_callbacks();
@@ -294,8 +293,7 @@ void Connection::limited_tx() {
 void Connection::writeq_reset() {
   debug2("<Connection::writeq_reset> Reseting.\n");
   writeq.reset();
-  if(rtx_timer.active)
-    rtx_stop();
+  rtx_timer.stop();
 }
 
 void Connection::open(bool active) {
@@ -416,7 +414,7 @@ void Connection::transmit(Packet_ptr packet) {
   bytes_tx_ += packet->tcp_data_length();
 
   host_.transmit(packet);
-  if(packet->should_rtx() and !rtx_timer.active) {
+  if(packet->should_rtx() and !rtx_timer.is_running()) {
     rtx_start();
   }
 }
@@ -475,7 +473,7 @@ bool Connection::handle_ack(Packet_ptr in) {
     cb.SND.UNA = in->ack();
 
     // ack everything in rtx queue
-    if(rtx_timer.active)
+    if(rtx_timer.is_running())
       rtx_ack(in->ack());
 
     // update cwnd when congestion avoidance?
@@ -690,29 +688,13 @@ void Connection::retransmit() {
     so that it will expire after RTO seconds (for the current value
     of RTO).
   */
-  if(packet->should_rtx() and !rtx_timer.active) {
+  if(packet->should_rtx() and !rtx_timer.is_running()) {
     rtx_start();
   }
 }
 
-void Connection::rtx_start() {
-  Expects(!rtx_timer.active);
-
-  rtx_timer.id = Timers::oneshot(
-    std::chrono::milliseconds((int) (rttm.RTO * 1000.0)),
-    {this, &Connection::rtx_timeout});
-
-  rtx_timer.active = true;
-}
-
-void Connection::rtx_stop() {
-  Expects(rtx_timer.active);
-  Timers::stop(rtx_timer.id);
-  rtx_timer.active = false;
-}
-
 void Connection::rtx_clear() {
-  if(rtx_timer.active) {
+  if(rtx_timer.is_running()) {
     rtx_stop();
     debug2("<Connection::rtx_clear> Rtx cleared\n");
   }
@@ -738,7 +720,6 @@ void Connection::rtx_clear() {
        begins (i.e., after the three-way handshake completes).
 */
 void Connection::rtx_timeout(uint32_t) {
-  rtx_timer.active = false;
   debug("<TCP::Connection::RTX@timeout> %s Timed out (%f). FS: %u\n",
     to_string().c_str(), flight_size());
 
@@ -762,7 +743,7 @@ void Connection::rtx_timeout(uint32_t) {
     rttm.RTO = 3.0;
   }
   // timer need to be restarted
-  if(!rtx_timer.active)
+  if(!rtx_timer.is_running())
     rtx_start();
 
   /*
@@ -810,33 +791,23 @@ void Connection::set_state(State& state) {
 }
 
 void Connection::timewait_start() {
-  Expects(!timewait_timer.active);
-  auto timeout = 2 * host().MSL(); // 60 seconds
-
-  timewait_timer.id = Timers::oneshot(timeout, {this, &Connection::timewait_timeout});
-  timewait_timer.active = true;
-
+  const auto timeout = 2 * host().MSL(); // 60 seconds
+  timewait_timer.start(timeout);
   debug2("<Connection::timewait_start> TimeWait timer [%u] started.\n", timewait_timer.id);
 }
 
 void Connection::timewait_stop() {
-  Expects(timewait_timer.active);
-  Timers::stop(timewait_timer.id);
-  timewait_timer.active = false;
-
+  timewait_timer.stop();
   debug2("<Connection::timewait_stop> TimeWait timer [%u] stopped.\n", timewait_timer.id);
 }
 
 void Connection::timewait_restart() {
-  if(timewait_timer.active)
-    timewait_stop();
-  timewait_start();
+  const auto timeout = 2 * host().MSL(); // 60 seconds
+  timewait_timer.restart(timeout);
 }
 
 void Connection::timewait_timeout(uint32_t) {
   debug("<Connection> TimeWait timed out, closing.\n");
-  timewait_timer.active = false;
-
   signal_close();
 }
 
@@ -853,7 +824,7 @@ void Connection::signal_close() {
 void Connection::clean_up() {
   // clear timers if active
   rtx_clear();
-  if(timewait_timer.active)
+  if(timewait_timer.is_running())
     timewait_stop();
 
   // necessary to keep the shared_ptr alive during the whole function after _on_cleanup_ is called

src/net/tcp/connection_states.cpp

@@ -902,7 +902,7 @@ State::Result Connection::SynSent::handle(Connection& tcp, Packet_ptr in) {
     tcb.IRS       = in->seq();
     tcb.SND.UNA   = in->ack();
 
-    if(tcp.rtx_timer.active)
+    if(tcp.rtx_timer.is_running())
       tcp.rtx_stop();
 
     // (our SYN has been ACKed)
@@ -1013,7 +1013,7 @@ State::Result Connection::SynReceived::handle(Connection& tcp, Packet_ptr in) {
 
       // Taken from acknowledge (without congestion control)
       tcb.SND.UNA = in->ack();
-      if(tcp.rtx_timer.active)
+      if(tcp.rtx_timer.is_running())
         tcp.rtx_stop();
 
       tcp.signal_connect(); // NOTE: User callback
@@ -1150,7 +1150,7 @@ State::Result Connection::FinWait1::handle(Connection& tcp, Packet_ptr in) {
     if(in->ack() == tcp.tcb().SND.NXT) {
       // TODO: I guess or FIN is ACK'ed..?
       tcp.set_state(TimeWait::instance());
-      if(tcp.rtx_timer.active)
+      if(tcp.rtx_timer.is_running())
         tcp.rtx_stop();
       tcp.timewait_start();
     } else {
@@ -1197,7 +1197,7 @@ State::Result Connection::FinWait2::handle(Connection& tcp, Packet_ptr in) {
       Start the time-wait timer, turn off the other timers.
     */
     tcp.set_state(Connection::TimeWait::instance());
-    if(tcp.rtx_timer.active)
+    if(tcp.rtx_timer.is_running())
       tcp.rtx_stop();
     tcp.timewait_start();
   }