Clean-ups

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

diff --git a/paxos.cc b/paxos.cc
index 4bba25d..2c7e79a 100644 (file)
--- a/paxos.cc
+++ b/paxos.cc
@@ -1,15 +1,17 @@
 #include "paxos.h"
 #include "paxos.h"

-#include "handle.h"
+
+using namespace std::placeholders;

 
 paxos_change::~paxos_change() {}
 
 bool isamember(const node_t & m, const nodes_t & nodes) {
 
 paxos_change::~paxos_change() {}
 
 bool isamember(const node_t & m, const nodes_t & nodes) {

-    return find(nodes.begin(), nodes.end(), m) != nodes.end();
+    return std::find(nodes.begin(), nodes.end(), m) != nodes.end();

 }
 
 // check if l2 contains a majority of the elements of l1
 bool majority(const nodes_t & l1, const nodes_t & l2) {
 }
 
 // check if l2 contains a majority of the elements of l1
 bool majority(const nodes_t & l1, const nodes_t & l2) {

-    auto overlap = (size_t)count_if(l1.begin(), l1.end(), std::bind(isamember, _1, l2));
+    auto overlap = (size_t)std::count_if(
+            l1.begin(), l1.end(), std::bind(isamember, _1, l2));

     return overlap >= (l1.size() >> 1) + 1;
 }
 
     return overlap >= (l1.size() >> 1) + 1;
 }
 

