Lots more clean-ups

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

diff --git a/rpc/rpc.h b/rpc/rpc.h
index f01af09..19ec96a 100644 (file)
--- a/rpc/rpc.h
+++ b/rpc/rpc.h
@@ -7,8 +7,14 @@
 
 #include "thr_pool.h"
 #include "marshall.h"
 
 #include "thr_pool.h"
 #include "marshall.h"

+#include "marshall_wrap.h"

 #include "connection.h"
 
 #include "connection.h"
 

+namespace rpc {
+    static constexpr milliseconds to_max{12000};
+    static constexpr milliseconds to_min{100};
+}
+

 class rpc_const {
     public:
         static const unsigned int bind = 1;   // handler number reserved for bind
 class rpc_const {
     public:
         static const unsigned int bind = 1;   // handler number reserved for bind

@@ -25,15 +31,14 @@ class rpc_const {
 // manages a xid space per destination socket
 // threaded: multiple threads can be sending RPCs,
 class rpcc : public chanmgr {
 // manages a xid space per destination socket
 // threaded: multiple threads can be sending RPCs,
 class rpcc : public chanmgr {

-

     private:
 
         //manages per rpc info
         struct caller {
     private:
 
         //manages per rpc info
         struct caller {

-            caller(int _xid, unmarshall *_un) : xid(_xid), un(_un) {}
+            caller(int _xid, string *_rep) : xid(_xid), rep(_rep) {}

 
             int xid;
 
             int xid;

-            unmarshall *un;
+            string *rep;

             int intret;
             bool done = false;
             mutex m;
             int intret;
             bool done = false;
             mutex m;

@@ -65,56 +70,46 @@ class rpcc : public chanmgr {
         list<int> xid_rep_window_;
 
         struct request {
         list<int> xid_rep_window_;
 
         struct request {

-            request() { clear(); }

             void clear() { buf.clear(); xid = -1; }
             bool isvalid() { return xid != -1; }
             string buf;
             void clear() { buf.clear(); xid = -1; }
             bool isvalid() { return xid != -1; }
             string buf;

-            int xid;
+            int xid = -1;

         };
         };

-        struct request dup_req_;
+        request dup_req_;

         int xid_rep_done_;
         int xid_rep_done_;

+
+        int call1(proc_t proc, marshall &req, string &rep, milliseconds to);
+
+        template<class R>
+            int call_m(proc_t proc, marshall &req, R & r, milliseconds to);

     public:
 
         rpcc(const string & d, bool retrans=true);
         ~rpcc();
 
     public:
 
         rpcc(const string & d, bool retrans=true);
         ~rpcc();
 

-        struct TO {
-            int to;
-        };
-        static const TO to_max;
-        static const TO to_min;
-        static TO to(int x) { TO t; t.to = x; return t;}
-

         unsigned int id() { return clt_nonce_; }
 
         unsigned int id() { return clt_nonce_; }
 

-        int bind(TO to = to_max);
+        int bind(milliseconds to = rpc::to_max);

 
         void set_reachable(bool r) { reachable_ = r; }
 
         void cancel();
 
 
         void set_reachable(bool r) { reachable_ = r; }
 
         void cancel();
 

-        int islossy() { return lossytest_ > 0; }
-
-        int call1(proc_t proc, 
-                marshall &req, unmarshall &rep, TO to);
-
-        bool got_pdu(connection *c, char *b, size_t sz);
-
-        template<class R>
-            int call_m(proc_t proc, marshall &req, R & r, TO to);
+        bool got_pdu(connection *c, const string & b);

 
         template<class R, typename ...Args>
             inline int call(proc_t proc, R & r, const Args&... args);
 
         template<class R, typename ...Args>
 
         template<class R, typename ...Args>
             inline int call(proc_t proc, R & r, const Args&... args);
 
         template<class R, typename ...Args>

-            inline int call_timeout(proc_t proc, TO to, R & r, const Args&... args);
+            inline int call_timeout(proc_t proc, milliseconds to, R & r, const Args&... args);

 };
 
 template<class R> int 
 };
 
 template<class R> int 

-rpcc::call_m(proc_t proc, marshall &req, R & r, TO to) 
+rpcc::call_m(proc_t proc, marshall &req, R & r, milliseconds to) 

 {
 {

-    unmarshall u;
-    int intret = call1(proc, req, u, to);
+    string rep;
+    int intret = call1(proc, req, rep, to);
+    unmarshall u(rep, true);

     if (intret < 0) return intret;
     u >> r;
     if (u.okdone() != true) {
     if (intret < 0) return intret;
     u >> r;
     if (u.okdone() != true) {

@@ -129,18 +124,16 @@ rpcc::call_m(proc_t proc, marshall &req, R & r, TO to)
 template<class R, typename... Args> inline int
 rpcc::call(proc_t proc, R & r, const Args&... args)
 {
 template<class R, typename... Args> inline int
 rpcc::call(proc_t proc, R & r, const Args&... args)
 {

-    return call_timeout(proc, rpcc::to_max, r, args...);
+    return call_timeout(proc, rpc::to_max, r, args...);

 }
 
 template<class R, typename... Args> inline int
 }
 
 template<class R, typename... Args> inline int

-rpcc::call_timeout(proc_t proc, const rpcc::TO to, R & r, const Args&... args)
+rpcc::call_timeout(proc_t proc, const milliseconds to, R & r, const Args&... args)

 {
     marshall m{args...};
     return call_m(proc, m, r, to);
 }
 
 {
     marshall m{args...};
     return call_m(proc, m, r, to);
 }
 

-bool operator<(const sockaddr_in &a, const sockaddr_in &b);
-

 // rpc server endpoint.
 class rpcs : public chanmgr {
 
 // rpc server endpoint.
 class rpcs : public chanmgr {
 

@@ -158,25 +151,14 @@ class rpcs : public chanmgr {
         // has been sent; in that case buf points to a copy of the reply,
         // and sz holds the size of the reply.
     struct reply_t {
         // has been sent; in that case buf points to a copy of the reply,
         // and sz holds the size of the reply.
     struct reply_t {

-        reply_t (int _xid) {
-            xid = _xid;
-            cb_present = false;
-            buf = NULL;
-            sz = 0;
-        }
-        reply_t (int _xid, char *_buf, size_t _sz) {
-            xid = _xid;
-            cb_present = true;
-            buf = _buf;
-            sz = _sz;
-        }
+        reply_t (int _xid) : xid(_xid), cb_present(false) {}
+        reply_t (int _xid, const string & _buf) : xid(_xid), cb_present(true), buf(_buf) {}

         int xid;
         bool cb_present; // whether the reply buffer is valid
         int xid;
         bool cb_present; // whether the reply buffer is valid

-        char *buf;      // the reply buffer
-        size_t sz;         // the size of reply buffer
+        string buf;      // the reply buffer

     };
 
     };
 

-    unsigned int port_;
+    in_port_t port_;

     unsigned int nonce_;
 
     // provide at most once semantics by maintaining a window of replies
     unsigned int nonce_;
 
     // provide at most once semantics by maintaining a window of replies

@@ -185,11 +167,10 @@ class rpcs : public chanmgr {
     map<unsigned int, list<reply_t> > reply_window_;
 
     void free_reply_window(void);
     map<unsigned int, list<reply_t> > reply_window_;
 
     void free_reply_window(void);

-    void add_reply(unsigned int clt_nonce, int xid, char *b, size_t sz);
+    void add_reply(unsigned int clt_nonce, int xid, const string & b);

 
     rpcstate_t checkduplicate_and_update(unsigned int clt_nonce, 
 
     rpcstate_t checkduplicate_and_update(unsigned int clt_nonce, 

-            int xid, int rep_xid,
-            char **b, size_t *sz);
+            int xid, int rep_xid, string & b);

 
     void updatestat(proc_t proc);
 
 
     void updatestat(proc_t proc);
 

@@ -201,7 +182,6 @@ class rpcs : public chanmgr {
     size_t curr_counts_;
     map<proc_t, size_t> counts_;
 
     size_t curr_counts_;
     map<proc_t, size_t> counts_;
 

-    int lossytest_; 

     bool reachable_;
 
     // map proc # to function
     bool reachable_;
 
     // map proc # to function

@@ -210,16 +190,14 @@ class rpcs : public chanmgr {
     mutex procs_m_; // protect insert/delete to procs[]
     mutex count_m_;  //protect modification of counts
     mutex reply_window_m_; // protect reply window et al
     mutex procs_m_; // protect insert/delete to procs[]
     mutex count_m_;  //protect modification of counts
     mutex reply_window_m_; // protect reply window et al

-    mutex conss_m_; // protect conns_
+    mutex conns_m_; // protect conns_

 
 
     protected:
 
     struct djob_t {
 
 
     protected:
 
     struct djob_t {

-        djob_t (connection *c, char *b, size_t bsz):buf(b),sz(bsz),conn(c) {}
-        char *buf;
-        size_t sz;

         connection *conn;
         connection *conn;

+        string buf;

     };
     void dispatch(djob_t *);
 
     };
     void dispatch(djob_t *);
 

@@ -227,33 +205,28 @@ class rpcs : public chanmgr {
     void reg1(proc_t proc, handler *);
 
     ThrPool* dispatchpool_;
     void reg1(proc_t proc, handler *);
 
     ThrPool* dispatchpool_;

-    tcpsconn* listener_;
+    tcpsconn *listener_;

 
     public:
 
     public:

-    rpcs(unsigned int port, size_t counts=0);
+    rpcs(in_port_t port, size_t counts=0);

     ~rpcs();
     ~rpcs();

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

     //RPC handler for clients binding
     int rpcbind(unsigned int &r, int a);
 
     void set_reachable(bool r) { reachable_ = r; }
 
     //RPC handler for clients binding
     int rpcbind(unsigned int &r, int a);
 
     void set_reachable(bool r) { reachable_ = r; }
 

-    bool got_pdu(connection *c, char *b, size_t sz);
+    bool got_pdu(connection *c, const string & b);

 
 

-    template<class F, class C=void> void reg(proc_t proc, F f, C *c=nullptr);
-};
+    struct ReturnOnFailure {
+        static inline int unmarshall_args_failure() {
+            return rpc_const::unmarshal_args_failure;
+        }
+    };

 
 

-struct ReturnOnFailure {
-    static inline int unmarshall_args_failure() {
-        return rpc_const::unmarshal_args_failure;
+    template<class F, class C=void> void reg(proc_t proc, F f, C *c=nullptr) {
+        reg1(proc, marshalled_func<F, ReturnOnFailure>::wrap(f, c));

     }
 };
 
     }
 };
 

-template<class F, class C> void rpcs::reg(proc_t proc, F f, C *c) {
-    reg1(proc, marshalled_func<F, ReturnOnFailure>::wrap(f, c));
-}
-
-sockaddr_in make_sockaddr(const string &hostandport);
-sockaddr_in make_sockaddr(const string &host, const string &port);
-

 #endif
 #endif