Includes cleanups

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

diff --git a/rpc/connection.h b/rpc/connection.h
index 882c1e0..b1df8a1 100644 (file)
--- a/rpc/connection.h
+++ b/rpc/connection.h
@@ -2,10 +2,10 @@
 #define connection_h
 
 #include "types.h"
 #define connection_h
 
 #include "types.h"

-#include <sys/types.h>

 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include "pollmgr.h"
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include "pollmgr.h"

+#include "file.h"

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

@@ -15,11 +15,11 @@ class connection;
 
 class chanmgr {
     public:
 
 class chanmgr {
     public:

-        virtual bool got_pdu(connection *c, const string & b) = 0;
+        virtual bool got_pdu(const shared_ptr<connection> & c, const string & b) = 0;

         virtual ~chanmgr() {}
 };
 
         virtual ~chanmgr() {}
 };
 

-class connection : public aio_callback {
+class connection : public aio_callback, public enable_shared_from_this<connection> {

     public:
         struct charbuf {
             string buf;
     public:
         struct charbuf {
             string buf;

@@ -30,18 +30,14 @@ class connection : public aio_callback {
         ~connection();
 
         int channo() { return fd_; }
         ~connection();
 
         int channo() { return fd_; }

-        bool isdead();
+        bool isdead() { lock ml(m_); return dead_; }

         void closeconn();
 
         bool send(const string & b);
         void write_cb(int s);
         void read_cb(int s);
 
         void closeconn();
 
         bool send(const string & b);
         void write_cb(int s);
         void read_cb(int s);
 

-        void incref();
-        void decref();
-        int ref() { lock rl(ref_m_); return refno_; }
-
-        int compare(connection *another);
+        time_point<steady_clock> create_time() const { return create_time_; }

 
     private:
 
 
     private:
 

@@ -49,7 +45,7 @@ class connection : public aio_callback {
         bool writepdu();
 
         chanmgr *mgr_;
         bool writepdu();
 
         chanmgr *mgr_;

-        const int fd_;
+        const file_t fd_;

         bool dead_ = false;
 
         charbuf wpdu_;
         bool dead_ = false;
 
         charbuf wpdu_;

@@ -58,31 +54,29 @@ class connection : public aio_callback {
         time_point<steady_clock> create_time_;
 
         int waiters_ = 0;
         time_point<steady_clock> create_time_;
 
         int waiters_ = 0;

-        int refno_ = 1;

         int lossy_ = 0;
 
         mutex m_;
         int lossy_ = 0;
 
         mutex m_;

-        mutex ref_m_;

         cond send_complete_;
         cond send_wait_;
 };
 
 class tcpsconn {
     public:
         cond send_complete_;
         cond send_wait_;
 };
 
 class tcpsconn {
     public:

-        tcpsconn(chanmgr *m1, unsigned int port, int lossytest=0);
+        tcpsconn(chanmgr *m1, in_port_t port, int lossytest=0);

         ~tcpsconn();
         ~tcpsconn();

-        inline unsigned int port() { return port_; }
+        inline in_port_t port() { return port_; }

         void accept_conn();
     private:
         void accept_conn();
     private:

-        unsigned int port_;
+        in_port_t port_;

         mutex m_;
         thread th_;
         mutex m_;
         thread th_;

-        int pipe_[2];
+        file_t pipe_[2];

 
 

-        int tcp_; //file desciptor for accepting connection
+        socket_t tcp_; // listens for connections

         chanmgr *mgr_;
         int lossy_;
         chanmgr *mgr_;
         int lossy_;

-        map<int, connection *> conns_;
+        map<int, shared_ptr<connection>> conns_;

 
         void process_accept();
 };
 
         void process_accept();
 };

@@ -94,5 +88,5 @@ struct bundle {
     int lossy;
 };
 
     int lossy;
 };
 

-connection *connect_to_dst(const sockaddr_in &dst, chanmgr *mgr, int lossy=0);
+shared_ptr<connection> connect_to_dst(const sockaddr_in &dst, chanmgr *mgr, int lossy=0);

 #endif
 #endif