Actually, you know, build.

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

diff --git a/config.cc b/config.cc
index 5127cb2..04c869e 100644 (file)
--- a/config.cc
+++ b/config.cc
@@ -50,7 +50,7 @@ config::config(
     paxos_proposer = new proposer(this, paxos_acceptor, me);
 
     // XXX hack; maybe should have its own port number
     paxos_proposer = new proposer(this, paxos_acceptor, me);
 
     // XXX hack; maybe should have its own port number

-    paxos_acceptor->get_rpcs()->reg(paxos_protocol::heartbeat, this, &config::heartbeat);
+    paxos_acceptor->get_rpcs()->reg(paxos_protocol::heartbeat, &config::heartbeat, this);

 
     {
         lock ml(cfg_mutex);
 
     {
         lock ml(cfg_mutex);

@@ -265,7 +265,7 @@ config::heartbeater()
 }
 
 paxos_protocol::status
 }
 
 paxos_protocol::status

-config::heartbeat(std::string m, unsigned vid, int &r)
+config::heartbeat(int &r, std::string m, unsigned vid)

 {
     lock ml(cfg_mutex);
     int ret = paxos_protocol::ERR;
 {
     lock ml(cfg_mutex);
     int ret = paxos_protocol::ERR;

@@ -298,8 +298,7 @@ config::doheartbeat(const std::string &m)
         ml.unlock();
         rpcc *cl = h.safebind();
         if (cl) {
         ml.unlock();
         rpcc *cl = h.safebind();
         if (cl) {

-            ret = cl->call(paxos_protocol::heartbeat, me, vid, r,
-                                         rpcc::to(1000));
+            ret = cl->call_timeout(paxos_protocol::heartbeat, rpcc::to(1000), r, me, vid);

         }
         ml.lock();
     }
         }
         ml.lock();
     }