All random numbers generated via one PRNG seeded in one place.

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

diff --git a/rsm_client.h b/rsm_client.h
index be66fec..90b5b06 100644 (file)
--- a/rsm_client.h
+++ b/rsm_client.h
@@ -15,19 +15,19 @@
 class rsm_client {
     protected:
         string primary;
-        vector<string> known_mems;
-        mutex rsm_client_mutex;
+        std::vector<string> known_mems;
+        std::mutex rsm_client_mutex;
         void primary_failure(lock & rsm_client_mutex_lock);
         bool init_members(lock & rsm_client_mutex_lock);
-        rsm_protocol::status invoke(unsigned int proc, string &rep, const string &req);
+        rsm_protocol::status invoke(unsigned int proc, string & rep, const string & req);
         template<class R> int call_m(unsigned int proc, R & r, const marshall & req);
     public:
         rsm_client(string dst);
 
         template<class P, class R, class ...Args>
-        int call(rpc_protocol::proc_t<P> proc, R & r, const Args & ...a1) {
+        inline int call(rpc_protocol::proc_t<P> proc, R & r, const Args & ...a1) {
             static_assert(is_valid_call<P, R, Args...>::value, "RSM method invoked with incorrect argument types");
-            return call_m(proc.id, r, marshall{a1...});
+            return call_m(proc.id, r, marshall(a1...));
         }
 };
 
@@ -43,31 +43,28 @@ inline string hexify(const string & s) {
 template<class R>
 int rsm_client::call_m(unsigned int proc, R & r, const marshall & req) {
     string rep;
-    string res;
     int intret = invoke(proc, rep, req.content());
     VERIFY( intret == rsm_client_protocol::OK );
-    unmarshall u(rep, false);
-    u >> intret;
+    unmarshall u(rep, false, intret);
     if (intret < 0) return intret;
+    string res;
     u >> res;
     if (!u.okdone()) {
-        LOG("failed to unmarshall the reply.");
-        LOG("You probably forgot to set the reply string in " <<
-            "rsm::client_invoke, or you may have called RPC " <<
-            "0x" << hex << proc << " with the wrong return type");
-        LOG("here's what I got: \"" << hexify(rep) << "\"");
+        LOG << "failed to unmarshall the reply.";
+        LOG << "You probably forgot to set the reply string in "
+            << "rsm::client_invoke, or you may have called RPC "
+            << "0x" << std::hex << proc << " with the wrong return type";
+        LOG << "here's what I got: \"" << hexify(rep) << "\"";
         VERIFY(0);
-        return rpc_protocol::unmarshal_reply_failure;
+        return rpc_protocol::unmarshall_reply_failure;
     }
-    unmarshall u1(res, false);
-    u1 >> r;
-    if(!u1.okdone()) {
-        LOG("failed to unmarshall the reply.");
-        LOG("You are probably calling RPC 0x" << hex << proc <<
-            " with the wrong return type.");
-        LOG("here's what I got: \"" << hexify(res) << "\"");
+    if(!unmarshall(res, false, r).okdone()) {
+        LOG << "failed to unmarshall the reply.";
+        LOG << "You are probably calling RPC 0x" << std::hex << proc
+            << " with the wrong return type.";
+        LOG << "here's what I got: \"" << hexify(res) << "\"";
         VERIFY(0);
-        return rpc_protocol::unmarshal_reply_failure;
+        return rpc_protocol::unmarshall_reply_failure;
     }
     return intret;
 }