Clean-ups to logging and type signatures

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

diff --git a/rsm_client.cc b/rsm_client.cc
index 310d1ad..e5e4c2b 100644 (file)
--- a/rsm_client.cc
+++ b/rsm_client.cc
@@ -19,7 +19,7 @@ void rsm_client::primary_failure(lock &) {
 rsm_protocol::status rsm_client::invoke(unsigned int proc, string &rep, const string &req) {
     lock ml(rsm_client_mutex);
     while (1) {
 rsm_protocol::status rsm_client::invoke(unsigned int proc, string &rep, const string &req) {
     lock ml(rsm_client_mutex);
     while (1) {

-        LOG("rsm_client::invoke proc " << hex << proc << " primary " << primary);
+        LOG("proc " << hex << proc << " primary " << primary);

         handle h(primary);
 
         ml.unlock();
         handle h(primary);
 
         ml.unlock();

@@ -32,7 +32,7 @@ rsm_protocol::status rsm_client::invoke(unsigned int proc, string &rep, const st
         if (!cl)
             goto prim_fail;
 
         if (!cl)
             goto prim_fail;
 

-        LOG("rsm_client::invoke proc " << hex << proc << " primary " << primary << " ret " << dec << ret);
+        LOG("proc " << hex << proc << " primary " << primary << " ret " << dec << ret);

         if (ret == rsm_client_protocol::OK)
             return rsm_protocol::OK;
         if (ret == rsm_client_protocol::BUSY) {
         if (ret == rsm_client_protocol::OK)
             return rsm_protocol::OK;
         if (ret == rsm_client_protocol::BUSY) {

@@ -48,12 +48,12 @@ rsm_protocol::status rsm_client::invoke(unsigned int proc, string &rep, const st
 prim_fail:
         LOG("primary " << primary << " failed ret " << dec << ret);
         primary_failure(ml);
 prim_fail:
         LOG("primary " << primary << " failed ret " << dec << ret);
         primary_failure(ml);

-        LOG("rsm_client::invoke: retry new primary " << primary);
+        LOG("retry new primary " << primary);

     }
 }
 
 bool rsm_client::init_members(lock & rsm_client_mutex_lock) {
     }
 }
 
 bool rsm_client::init_members(lock & rsm_client_mutex_lock) {

-    LOG("rsm_client::init_members get members!");
+    LOG("get members!");

     handle h(primary);
     int ret = rsm_client_protocol::ERR;
     rpcc *cl;
     handle h(primary);
     int ret = rsm_client_protocol::ERR;
     rpcc *cl;

@@ -67,14 +67,14 @@ bool rsm_client::init_members(lock & rsm_client_mutex_lock) {
     if (cl == 0 || ret != rsm_protocol::OK)
         return false;
     if (known_mems.size() < 1) {
     if (cl == 0 || ret != rsm_protocol::OK)
         return false;
     if (known_mems.size() < 1) {

-        LOG("rsm_client::init_members do not know any members!");
+        LOG("do not know any members!");

         VERIFY(0);
     }
 
     primary = known_mems.back();
     known_mems.pop_back();
 
         VERIFY(0);
     }
 
     primary = known_mems.back();
     known_mems.pop_back();
 

-    LOG("rsm_client::init_members: primary " << primary);
+    LOG("primary " << primary);

 
     return true;
 }
 
     return true;
 }