Lots more clean-ups

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

diff --git a/rsm_client.cc b/rsm_client.cc
index e5e4c2b..ae88169 100644 (file)
--- a/rsm_client.cc
+++ b/rsm_client.cc
@@ -26,7 +26,7 @@ rsm_protocol::status rsm_client::invoke(unsigned int proc, string &rep, const st
         rpcc *cl = h.safebind();
         auto ret = rsm_client_protocol::OK;
         if (cl)
         rpcc *cl = h.safebind();
         auto ret = rsm_client_protocol::OK;
         if (cl)

-            ret = (rsm_client_protocol::status)cl->call_timeout(rsm_client_protocol::invoke, rpcc::to(5000), rep, proc, req);
+            ret = (rsm_client_protocol::status)cl->call_timeout(rsm_client_protocol::invoke, milliseconds(500), rep, proc, req);

         ml.lock();
 
         if (!cl)
         ml.lock();
 
         if (!cl)

@@ -37,7 +37,7 @@ rsm_protocol::status rsm_client::invoke(unsigned int proc, string &rep, const st
             return rsm_protocol::OK;
         if (ret == rsm_client_protocol::BUSY) {
             LOG("rsm is busy " << primary);
             return rsm_protocol::OK;
         if (ret == rsm_client_protocol::BUSY) {
             LOG("rsm is busy " << primary);

-            sleep(3);
+            usleep(300000);

             continue;
         }
         if (ret == rsm_client_protocol::NOTPRIMARY) {
             continue;
         }
         if (ret == rsm_client_protocol::NOTPRIMARY) {

@@ -61,7 +61,7 @@ bool rsm_client::init_members(lock & rsm_client_mutex_lock) {
         rsm_client_mutex_lock.unlock();
         cl = h.safebind();
         if (cl)
         rsm_client_mutex_lock.unlock();
         cl = h.safebind();
         if (cl)

-            ret = cl->call_timeout(rsm_client_protocol::members, rpcc::to(1000), known_mems, 0);
+            ret = cl->call_timeout(rsm_client_protocol::members, milliseconds(100), known_mems, 0);

         rsm_client_mutex_lock.lock();
     }
     if (cl == 0 || ret != rsm_protocol::OK)
         rsm_client_mutex_lock.lock();
     }
     if (cl == 0 || ret != rsm_protocol::OK)