util: Changed Timer handler signature to just void()

Author: AndreasAakesson

api/net/tcp/connection.hpp

@@ -878,7 +878,7 @@ class Connection : public std::enable_shared_from_this<Connection> {
   /*
     When retransmission times out.
   */
-  void rtx_timeout(Timer::id_t);
+  void rtx_timeout();
 
   /** Start the timewait timeout for 2*MSL */
   void timewait_start();
@@ -890,7 +890,7 @@ class Connection : public std::enable_shared_from_this<Connection> {
   void timewait_restart();
 
   /** When timewait timer times out */
-  void timewait_timeout(Timer::id_t);
+  void timewait_timeout();
 
   /*
     Tell the host (TCP) to delete this connection.

api/util/timer.hpp

@@ -31,7 +31,7 @@ class Timer {
 public:
   using id_t        = Timers::id_t;
   using duration_t  = Timers::duration_t;
-  using handler_t   = Timers::handler_t;
+  using handler_t   = delegate<void()>;
 
   /**
    * @brief Constructs a Timer without a handler
@@ -122,7 +122,7 @@ class Timer {
    */
   inline void _internal_timeout(id_t id);
 
-  void _do_nothing(id_t) {}
+  void _do_nothing() {}
 
 } __attribute__((packed)); // < class Timer
 
@@ -146,9 +146,9 @@ inline void Timer::restart(duration_t when) {
   start(when);
 }
 
-inline void Timer::_internal_timeout(id_t id) {
+inline void Timer::_internal_timeout(id_t) {
   id_ = Timers::UNUSED_ID;
-  on_timeout_(id);
+  on_timeout_();
 }
 
 #endif

src/net/tcp/connection.cpp

@@ -719,7 +719,7 @@ void Connection::rtx_clear() {
        MUST be re-initialized to 3 seconds when data transmission
        begins (i.e., after the three-way handshake completes).
 */
-void Connection::rtx_timeout(Timer::id_t) {
+void Connection::rtx_timeout() {
   debug("<TCP::Connection::RTX@timeout> %s Timed out (%f). FS: %u\n",
     to_string().c_str(), flight_size());
 
@@ -806,7 +806,7 @@ void Connection::timewait_restart() {
   timewait_timer.restart(timeout);
 }
 
-void Connection::timewait_timeout(Timer::id_t) {
+void Connection::timewait_timeout() {
   debug("<Connection> TimeWait timed out, closing.\n");
   signal_close();
 }