X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/be7cf844f59fa483423724e8e4b5e663e5b88ddd..4a160f880ce46153acb23b137f30fd588df5fb9d:/rpc/rpc.h?ds=sidebyside

diff --git a/rpc/rpc.h b/rpc/rpc.h
index 065cabc..84c12f3 100644
--- a/rpc/rpc.h
+++ b/rpc/rpc.h
@@ -10,6 +10,11 @@
 #include "marshall_wrap.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
@@ -25,11 +30,10 @@ class rpc_const {
 // rpc client endpoint.
 // manages a xid space per destination socket
 // threaded: multiple threads can be sending RPCs,
-class rpcc : public chanmgr {
-
+class rpcc : private connection_delegate {
     private:
 
-        //manages per rpc info
+        // manages per rpc info
         struct caller {
             caller(int _xid, string *_rep) : xid(_xid), rep(_rep) {}
 
@@ -41,7 +45,7 @@ class rpcc : public chanmgr {
             cond c;
         };
 
-        void get_refconn(connection **ch);
+        void get_refconn(shared_ptr<connection> & ch);
         void update_xid_rep(int xid);
 
 
@@ -54,7 +58,7 @@ class rpcc : public chanmgr {
         bool retrans_;
         bool reachable_;
 
-        connection *chan_;
+        shared_ptr<connection> chan_;
 
         mutex m_; // protect insert/delete to calls[]
         mutex chan_m_;
@@ -66,175 +70,146 @@ class rpcc : public chanmgr {
         list<int> xid_rep_window_;
 
         struct request {
-            request() { clear(); }
             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 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) {
+            string rep;
+            int intret = call1(proc, req, rep, to);
+            unmarshall u(rep, true);
+            if (intret < 0) return intret;
+            u >> r;
+            if (u.okdone() != true) {
+                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;
+            }
+            return intret;
+        }
+
+        bool got_pdu(const shared_ptr<connection> & c, const string & b);
+
     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_; }
 
-        int bind(TO to = to_max);
+        int bind(milliseconds to = rpc::to_max);
 
         void set_reachable(bool r) { reachable_ = r; }
 
         void cancel();
 
-        int islossy() { return lossytest_ > 0; }
-
-        int call1(proc_t proc, marshall &req, string &rep, TO to);
-
-        bool got_pdu(connection *c, const string & b);
-
-        template<class R>
-            int call_m(proc_t proc, marshall &req, R & r, TO to);
-
         template<class R, typename ...Args>
-            inline int call(proc_t proc, R & r, const Args&... args);
+        inline int call(proc_t proc, R & r, const Args&... args) {
+            return call_timeout(proc, rpc::to_max, r, 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) {
+            marshall m{args...};
+            return call_m(proc, m, r, to);
+        }
 };
 
-template<class R> int 
-rpcc::call_m(proc_t proc, marshall &req, R & r, TO 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) {
-        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;
-    }
-    return intret;
-}
-
-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...);
-}
-
-template<class R, typename... Args> inline int
-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);
-}
-
 // rpc server endpoint.
-class rpcs : public chanmgr {
-
-    typedef enum {
-        NEW,  // new RPC, not a duplicate
-        INPROGRESS, // duplicate of an RPC we're still processing
-        DONE, // duplicate of an RPC we already replied to (have reply)
-        FORGOTTEN,  // duplicate of an old RPC whose reply we've forgotten
-    } rpcstate_t;
-
+class rpcs : private connection_delegate {
     private:
 
+        typedef enum {
+            NEW,  // new RPC, not a duplicate
+            INPROGRESS, // duplicate of an RPC we're still processing
+            DONE, // duplicate of an RPC we already replied to (have reply)
+            FORGOTTEN,  // duplicate of an old RPC whose reply we've forgotten
+        } rpcstate_t;
+
         // state about an in-progress or completed RPC, for at-most-once.
         // if cb_present is true, then the RPC is complete and a reply
         // 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) {}
-        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
-        string buf;      // the reply buffer
-    };
-
-    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.
+        struct reply_t {
+            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
+            string buf;      // the reply buffer
+        };
+
+        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.
-    map<unsigned int, list<reply_t> > reply_window_;
+        map<unsigned int, list<reply_t>> reply_window_;
 
-    void free_reply_window(void);
-    void add_reply(unsigned int clt_nonce, int xid, const string & b);
+        void free_reply_window(void);
+        void add_reply(unsigned int clt_nonce, int xid, const string & b);
 
-    rpcstate_t checkduplicate_and_update(unsigned int clt_nonce, 
-            int xid, int rep_xid, string & b);
+        rpcstate_t checkduplicate_and_update(unsigned int clt_nonce, 
+                int xid, int rep_xid, string & b);
 
-    void updatestat(proc_t proc);
+        void updatestat(proc_t proc);
 
-    // latest connection to the client
-    map<unsigned int, connection *> conns_;
+        // latest connection to the client
+        map<unsigned int, shared_ptr<connection>> conns_;
 
-    // counting
-    const size_t counting_;
-    size_t curr_counts_;
-    map<proc_t, size_t> counts_;
+        // counting
+        const size_t counting_;
+        size_t curr_counts_;
+        map<proc_t, size_t> counts_;
 
-    bool reachable_;
+        bool reachable_;
 
-    // map proc # to function
-    map<proc_t, handler *> procs_;
+        // map proc # to function
+        map<proc_t, handler *> procs_;
 
-    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 procs_m_; // protect insert/delete to procs[]
+        mutex count_m_;  // protect modification of counts
+        mutex reply_window_m_; // protect reply window et al
+        mutex conns_m_; // protect conns_
 
+        void dispatch(shared_ptr<connection> c, const string & buf);
 
-    protected:
+        // internal handler registration
+        void reg1(proc_t proc, handler *);
 
-    struct djob_t {
-        connection *conn;
-        string buf;
-    };
-    void dispatch(djob_t *);
+        unique_ptr<thread_pool> dispatchpool_;
+        unique_ptr<tcpsconn> listener_;
 
-    // internal handler registration
-    void reg1(proc_t proc, handler *);
+        // RPC handler for clients binding
+        int rpcbind(unsigned int &r, int a);
 
-    ThrPool* dispatchpool_;
-    tcpsconn *listener_;
+        bool got_pdu(const shared_ptr<connection> & c, const string & b);
 
     public:
-    rpcs(in_port_t port, size_t counts=0);
-    ~rpcs();
-    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; }
+        rpcs(in_port_t port, size_t counts=0);
+        ~rpcs();
 
-    bool got_pdu(connection *c, const string & b);
+        void set_reachable(bool r) { reachable_ = r; }
 
-    template<class F, class C=void> void reg(proc_t proc, F f, C *c=nullptr);
-};
+        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;
+                }
+            };
+            reg1(proc, marshalled_func<F, ReturnOnFailure>::wrap(f, c));
+        }
 
-struct ReturnOnFailure {
-    static inline int unmarshall_args_failure() {
-        return rpc_const::unmarshal_args_failure;
-    }
+        void start();
 };
 
-template<class F, class C> void rpcs::reg(proc_t proc, F f, C *c) {
-    reg1(proc, marshalled_func<F, ReturnOnFailure>::wrap(f, c));
-}
-
 #endif