Type cleanups

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

diff --git a/rpc/connection.h b/rpc/connection.h
index 1ef4470..f529a35 100644 (file)
--- a/rpc/connection.h
+++ b/rpc/connection.h
@@ -9,9 +9,12 @@
 #include <thread>
 
 #include <map>
 #include <thread>
 
 #include <map>

+#include <limits>

 
 #include "pollmgr.h"
 
 
 #include "pollmgr.h"
 

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

 class thread_exit_exception : std::exception {
 };
 
 class thread_exit_exception : std::exception {
 };
 

@@ -19,7 +22,7 @@ class connection;
 
 class chanmgr {
     public:
 
 class chanmgr {
     public:

-        virtual bool got_pdu(connection *c, char *b, int sz) = 0;
+        virtual bool got_pdu(connection *c, char *b, size_t sz) = 0;

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

@@ -27,10 +30,10 @@ class connection : public aio_callback {
     public:
         struct charbuf {
             charbuf(): buf(NULL), sz(0), solong(0) {}
     public:
         struct charbuf {
             charbuf(): buf(NULL), sz(0), solong(0) {}

-            charbuf (char *b, int s) : buf(b), sz(s), solong(0){}
+            charbuf (char *b, size_t s) : buf(b), sz(s), solong(0){}

             char *buf;
             char *buf;

-            int sz;
-            int solong; //amount of bytes written or read so far
+            size_t sz;
+            size_t solong; // number of bytes written or read so far

         };
 
         connection(chanmgr *m1, int f1, int lossytest=0);
         };
 
         connection(chanmgr *m1, int f1, int lossytest=0);

@@ -40,7 +43,7 @@ class connection : public aio_callback {
         bool isdead();
         void closeconn();
 
         bool isdead();
         void closeconn();
 

-        bool send(char *b, int sz);
+        bool send(char *b, size_t sz);

         void write_cb(int s);
         void read_cb(int s);
 
         void write_cb(int s);
         void read_cb(int s);
 

@@ -61,7 +64,7 @@ class connection : public aio_callback {
         charbuf wpdu_;
         charbuf rpdu_;
 
         charbuf wpdu_;
         charbuf rpdu_;
 

-        struct timeval create_time_;
+        std::chrono::time_point<std::chrono::steady_clock> create_time_;

 
         int waiters_;
         int refno_;
 
         int waiters_;
         int refno_;

@@ -75,12 +78,12 @@ class connection : public aio_callback {
 
 class tcpsconn {
     public:
 
 class tcpsconn {
     public:

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

         ~tcpsconn();
         ~tcpsconn();

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

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

-        int port_;
+        unsigned int port_;

         std::mutex m_;
         std::thread th_;
         int pipe_[2];
         std::mutex m_;
         std::thread th_;
         int pipe_[2];