Cosmetic changes

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

diff --git a/rpc/rpc.h b/rpc/rpc.h
index 3ae7737..ddf15f9 100644 (file)
--- a/rpc/rpc.h
+++ b/rpc/rpc.h
@@ -2,32 +2,39 @@
 #define rpc_h
 
 #include "types.h"
 #define rpc_h
 
 #include "types.h"

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

 
 #include "rpc_protocol.h"
 
 #include "rpc_protocol.h"

-#include "thr_pool.h"
+#include "thread_pool.h"

 #include "marshall.h"
 #include "marshall_wrap.h"
 #include "connection.h"
 #include "marshall.h"
 #include "marshall_wrap.h"
 #include "connection.h"

+#include "threaded_log.h"
+
+using std::chrono::milliseconds;

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

-template<class P, class R, class ...Args> struct is_valid_call : false_type {};
+template<class P, class R, class ...Args>
+struct is_valid_call : false_type {};

 
 template<class S, class R, class ...Args>
 struct is_valid_call<S(R &, Args...), R, Args...> : true_type {};
 
 
 template<class S, class R, class ...Args>
 struct is_valid_call<S(R &, Args...), R, Args...> : true_type {};
 

-template<class P, class F> struct is_valid_registration : false_type {};
+template<class P, class F>
+struct is_valid_registration : false_type {};

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

-struct is_valid_registration<S(R &, typename decay<Args>::type...), S(R &, Args...)> : true_type {};
+struct is_valid_registration<
+    S(R &, typename std::decay<Args>::type...),
+    S(R &, Args...)> : true_type {};

 
 template<class P, class C, class S, class R, class ...Args>
 
 template<class P, class C, class S, class R, class ...Args>

-struct is_valid_registration<P, S(C::*)(R &, Args...)> : is_valid_registration<P, S(R &, Args...)> {};
+struct is_valid_registration<
+    P,
+    S(C::*)(R &, Args...)> : is_valid_registration<P, S(R &, Args...)> {};

 
 // rpc client endpoint.
 // manages a xid space per destination socket
 
 // rpc client endpoint.
 // manages a xid space per destination socket

@@ -48,33 +55,35 @@ class rpcc : private connection_delegate {
             string *rep;
             int intret;
             bool done = false;
             string *rep;
             int intret;
             bool done = false;

-            mutex m;
+            std::mutex m;

             cond c;
         };
 
             cond c;
         };
 

-        void get_refconn(shared_ptr<connection> & ch);
-        void update_xid_rep(xid_t xid);
+        void get_latest_connection(shared_ptr<connection> & ch);
+        void update_xid_rep(xid_t xid, lock & m_lock);

 
 
         sockaddr_in dst_;
         nonce_t clt_nonce_;
 
 
         sockaddr_in dst_;
         nonce_t clt_nonce_;

-        nonce_t srv_nonce_;
-        bool bind_done_;
-        xid_t xid_;
-        int lossytest_;
-        bool retrans_;
-        bool reachable_;
+        nonce_t srv_nonce_ = 0;
+        bool bind_done_ = false;
+        int lossytest_ = 0;
+        bool reachable_ = true;

 
         shared_ptr<connection> chan_;
 
 
         shared_ptr<connection> chan_;
 

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

 
 

-        bool destroy_wait_;
+        bool destroy_wait_ = false;

         cond destroy_wait_c_;
 
         cond destroy_wait_c_;
 

