Merge pull request #865 from AndreasAakesson/dev

Added Timer helper class and TCP improvements

Author: fwsGonzo

api/kernel/cpuid.hpp

@@ -6,9 +6,9 @@
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -96,9 +96,22 @@ namespace CPUID
     LM,                // Long mode (64-bit Architecture)
   };
 
-  bool isAmdCpu();
-  bool isIntelCpu();
-  bool hasFeature(Feature f);
+  bool is_amd_cpu();
+  bool is_intel_cpu();
+  bool has_feature(Feature f);
+
+  unsigned kvm_function();
+  bool kvm_feature(unsigned id);
 } //< CPUID
 
+#define KVM_FEATURE_CLOCKSOURCE   0
+#define KVM_FEATURE_NOP_IO_DELAY  1
+#define KVM_FEATURE_MMU_OP        2   /* deprecated */
+#define KVM_FEATURE_CLOCKSOURCE2  3
+#define KVM_FEATURE_ASYNC_PF      4
+#define KVM_FEATURE_STEAL_TIME    5
+#define KVM_FEATURE_PV_EOI        6
+#define KVM_FEATURE_PV_UNHALT     7
+#define KVM_FEATURE_CLOCKSOURCE_STABLE_BIT 24
+
 #endif //< KERNEL_CPUID_HPP

api/kernel/timers.hpp

