More marshalling simplification

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

diff --git a/rpc/rpc.h b/rpc/rpc.h
index c0420a5..065cabc 100644 (file)
--- a/rpc/rpc.h
+++ b/rpc/rpc.h
@@ -1,20 +1,15 @@
 #ifndef rpc_h
 #define rpc_h
 
 #ifndef rpc_h
 #define rpc_h
 

+#include "types.h"

 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

-#include <list>
-#include <map>
-#include <stdio.h>

 
 #include "thr_pool.h"
 #include "marshall.h"
 
 #include "thr_pool.h"
 #include "marshall.h"

+#include "marshall_wrap.h"

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

-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-

 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

@@ -36,15 +31,14 @@ class rpcc : public chanmgr {
 
         //manages per rpc info
         struct caller {
 
         //manages per rpc info
         struct caller {

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

 
             int xid;
 
             int xid;

-            unmarshall *un;
+            string *rep;

             int intret;
             int intret;

-            bool done;
-            std::mutex m;
-            std::condition_variable c;
+            bool done = false;
+            mutex m;
+            cond c;

         };
 
         void get_refconn(connection **ch);
         };
 
         void get_refconn(connection **ch);

@@ -62,27 +56,27 @@ class rpcc : public chanmgr {
 
         connection *chan_;
 
 
         connection *chan_;
 

-        std::mutex m_; // protect insert/delete to calls[]
-        std::mutex chan_m_;
+        mutex m_; // protect insert/delete to calls[]
+        mutex chan_m_;

 
         bool destroy_wait_;
 
         bool destroy_wait_;

-        std::condition_variable destroy_wait_c_;
+        cond destroy_wait_c_;

 
 

-        std::map<int, caller *> calls_;
-        std::list<int> xid_rep_window_;
+        map<int, caller *> calls_;
+        list<int> xid_rep_window_;

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

-            std::string buf;
+            string buf;

             int xid;
         };
         struct request dup_req_;
         int xid_rep_done_;
     public:
 
             int xid;
         };
         struct request dup_req_;
         int xid_rep_done_;
     public:
 

-        rpcc(sockaddr_in d, bool retrans=true);
+        rpcc(const string & d, bool retrans=true);

         ~rpcc();
 
         struct TO {
         ~rpcc();
 
         struct TO {

@@ -99,36 +93,34 @@ class rpcc : public chanmgr {
         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(unsigned int proc, 
-                marshall &req, unmarshall &rep, TO to);
+        int islossy() { return lossytest_ > 0; }

 
 

-        bool got_pdu(connection *c, char *b, size_t sz);
+        int call1(proc_t proc, marshall &req, string &rep, TO to);

 
 

+        bool got_pdu(connection *c, const string & b);

 
         template<class R>
 
         template<class R>

-            int call_m(unsigned int proc, marshall &req, R & r, TO to);
+            int call_m(proc_t proc, marshall &req, R & r, TO to);

 
         template<class R, typename ...Args>
 
         template<class R, typename ...Args>

-            inline int call(unsigned int proc, R & r, const Args&... 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_timeout(unsigned int proc, TO to, R & r, const Args&... args);
+            inline int call_timeout(proc_t proc, TO to, R & r, const Args&... args);

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

-rpcc::call_m(unsigned int proc, marshall &req, R & r, TO to) 
+rpcc::call_m(proc_t proc, marshall &req, R & r, TO 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) {

-        fprintf(stderr, "rpcc::call_m: failed to unmarshall the reply."
-                "You are probably calling RPC 0x%x with wrong return "
-                "type.\n", proc);
+        cerr << "rpcc::call_m: failed to unmarshall the reply.  You are probably " <<
+                "calling RPC 0x" << hex << proc << " with the wrong return type." << endl;

         VERIFY(0);
         return rpc_const::unmarshal_reply_failure;
     }
         VERIFY(0);
         return rpc_const::unmarshal_reply_failure;
     }

@@ -136,20 +128,18 @@ rpcc::call_m(unsigned int proc, marshall &req, R & r, TO to)
 }
 
 template<class R, typename... Args> inline int
 }
 
 template<class R, typename... Args> inline int

-rpcc::call(unsigned int proc, R & r, const Args&... args)
+rpcc::call(proc_t proc, R & r, const Args&... args)

 {
     return call_timeout(proc, rpcc::to_max, r, args...);
 }
 
 template<class R, typename... Args> inline int
 {
     return call_timeout(proc, rpcc::to_max, r, args...);
 }
 
 template<class R, typename... Args> inline int

-rpcc::call_timeout(unsigned int proc, const rpcc::TO to, R & r, const Args&... args)
+rpcc::call_timeout(proc_t proc, const rpcc::TO 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 {
 

@@ -167,89 +157,74 @@ 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
     // per client that that client hasn't acknowledged receiving yet.
         // indexed by client nonce.
     unsigned int nonce_;
 
     // provide at most once semantics by maintaining a window of replies
     // per client that that client hasn't acknowledged receiving yet.
         // indexed by client nonce.

-    std::map<unsigned int, std::list<reply_t> > reply_window_;
+    map<unsigned int, list<reply_t> > reply_window_;

 
     void free_reply_window(void);
 
     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(unsigned int proc);
+    void updatestat(proc_t proc);

 
     // latest connection to the client
 
     // latest connection to the client

-    std::map<unsigned int, connection *> conns_;
+    map<unsigned int, connection *> conns_;

 
     // counting
     const size_t counting_;
     size_t curr_counts_;
 
     // counting
     const size_t counting_;
     size_t curr_counts_;

-    std::map<unsigned int, size_t> counts_;
+    map<proc_t, size_t> counts_;

 
 

-    int lossytest_; 

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

-    std::map<unsigned int, handler *> procs_;
+    map<proc_t, handler *> procs_;

 
 

-    std::mutex procs_m_; // protect insert/delete to procs[]
-    std::mutex count_m_;  //protect modification of counts
-    std::mutex reply_window_m_; // protect reply window et al
-    std::mutex conss_m_; // protect conns_
+    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_

 
 
     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 *);
 
     // internal handler registration
     };
     void dispatch(djob_t *);
 
     // internal handler registration

-    void reg1(unsigned int proc, handler *);
+    void reg1(proc_t proc, handler *);

 
     ThrPool* dispatchpool_;
 
     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(unsigned int proc, F f, C *c=nullptr);
+    template<class F, class C=void> void reg(proc_t proc, F f, C *c=nullptr);

 };
 
 struct ReturnOnFailure {
 };
 
 struct ReturnOnFailure {

@@ -258,12 +233,8 @@ struct ReturnOnFailure {
     }
 };
 
     }
 };
 

-template<class F, class C> void rpcs::reg(unsigned int proc, F f, C *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));
 }
 
     reg1(proc, marshalled_func<F, ReturnOnFailure>::wrap(f, c));
 }
 

-void make_sockaddr(const std::string &hostandport, struct sockaddr_in *dst);
-void make_sockaddr(const std::string &host, const std::string &port, struct
-        sockaddr_in *dst);
-

 #endif
 #endif