X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/6b5e09540e9392a7015fae1ad3b01b0973600ff2..ab9eee5d7f1fbe7a3fe6229d4a78136efb14371b:/rsm_client.cc

diff --git a/rsm_client.cc b/rsm_client.cc
index 9e86915..b24f056 100644
--- a/rsm_client.cc
+++ b/rsm_client.cc
@@ -1,79 +1,75 @@
-#include "rsm_client.h"
+#include "include/rsm_client.h"
 #include <arpa/inet.h>
-#include <handle.h>
 #include <unistd.h>
 
+using namespace std::chrono;
+
 rsm_client::rsm_client(string dst) : primary(dst) {
-    LOG("create rsm_client");
+    LOG << "create rsm_client";
     lock ml(rsm_client_mutex);
     VERIFY (init_members(ml));
-    LOG("done");
-}
-
-void rsm_client::primary_failure(lock &) {
-    primary = known_mems.back();
-    known_mems.pop_back();
+    LOG << "done";
 }
 
-rsm_protocol::status rsm_client::invoke(unsigned int proc, string &rep, const string &req) {
+rsm_protocol::status rsm_client::invoke(rpc_protocol::proc_id_t proc, string & rep, const string & req) {
     lock ml(rsm_client_mutex);
     while (1) {
-        LOG("proc " << hex << proc << " primary " << primary);
-        handle h(primary);
+        LOG << "proc " << std::hex << proc << " primary " << primary;
+        string prim = primary;
 
         ml.unlock();
-        rpcc *cl = h.safebind();
+        auto cl = rpcc::bind_cached(prim);
         auto ret = rsm_client_protocol::OK;
         if (cl)
-            ret = (rsm_client_protocol::status)cl->call_timeout(rsm_client_protocol::invoke, milliseconds(500), rep, proc, req);
+            ret = (rsm_client_protocol::status)cl->call_timeout(rsm_client_protocol::invoke, 500ms, rep, proc, req);
         ml.lock();
 
         if (!cl)
             goto prim_fail;
 
-        LOG("proc " << hex << proc << " primary " << primary << " ret " << dec << ret);
+        LOG << "proc " << std::hex << proc << " primary " << prim << " ret " << std::dec << ret;
         if (ret == rsm_client_protocol::OK)
             return rsm_protocol::OK;
         if (ret == rsm_client_protocol::BUSY) {
-            LOG("rsm is busy " << primary);
-            usleep(300000);
+            LOG << "rsm is busy " << prim;
+            std::this_thread::sleep_for(300ms);
             continue;
         }
         if (ret == rsm_client_protocol::NOTPRIMARY) {
-            LOG("primary " << primary << " isn't the primary--let's get a complete list of mems");
+            LOG << "primary " << prim << " isn't the primary--let's get a complete list of mems";
             if (init_members(ml))
                 continue;
         }
 prim_fail:
-        LOG("primary " << primary << " failed ret " << dec << ret);
-        primary_failure(ml);
-        LOG("retry new primary " << primary);
+        LOG << "primary " << prim << " failed ret " << std::dec << ret;
+        primary = known_mems.back();
+        known_mems.pop_back();
+        LOG << "retry new primary " << prim;
     }
 }
 
 bool rsm_client::init_members(lock & rsm_client_mutex_lock) {
-    LOG("get members!");
-    handle h(primary);
+    LOG << "get members!";
+    string prim = primary;
     int ret = rsm_client_protocol::ERR;
-    rpcc *cl;
+    shared_ptr<rpcc> cl;
     {
         rsm_client_mutex_lock.unlock();
-        cl = h.safebind();
-        if (cl)
-            ret = cl->call_timeout(rsm_client_protocol::members, milliseconds(100), known_mems, 0);
+        if ((cl = rpcc::bind_cached(prim)))
+            ret = cl->call_timeout(rsm_client_protocol::members, 100ms, known_mems, 0);
         rsm_client_mutex_lock.lock();
     }
-    if (cl == 0 || ret != rsm_protocol::OK)
+    if (ret != rsm_protocol::OK)
         return false;
-    if (known_mems.size() < 1) {
-        LOG("do not know any members!");
+    if (!known_mems.size()) {
+        LOG << "do not know any members!";
         VERIFY(0);
     }
 
     primary = known_mems.back();
     known_mems.pop_back();
 
-    LOG("primary " << primary);
+    LOG << "primary " << primary;
 
     return true;
 }