-        map<int, caller *> calls_;
-        list<xid_t> xid_rep_window_;
+        std::map<int, caller *> calls_;
+
+        // xid starts with 1 and latest received reply starts with 0
+        xid_t xid_ = 1;
+        std::list<xid_t> xid_rep_window_ = {0};

 
         struct request {
             void clear() { buf.clear(); xid = -1; }
 
         struct request {
             void clear() { buf.clear(); xid = -1; }

@@ -83,23 +92,16 @@ class rpcc : private connection_delegate {
             xid_t xid = -1;
         };
         request dup_req_;
             xid_t xid = -1;
         };
         request dup_req_;

-        int xid_rep_done_;
+        int xid_rep_done_ = -1;

 
 

-        int call1(proc_id_t proc, marshall &req, string &rep, milliseconds to);
+        int call_marshalled(proc_id_t proc, milliseconds to, string & rep, marshall & req);

 
         template<class R>
 
         template<class R>

-        int call_m(proc_id_t proc, marshall &req, R & r, milliseconds to) {
+        inline int call_m(proc_id_t proc, milliseconds to, R & r, marshall && req) {

             string rep;
             string rep;

-            int intret = call1(proc, req, rep, to);
-            unmarshall u(rep, true);
-            if (intret < 0) return intret;
-            u >> r;
-            if (u.okdone() != true) {
-                LOG("rpcc::call_m: failed to unmarshall the reply.  You are probably " <<
-                    "calling RPC 0x" << hex << proc << " with the wrong return type.");
-                VERIFY(0);
-                return rpc_protocol::unmarshal_reply_failure;
-            }
+            int intret = call_marshalled(proc, to, rep, req);
+            if (intret >= 0)
+                VERIFY(unmarshall(rep, true, r).okdone()); // guaranteed by static type checking

             return intret;
         }
 
             return intret;
         }
 

@@ -107,27 +109,32 @@ class rpcc : private connection_delegate {
 
     public:
 
 
     public:
 

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

         ~rpcc();
 
         ~rpcc();
 

-        nonce_t id() { return clt_nonce_; }
-

         int bind(milliseconds to = rpc::to_max);
 
         int bind(milliseconds to = rpc::to_max);
 

+        // Manages a cache of RPC connections.  Usage:
+        //     if (auto cl = rpcc::bind_cached(dst))
+        //         ret = cl->call(...);
+        // where the string dst has the form "host:port".  Because bind_cached()
+        // may block, callers should probably not hold mutexes.
+        static shared_ptr<rpcc> bind_cached(const string & destination);
+        static void unbind_cached(const string & destination);
+

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

-        void cancel();
+        void cancel(lock & m_lock);

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

-        inline int call(proc_t<P> proc, R & r, const Args&... args) {
+        inline int call(proc_t<P> proc, R & r, const Args & ... args) {

             return call_timeout(proc, rpc::to_max, r, args...);
         }
 
         template<class P, class R, typename ...Args>
             return call_timeout(proc, rpc::to_max, r, args...);
         }
 
         template<class P, class R, typename ...Args>

-        inline int call_timeout(proc_t<P> proc, milliseconds to, R & r, const Args&... args) {
+        inline int call_timeout(proc_t<P> proc, milliseconds to, R & r, const Args & ... args) {

             static_assert(is_valid_call<P, R, Args...>::value, "RPC called with incorrect argument types");
             static_assert(is_valid_call<P, R, Args...>::value, "RPC called with incorrect argument types");

-            marshall m{args...};
-            return call_m(proc.id, m, r, to);
+            return call_m(proc.id, to, r, std::forward<marshall>(marshall(args...)));

         }
 };
 
         }
 };
 

@@ -165,36 +172,32 @@ class rpcs : private connection_delegate {
         // 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.
         // 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<nonce_t, list<reply_t>> reply_window_;
+        std::map<nonce_t, std::list<reply_t>> reply_window_;

 
 

-        void free_reply_window(void);

         void add_reply(nonce_t clt_nonce, xid_t xid, const string & b);
 
         void add_reply(nonce_t clt_nonce, xid_t xid, const string & b);
 

-        rpcstate_t checkduplicate_and_update(nonce_t clt_nonce, xid_t xid,
+        rpcstate_t check_duplicate_and_update(nonce_t clt_nonce, xid_t xid,

                 xid_t rep_xid, string & b);
 
         // latest connection to the client
                 xid_t rep_xid, string & b);
 
         // latest connection to the client

-        map<nonce_t, shared_ptr<connection>> conns_;
+        std::map<nonce_t, shared_ptr<connection>> conns_;

 
 

-        bool reachable_;
+        bool reachable_ = true;

 
         // map proc # to function
 
         // map proc # to function

-        map<proc_id_t, handler *> procs_;
+        std::map<proc_id_t, handler *> procs_;

 
 

-        mutex procs_m_; // protect insert/delete to procs[]
-        mutex reply_window_m_; // protect reply window et al
-        mutex conns_m_; // protect conns_
+        std::mutex procs_m_; // protect insert/delete to procs[]
+        std::mutex reply_window_m_; // protect reply window et al
+        std::mutex conns_m_; // protect conns_

 
         void dispatch(shared_ptr<connection> c, const string & buf);
 
 
         void dispatch(shared_ptr<connection> c, const string & buf);
 

-        // internal handler registration
-        void reg1(proc_id_t proc, handler *);
-
-        unique_ptr<thread_pool> dispatchpool_;
+        unique_ptr<thread_pool> dispatchpool_{new thread_pool(6)};

         unique_ptr<connection_listener> listener_;
 
         // RPC handler for clients binding
         unique_ptr<connection_listener> listener_;
 
         // RPC handler for clients binding

-        rpc_protocol::status rpcbind(nonce_t &r);
+        rpc_protocol::status rpcbind(nonce_t & r);

 
         bool got_pdu(const shared_ptr<connection> & c, const string & b);
 
 
         bool got_pdu(const shared_ptr<connection> & c, const string & b);
 

@@ -209,10 +212,13 @@ class rpcs : private connection_delegate {
             static_assert(is_valid_registration<P, F>::value, "RPC handler registered with incorrect argument types");
             struct ReturnOnFailure {
                 static inline int unmarshall_args_failure() {
             static_assert(is_valid_registration<P, F>::value, "RPC handler registered with incorrect argument types");
             struct ReturnOnFailure {
                 static inline int unmarshall_args_failure() {

-                    return rpc_protocol::unmarshal_args_failure;
+                    return rpc_protocol::unmarshall_args_failure;

                 }
             };
                 }
             };

-            reg1(proc.id, marshalled_func<F, ReturnOnFailure>::wrap(f, c));
+            lock pl(procs_m_);
+            VERIFY(procs_.count(proc.id) == 0);
+            procs_[proc.id] = marshalled_func<F, ReturnOnFailure>::wrap(f, c);
+            VERIFY(procs_.count(proc.id) >= 1);

         }
 
         void start();
         }
 
         void start();