More cleaning

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

diff --git a/rpc/connection.h b/rpc/connection.h
index f529a35..261cf9f 100644 (file)
--- a/rpc/connection.h
+++ b/rpc/connection.h
@@ -1,22 +1,16 @@
 #ifndef connection_h
 #define connection_h
 
+#include "types.h"
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <cstddef>
-#include <thread>
-
-#include <map>
-#include <limits>
-
 #include "pollmgr.h"
 
-constexpr size_t size_t_max = std::numeric_limits<size_t>::max();
+constexpr size_t size_t_max = numeric_limits<size_t>::max();
 
-class thread_exit_exception : std::exception {
-};
+class thread_exit_exception : exception {};
 
 class connection;
 
@@ -64,16 +58,16 @@ class connection : public aio_callback {
         charbuf wpdu_;
         charbuf rpdu_;
 
-        std::chrono::time_point<std::chrono::steady_clock> create_time_;
+        time_point<steady_clock> create_time_;
 
         int waiters_;
         int refno_;
         const int lossy_;
 
-        std::mutex m_;
-        std::mutex ref_m_;
-        std::condition_variable send_complete_;
-        std::condition_variable send_wait_;
+        mutex m_;
+        mutex ref_m_;
+        cond send_complete_;
+        cond send_wait_;
 };
 
 class tcpsconn {
@@ -84,14 +78,14 @@ class tcpsconn {
         void accept_conn();
     private:
         unsigned int port_;
-        std::mutex m_;
-        std::thread th_;
+        mutex m_;
+        thread th_;
         int pipe_[2];
 
         int tcp_; //file desciptor for accepting connection
         chanmgr *mgr_;
         int lossy_;
-        std::map<int, connection *> conns_;
+        map<int, connection *> conns_;
 
         void process_accept();
 };