More clean-ups

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

diff --git a/config.cc b/config.cc
index 5d04cd2..38c4c05 100644 (file)
--- a/config.cc
+++ b/config.cc
@@ -88,8 +88,7 @@ void config::paxos_commit(unsigned instance, const string &value) {
         LOG("is " << mem << " still a member?");
         if (!isamember(mem, newmem) && me != mem) {
             LOG("delete " << mem);
         LOG("is " << mem << " still a member?");
         if (!isamember(mem, newmem) && me != mem) {
             LOG("delete " << mem);

-            invalidate_handle(mem);
-            //handle(mem).invalidate();
+            handle(mem).invalidate();

         }
     }
 
         }
     }
 

@@ -203,7 +202,7 @@ config::heartbeat_t config::doheartbeat(const string &m, lock &cfg_mutex_lock) {
     handle h(m);
 
     cfg_mutex_lock.unlock();
     handle h(m);
 
     cfg_mutex_lock.unlock();

-    int r = 0, ret = rpc_const::bind_failure;
+    int r = 0, ret = rpc_protocol::bind_failure;

     if (rpcc *cl = h.safebind())
         ret = cl->call_timeout(paxos_protocol::heartbeat, milliseconds(100), r, me, vid);
     cfg_mutex_lock.lock();
     if (rpcc *cl = h.safebind())
         ret = cl->call_timeout(paxos_protocol::heartbeat, milliseconds(100), r, me, vid);
     cfg_mutex_lock.lock();

@@ -212,10 +211,9 @@ config::heartbeat_t config::doheartbeat(const string &m, lock &cfg_mutex_lock) {
     switch (ret) {
         case paxos_protocol::OK:
             break;
     switch (ret) {
         case paxos_protocol::OK:
             break;

-        case rpc_const::atmostonce_failure:
-        case rpc_const::oldsrv_failure:
-            invalidate_handle(m);
-            //h.invalidate();
+        case rpc_protocol::atmostonce_failure:
+        case rpc_protocol::oldsrv_failure:
+            h.invalidate();

             break;
         default:
             LOG("problem with " << m << " (" << ret << ") my vid " << vid << " his vid " << r);
             break;
         default:
             LOG("problem with " << m << " (" << ret << ") my vid " << vid << " his vid " << r);