@@ -7,9 +7,9 @@
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,28 +28,30 @@
 class Timers
 {
 public:
-  using id_t       = uint32_t;
+  using id_t       = int32_t;
   using duration_t = std::chrono::microseconds;
   using handler_t  = delegate<void(id_t)>;
-  
+
+  static constexpr id_t UNUSED_ID = -1;
+
   /// create a one-shot timer that triggers @when from now
   /// returns a timer id
   static id_t oneshot(duration_t when, const handler_t&);
   /// create a periodic timer that begins @when and repeats every @period
   static id_t periodic(duration_t when, duration_t period, const handler_t&);
   // un-schedule timer, and free it
   static void stop(id_t);
-  
+
   /// returns the number of current, active timers
   static size_t active();
-  
+
   /// initialization
   typedef delegate<void(duration_t)> start_func_t;
   typedef delegate<void()> stop_func_t;
   static void init(const start_func_t&, const stop_func_t&);
   /// signal from the underlying hardware that it is calibrated and ready to go
   static void ready();
-  
+
   /// handler that processes timer interrupts
   static void timers_handler();
 };

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;
@@ -282,7 +283,7 @@ class Connection : public std::enable_shared_from_this<Connection> {
     virtual size_t send(Connection&, WriteBuffer&);
 
     /** Read from a Connection [RECEIVE] */
-    virtual void receive(Connection&, ReadBuffer&);
+    virtual void receive(Connection&, ReadBuffer&&);
 
     /** Close a Connection [CLOSE] */
     virtual void close(Connection&);
@@ -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;
@@ -550,8 +542,7 @@ class Connection : public std::enable_shared_from_this<Connection> {
     Buffer is cleared for data after every reset.
   */
   void read(size_t n, ReadCallback callback) {
-    ReadBuffer buffer = {new_shared_buffer(n), n};
-    read(buffer, callback);
+    read({new_shared_buffer(n), n}, callback);
   }
 
   /*
@@ -561,13 +552,13 @@ class Connection : public std::enable_shared_from_this<Connection> {
   void read(buffer_t buffer, size_t n, ReadCallback callback)
   { read({buffer, n}, callback); }
 
-  void read(ReadBuffer buffer, ReadCallback callback);
+  void read(ReadBuffer&& buffer, ReadCallback callback);
 
   /*
     Assign the read request (read buffer)
   */
-  void receive(ReadBuffer& buffer)
-  { read_request.buffer = {buffer}; }
+  void receive(ReadBuffer&& buffer)
+  { read_request = {buffer}; }
 
   /*
     Receive data into the current read requests buffer.
@@ -853,20 +844,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
@@ -887,8 +878,7 @@ class Connection : public std::enable_shared_from_this<Connection> {
   /*
     When retransmission times out.
   */
-  void rtx_timeout(uint32_t);
-
+  void rtx_timeout();
 
   /** Start the timewait timeout for 2*MSL */
   void timewait_start();
@@ -900,7 +890,7 @@ class Connection : public std::enable_shared_from_this<Connection> {
   void timewait_restart();
 
   /** When timewait timer times out */
-  void timewait_timeout(uint32_t);
+  void timewait_timeout();
 
   /*
     Tell the host (TCP) to delete this connection.

api/net/tcp/connection_states.hpp

@@ -169,7 +169,7 @@ class Connection::Established : public State {
 
   virtual size_t send(Connection&, WriteBuffer&) override;
 
-  virtual void receive(Connection&, ReadBuffer&) override;
+  virtual void receive(Connection&, ReadBuffer&&) override;
 
   virtual void close(Connection&) override;
 
@@ -207,7 +207,7 @@ class Connection::FinWait1 : public State {
     return instance;
   }
 
-  virtual void receive(Connection&, ReadBuffer&) override;
+  virtual void receive(Connection&, ReadBuffer&&) override;
 
   virtual void close(Connection&) override;
 
@@ -246,7 +246,7 @@ class Connection::FinWait2 : public State {
     return instance;
   }
 
-  virtual void receive(Connection&, ReadBuffer&) override;
+  virtual void receive(Connection&, ReadBuffer&&) override;
 
   virtual void close(Connection&) override;
 
@@ -284,7 +284,7 @@ class Connection::CloseWait : public State {
 
   virtual size_t send(Connection&, WriteBuffer&) override;
 
-  virtual void receive(Connection&, ReadBuffer&) override;
+  virtual void receive(Connection&, ReadBuffer&&) override;
 
   virtual void close(Connection&) override;
 

api/net/tcp/read_buffer.hpp

@@ -79,7 +79,7 @@ struct ReadBuffer {
   void renew() {
     remaining = capacity();
     offset = 0;
-    buffer = buffer_t(new uint8_t[remaining], std::default_delete<uint8_t[]>());
+    buffer = new_shared_buffer(remaining);
     push = false;
   }
 }; // < ReadBuffer

api/net/tcp/read_request.hpp

@@ -31,18 +31,22 @@ struct ReadRequest {
   ReadBuffer buffer;
   ReadCallback callback;
 
-  /*ReadRequest()
-    : buffer(nullptr, 0),
-      callback({this, &ReadRequest::default_read_callback})
-  {}*/
+  ReadRequest()
+    : buffer{nullptr, 0},
+      callback{nullptr}
+  {}
+
+  ReadRequest(ReadBuffer buf)
+    : ReadRequest(buf, nullptr)
+  {}
 
   ReadRequest(ReadBuffer buf, ReadCallback cb)
     : buffer(buf),
       callback(cb)
   {}
 
-  ReadRequest(size_t n = 0)
-    : buffer(buffer_t(new uint8_t[n], std::default_delete<uint8_t[]>()), n),
+  ReadRequest(size_t n)
+    : buffer({new_shared_buffer(n), n}),
       callback({this, &ReadRequest::default_read_callback})
   {}
 

api/net/tcp/rttm.hpp

@@ -57,6 +57,9 @@ struct RTTM {
 
   void stop(bool first = false);
 
+  auto rto_ms() const
+  { return std::chrono::milliseconds{static_cast<unsigned long>(RTO * 1000)}; }
+
   /*
     When the first RTT measurement R is made, the host MUST set
 
@@ -66,7 +69,7 @@ struct RTTM {
 
     where K = 4.
   */
-  inline void first_rtt_measurement(duration_t R) {
+  void first_rtt_measurement(duration_t R) {
     SRTT = R;
     RTTVAR = R/2;
     update_rto();
@@ -89,19 +92,18 @@ struct RTTM {
     After the computation, a host MUST update
     RTO <- SRTT + max (G, K*RTTVAR)
   */
-  inline void sub_rtt_measurement(duration_t R) {
+  void sub_rtt_measurement(duration_t R) {
     RTTVAR = (1 - beta) * RTTVAR + beta * std::abs(SRTT-R);
     SRTT = (1 - alpha) * SRTT + alpha * R;
     update_rto();
   }
 
-  inline void update_rto() {
+  void update_rto() {
     RTO = std::max(SRTT + std::max(CLOCK_G, K * RTTVAR), 1.0);
     debug2("<TCP::Connection::RTO> RTO updated: %ums\n",
       (uint32_t)(RTO * 1000));
   }
-
-}; // < struct RTTM
+} __attribute__((packed)); // < struct RTTM
 
 } // < namespace tcp
 } // < namespace net