X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/5fd8cc8409d0efadc07dfe8d6774ad9ff477663d..ba03b19875aa2e3586e49b10904563cdd3b91de0:/rpc/connection.h

diff --git a/rpc/connection.h b/rpc/connection.h
index da48cf4..1eb625b 100644
--- a/rpc/connection.h
+++ b/rpc/connection.h
@@ -1,101 +1,98 @@
 #ifndef connection_h
-#define connection_h 1
+#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 "pollmgr.h"
 
-#include <map>
+constexpr size_t size_t_max = numeric_limits<size_t>::max();
 
-#include "pollmgr.h"
+class thread_exit_exception : exception {};
 
 class connection;
 
 class chanmgr {
-	public:
-		virtual bool got_pdu(connection *c, char *b, int sz) = 0;
-		virtual ~chanmgr() {}
+    public:
+        virtual bool got_pdu(connection *c, const string & b) = 0;
+        virtual ~chanmgr() {}
 };
 
 class connection : public aio_callback {
-	public:
-		struct charbuf {
-			charbuf(): buf(NULL), sz(0), solong(0) {}
-			charbuf (char *b, int s) : buf(b), sz(s), solong(0){}
-			char *buf;
-			int sz;
-			int solong; //amount of bytes written or read so far
-		};
-
-		connection(chanmgr *m1, int f1, int lossytest=0);
-		~connection();
-
-		int channo() { return fd_; }
-		bool isdead();
-		void closeconn();
-
-		bool send(char *b, int sz);
-		void write_cb(int s);
-		void read_cb(int s);
-
-		void incref();
-		void decref();
-		int ref();
-                
-                int compare(connection *another);
-	private:
-
-		bool readpdu();
-		bool writepdu();
-
-		chanmgr *mgr_;
-		const int fd_;
-		bool dead_;
-
-		charbuf wpdu_;
-		charbuf rpdu_;
-                
-                struct timeval create_time_;
-
-		int waiters_;
-		int refno_;
-		const int lossy_;
-
-		pthread_mutex_t m_;
-		pthread_mutex_t ref_m_;
-		pthread_cond_t send_complete_;
-		pthread_cond_t send_wait_;
+    public:
+        struct charbuf {
+            string buf;
+            size_t solong = 0; // number of bytes written or read so far
+        };
+
+        connection(chanmgr *m1, int f1, int lossytest=0);
+        ~connection();
+
+        int channo() { return fd_; }
+        bool isdead();
+        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);
+
+    private:
+
+        bool readpdu();
+        bool writepdu();
+
+        chanmgr *mgr_;
+        const int fd_;
+        bool dead_ = false;
+
+        charbuf wpdu_;
+        charbuf rpdu_;
+
+        time_point<steady_clock> create_time_;
+
+        int waiters_ = 0;
+        int refno_ = 1;
+        int lossy_ = 0;
+
+        mutex m_;
+        mutex ref_m_;
+        cond send_complete_;
+        cond send_wait_;
 };
 
 class tcpsconn {
-	public:
-		tcpsconn(chanmgr *m1, int port, int lossytest=0);
-		~tcpsconn();
-                inline int port() { return port_; }
-		void accept_conn();
-	private:
-                int port_;
-		pthread_mutex_t m_;
-		pthread_t th_;
-		int pipe_[2];
-
-		int tcp_; //file desciptor for accepting connection
-		chanmgr *mgr_;
-		int lossy_;
-		std::map<int, connection *> conns_;
-
-		void process_accept();
+    public:
+        tcpsconn(chanmgr *m1, in_port_t port, int lossytest=0);
+        ~tcpsconn();
+        inline in_port_t port() { return port_; }
+        void accept_conn();
+    private:
+        in_port_t port_;
+        mutex m_;
+        thread th_;
+        int pipe_[2];
+
+        int tcp_; //file desciptor for accepting connection
+        chanmgr *mgr_;
+        int lossy_;
+        map<int, connection *> conns_;
+
+        void process_accept();
 };
 
 struct bundle {
-	bundle(chanmgr *m, int s, int l):mgr(m),tcp(s),lossy(l) {}
-	chanmgr *mgr;
-	int tcp;
-	int lossy;
+    bundle(chanmgr *m, int s, int l):mgr(m),tcp(s),lossy(l) {}
+    chanmgr *mgr;
+    int tcp;
+    int lossy;
 };
 
-void start_accept_thread(chanmgr *mgr, int port, pthread_t *th, int *fd = NULL, int lossy=0);
 connection *connect_to_dst(const sockaddr_in &dst, chanmgr *mgr, int lossy=0);
 #endif