@@ -41,20 +43,20 @@ proposer_acceptor::proposer_acceptor(paxos_change *_delegate,
 bool proposer_acceptor::run(unsigned instance, const nodes_t & cur_nodes, const value_t & newv)
 {
     lock ml(proposer_mutex);
 bool proposer_acceptor::run(unsigned instance, const nodes_t & cur_nodes, const value_t & newv)
 {
     lock ml(proposer_mutex);

-    LOG("initiate paxos for " << cur_nodes << " w. i=" << instance << " v=\"" << newv << "\" stable=" << stable);
+    LOG << "initiate paxos for " << cur_nodes << " w. i=" << instance << " v=\"" << newv << "\" stable=" << stable;

     if (!stable) {  // already running proposer?
     if (!stable) {  // already running proposer?

-        LOG("paxos proposer already running");
+        LOG << "paxos proposer already running";

         return false;
     }
     stable = false;
     bool r = false;
         return false;
     }
     stable = false;
     bool r = false;

-    proposal.n = max(promise.n, proposal.n) + 1;
+    proposal.n = std::max(promise.n, proposal.n) + 1;

     nodes_t accepts;
     value_t v;
     if (prepare(instance, accepts, cur_nodes, v)) {
 
         if (majority(cur_nodes, accepts)) {
     nodes_t accepts;
     value_t v;
     if (prepare(instance, accepts, cur_nodes, v)) {
 
         if (majority(cur_nodes, accepts)) {

-            LOG("received a majority of prepare responses");
+            LOG << "received a majority of prepare responses";

 
             if (!v.size())
                 v = newv;
 
             if (!v.size())
                 v = newv;

@@ -66,20 +68,20 @@ bool proposer_acceptor::run(unsigned instance, const nodes_t & cur_nodes, const
             accept(instance, accepts, nodes, v);
 
             if (majority(cur_nodes, accepts)) {
             accept(instance, accepts, nodes, v);
 
             if (majority(cur_nodes, accepts)) {

-                LOG("received a majority of accept responses");
+                LOG << "received a majority of accept responses";

 
                 breakpoint2();
 
                 decide(instance, accepts, v);
                 r = true;
             } else {
 
                 breakpoint2();
 
                 decide(instance, accepts, v);
                 r = true;
             } else {

-                LOG("no majority of accept responses");
+                LOG << "no majority of accept responses";

             }
         } else {
             }
         } else {

-            LOG("no majority of prepare responses");
+            LOG << "no majority of prepare responses";

         }
     } else {
         }
     } else {

-        LOG("prepare is rejected " << stable);
+        LOG << "prepare is rejected " << stable;

     }
     stable = true;
     return r;
     }
     stable = true;
     return r;

@@ -87,28 +89,27 @@ bool proposer_acceptor::run(unsigned instance, const nodes_t & cur_nodes, const
 
 bool proposer_acceptor::prepare(unsigned instance, nodes_t & accepts,
         const nodes_t & nodes, value_t & v) {
 
 bool proposer_acceptor::prepare(unsigned instance, nodes_t & accepts,
         const nodes_t & nodes, value_t & v) {

-    LOG("sending prepare messages (" << proposal.n << ", " << proposal.m << ", \"" << v << "\")");
+    LOG << "sending prepare messages (" << proposal.n << ", " << proposal.m << ", \"" << v << "\")";

     prepareres res;
     prop_t highest_n_a{0, ""};
     for (auto i : nodes) {
     prepareres res;
     prop_t highest_n_a{0, ""};
     for (auto i : nodes) {

-        handle h(i);
-        rpcc *r = h.safebind();
+        auto r = rpcc::bind_cached(i);

         if (!r)
             continue;
         auto status = (paxos_protocol::status)r->call_timeout(
                 paxos_protocol::preparereq, milliseconds(100), res, me, instance, proposal);
         if (status == paxos_protocol::OK) {
             if (res.oldinstance) {
         if (!r)
             continue;
         auto status = (paxos_protocol::status)r->call_timeout(
                 paxos_protocol::preparereq, milliseconds(100), res, me, instance, proposal);
         if (status == paxos_protocol::OK) {
             if (res.oldinstance) {

-                LOG("commiting old instance!");
+                LOG << "commiting old instance!";

                 commit(instance, res.v_a);
                 return false;
             }
                 commit(instance, res.v_a);
                 return false;
             }

-            LOG("preparereq responded with oldinstance=" << res.oldinstance << " accept=" << res.accept << " n_a=(" << res.n_a.n << ", " << res.n_a.m << ") " <<
-                    "v_a=\"" << res.v_a << "\"");
+            LOG << "preparereq responded with oldinstance=" << res.oldinstance << " accept=" << res.accept << " n_a=(" << res.n_a.n << ", " << res.n_a.m << ") "
+                << "v_a=\"" << res.v_a << "\"";

             if (res.accept) {
                 accepts.push_back(i);
                 if (res.n_a >= highest_n_a) {
             if (res.accept) {
                 accepts.push_back(i);
                 if (res.n_a >= highest_n_a) {

-                    LOG("found a newer accepted proposal, \"" << res.v_a << "\", with number (" << res.n_a.n << ", " << res.n_a.m << ")");
+                    LOG << "found a newer accepted proposal, \"" << res.v_a << "\", with number (" << res.n_a.n << ", " << res.n_a.m << ")";

                     v = res.v_a;
                     highest_n_a = res.n_a;
                 }
                     v = res.v_a;
                     highest_n_a = res.n_a;
                 }

@@ -121,8 +122,7 @@ bool proposer_acceptor::prepare(unsigned instance, nodes_t & accepts,
 void proposer_acceptor::accept(unsigned instance, nodes_t & accepts,
         const nodes_t & nodes, const value_t & v) {
     for (auto i : nodes) {
 void proposer_acceptor::accept(unsigned instance, nodes_t & accepts,
         const nodes_t & nodes, const value_t & v) {
     for (auto i : nodes) {

-        handle h(i);
-        rpcc *r = h.safebind();
+        auto r = rpcc::bind_cached(i);

         if (!r)
             continue;
         bool accept = false;
         if (!r)
             continue;
         bool accept = false;

@@ -135,8 +135,7 @@ void proposer_acceptor::accept(unsigned instance, nodes_t & accepts,
 
 void proposer_acceptor::decide(unsigned instance, const nodes_t & accepts, const value_t & v) {
     for (auto i : accepts) {
 
 void proposer_acceptor::decide(unsigned instance, const nodes_t & accepts, const value_t & v) {
     for (auto i : accepts) {

-        handle h(i);
-        rpcc *r = h.safebind();
+        auto r = rpcc::bind_cached(i);

         if (!r)
             continue;
         int res = 0;
         if (!r)
             continue;
         int res = 0;

@@ -146,26 +145,26 @@ void proposer_acceptor::decide(unsigned instance, const nodes_t & accepts, const
 
 paxos_protocol::status
 proposer_acceptor::preparereq(prepareres & r, const node_t &, unsigned instance, prop_t n) {
 
 paxos_protocol::status
 proposer_acceptor::preparereq(prepareres & r, const node_t &, unsigned instance, prop_t n) {

-    LOG("instance " << instance << " proposal (" << n.n << ", " << n.m << ")");
+    LOG << "instance " << instance << " proposal (" << n.n << ", " << n.m << ")";

     lock ml(acceptor_mutex);
     r.oldinstance = false;
     r.accept = false;
     r.n_a = accepted;
     r.v_a = accepted_value;
     if (instance <= instance_h) {
     lock ml(acceptor_mutex);
     r.oldinstance = false;
     r.accept = false;
     r.n_a = accepted;
     r.v_a = accepted_value;
     if (instance <= instance_h) {

-        LOG("old instance " << instance << " has value " << values[instance]);
+        LOG << "old instance " << instance << " has value " << values[instance];

         r.oldinstance = true;
         r.v_a = values[instance];
     } else if (n > promise) {
         r.oldinstance = true;
         r.v_a = values[instance];
     } else if (n > promise) {

-        LOG("looks good to me");
+        LOG << "looks good to me";

         promise = n;
         l.logprop(promise);
         r.accept = true;
     } else {
         promise = n;
         l.logprop(promise);
         r.accept = true;
     } else {

-        LOG("I totally rejected this request.  Ha.");
+        LOG << "I totally rejected this request.  Ha.";

     }
     }

-    LOG("preparereq is responding with oldinstance=" << r.oldinstance << " accept=" << r.accept << " n_a=(" << r.n_a.n << ", " << r.n_a.m << ") " <<
-        "v_a=\"" << r.v_a << "\"");
+    LOG << "preparereq is responding with oldinstance=" << r.oldinstance << " accept=" << r.accept << " n_a=(" << r.n_a.n << ", " << r.n_a.m << ") "
+        << "v_a=\"" << r.v_a << "\"";

     return paxos_protocol::OK;
 }
 
     return paxos_protocol::OK;
 }
 

@@ -189,7 +188,7 @@ proposer_acceptor::acceptreq(bool & r, const node_t &, unsigned instance, prop_t
 paxos_protocol::status
 proposer_acceptor::decidereq(int &, const node_t &, unsigned instance, const value_t & v) {
     lock ml(acceptor_mutex);
 paxos_protocol::status
 proposer_acceptor::decidereq(int &, const node_t &, unsigned instance, const value_t & v) {
     lock ml(acceptor_mutex);

-    LOG("decidereq for accepted instance " << instance << " (my instance " << instance_h << ") v=" << accepted_value);
+    LOG << "decidereq for accepted instance " << instance << " (my instance " << instance_h << ") v=" << accepted_value;

     if (instance == instance_h + 1) {
         VERIFY(accepted_value == v);
         commit(instance, accepted_value, ml);
     if (instance == instance_h + 1) {
         VERIFY(accepted_value == v);
         commit(instance, accepted_value, ml);

@@ -208,9 +207,9 @@ void proposer_acceptor::commit(unsigned instance, const value_t & value) {
 }
 
 void proposer_acceptor::commit(unsigned instance, const value_t & value, lock & pxs_mutex_lock) {
 }
 
 void proposer_acceptor::commit(unsigned instance, const value_t & value, lock & pxs_mutex_lock) {

-    LOG("instance=" << instance << " has v=" << value);
+    LOG << "instance=" << instance << " has v=" << value;

     if (instance > instance_h) {
     if (instance > instance_h) {

-        LOG("highestacceptedinstance = " << instance);
+        LOG << "highestacceptedinstance = " << instance;

         values[instance] = value;
         l.loginstance(instance, value);
         instance_h = instance;
         values[instance] = value;
         l.loginstance(instance, value);
         instance_h = instance;

@@ -228,24 +227,24 @@ void proposer_acceptor::commit(unsigned instance, const value_t & value, lock &
 // For testing purposes
 void proposer_acceptor::breakpoint1() {
     if (break1) {
 // For testing purposes
 void proposer_acceptor::breakpoint1() {
     if (break1) {

-        LOG("Dying at breakpoint 1!");
+        LOG << "Dying at breakpoint 1!";

         exit(1);
     }
 }
 
 void proposer_acceptor::breakpoint2() {
     if (break2) {
         exit(1);
     }
 }
 
 void proposer_acceptor::breakpoint2() {
     if (break2) {

-        LOG("Dying at breakpoint 2!");
+        LOG << "Dying at breakpoint 2!";

         exit(1);
     }
 }
 
 void proposer_acceptor::breakpoint(int b) {
     if (b == 3) {
         exit(1);
     }
 }
 
 void proposer_acceptor::breakpoint(int b) {
     if (b == 3) {

-        LOG("breakpoint 1");
+        LOG << "breakpoint 1";

         break1 = true;
     } else if (b == 4) {
         break1 = true;
     } else if (b == 4) {

-        LOG("breakpoint 2");
+        LOG << "breakpoint 2";

         break2 = true;
     }
 }
         break2 = true;
     }
 }