Got rid of most using directives. Ported tests to python.

[invirt/third/libt4.git] / rpc / connection.h

diff --git a/rpc/connection.h b/rpc/connection.h
index 1bcb7b6..68bd902 100644 (file)
--- a/rpc/connection.h
+++ b/rpc/connection.h
@@ -7,8 +7,6 @@
 #include "poll_mgr.h"
 #include "file.h"
 
 #include "poll_mgr.h"
 #include "file.h"
 

-constexpr size_t size_t_max = numeric_limits<size_t>::max();
-

 class connection;
 
 class connection_delegate {
 class connection;
 
 class connection_delegate {

@@ -17,7 +15,10 @@ class connection_delegate {
         virtual ~connection_delegate();
 };
 
         virtual ~connection_delegate();
 };
 

-class connection : private aio_callback, public enable_shared_from_this<connection> {
+using std::chrono::steady_clock;
+using time_point = std::chrono::time_point<steady_clock>;
+
+class connection : private aio_callback, public std::enable_shared_from_this<connection> {

     public:
         connection(connection_delegate * delegate, socket_t && f1, int lossytest=0);
         ~connection();
     public:
         connection(connection_delegate * delegate, socket_t && f1, int lossytest=0);
         ~connection();

@@ -28,7 +29,7 @@ class connection : private aio_callback, public enable_shared_from_this<connecti
 
         static shared_ptr<connection> to_dst(const sockaddr_in & dst, connection_delegate *mgr, int lossy=0);
 
 
         static shared_ptr<connection> to_dst(const sockaddr_in & dst, connection_delegate *mgr, int lossy=0);
 

-        const time_point<steady_clock> create_time = steady_clock::now();
+        const time_point create_time = steady_clock::now();

         const file_t fd;
 
     private:
         const file_t fd;
 
     private:

@@ -41,18 +42,20 @@ class connection : private aio_callback, public enable_shared_from_this<connecti
         connection_delegate * delegate_;
         bool dead_ = false;
 
         connection_delegate * delegate_;
         bool dead_ = false;
 

+        enum charbuf_status_t { unused, inflight, error };
+

         struct charbuf {
         struct charbuf {

+            charbuf_status_t status;

             string buf;
             string buf;

-            size_t solong = 0; // number of bytes written or read so far
+            size_t cursor; // number of bytes written or read so far

         };
 
         };
 

-        charbuf wpdu_;
-        charbuf rpdu_;
+        charbuf wpdu_ = {unused, "", 0};
+        charbuf rpdu_ = {unused, "", 0};

 
 

-        int waiters_ = 0;

         int lossy_ = 0;
 
         int lossy_ = 0;
 

-        mutex m_;
+        std::mutex m_;

         cond send_complete_;
         cond send_wait_;
 };
         cond send_complete_;
         cond send_wait_;
 };

@@ -67,11 +70,11 @@ class connection_listener : private aio_callback {
         void read_cb(int s);
 
         in_port_t port_;
         void read_cb(int s);
 
         in_port_t port_;

-        mutex m_;
+        std::mutex m_;

 
         socket_t tcp_; // listens for connections
         connection_delegate * delegate_;
         int lossy_;
 
         socket_t tcp_; // listens for connections
         connection_delegate * delegate_;
         int lossy_;

-        map<int, shared_ptr<connection>> conns_;
+        std::map<int, shared_ptr<connection>> conns_;

 };
 #endif
 };
 #endif