Fixed two major bugs in paxos.cc.

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

diff --git a/rsm_client.h b/rsm_client.h
index 814616f..0b1dc88 100644 (file)
--- a/rsm_client.h
+++ b/rsm_client.h
@@ -1,11 +1,8 @@
 #ifndef rsm_client_h
 #define rsm_client_h
 
 #ifndef rsm_client_h
 #define rsm_client_h
 

-#include "rpc/rpc.h"
+#include "types.h"

 #include "rsm_protocol.h"
 #include "rsm_protocol.h"

-#include <string>
-#include <vector>
-

 
 //
 // rsm client interface.
 
 //
 // rsm client interface.

@@ -17,14 +14,14 @@
 
 class rsm_client {
     protected:
 
 class rsm_client {
     protected:

-        std::string primary;
-        std::vector<std::string> known_mems;
-        std::mutex rsm_client_mutex;
+        string primary;
+        vector<string> known_mems;
+        mutex rsm_client_mutex;

         void primary_failure(lock & rsm_client_mutex_lock);
         bool init_members(lock & rsm_client_mutex_lock);
     public:
         void primary_failure(lock & rsm_client_mutex_lock);
         bool init_members(lock & rsm_client_mutex_lock);
     public:

-        rsm_client(std::string dst);
-        rsm_protocol::status invoke(unsigned int proc, std::string &rep, const std::string &req);
+        rsm_client(string dst);
+        rsm_protocol::status invoke(unsigned int proc, string &rep, const string &req);

 
         template<class R, class ...Args>
             int call(unsigned int proc, R & r, const Args & ...a1);
 
         template<class R, class ...Args>
             int call(unsigned int proc, R & r, const Args & ...a1);

@@ -34,28 +31,28 @@ class rsm_client {
 
 template<class R>
 int rsm_client::call_m(unsigned int proc, R & r, const marshall & req) {
 
 template<class R>
 int rsm_client::call_m(unsigned int proc, R & r, const marshall & req) {

-    std::string rep;
-    std::string res;
-    int intret = invoke(proc, rep, req.cstr());
+    string rep;
+    string res;
+    int intret = invoke(proc, rep, req);

     VERIFY( intret == rsm_client_protocol::OK );
     VERIFY( intret == rsm_client_protocol::OK );

-    unmarshall u(rep);
+    unmarshall u(rep, false);

     u >> intret;
     if (intret < 0) return intret;
     u >> res;
     if (!u.okdone()) {
     u >> intret;
     if (intret < 0) return intret;
     u >> res;
     if (!u.okdone()) {

-        fprintf(stderr, "rsm_client::call_m: failed to unmarshall the reply.\n"
-                "You probably forgot to set the reply string in "
-                "rsm::client_invoke, or you may call RPC 0x%x with wrong return "
-                "type\n", proc);
+        cerr << "rsm_client::call_m: failed to unmarshall the reply." << endl;
+        cerr << "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" << endl;

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

-    unmarshall u1(res);
+    unmarshall u1(res, false);

     u1 >> r;
     if(!u1.okdone()) {
     u1 >> r;
     if(!u1.okdone()) {

-        fprintf(stderr, "rsm_client::call_m: failed to unmarshall the reply.\n"
-                "You are probably calling RPC 0x%x with wrong return "
-                "type.\n", proc);
+        cerr << "rsm_client::call_m: failed to unmarshall the reply." << endl;
+        cerr << "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;
     }