Clean-ups to logging and type signatures

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

diff --git a/paxos.cc b/paxos.cc
index f9d5785..85507d5 100644 (file)
--- a/paxos.cc
+++ b/paxos.cc
@@ -20,7 +20,7 @@ bool majority(const nodes_t &l1, const nodes_t &l2) {
 // paxos_commit to inform higher layers of the agreed value for this
 // instance.
 
 // paxos_commit to inform higher layers of the agreed value for this
 // instance.
 

-proposer_acceptor::proposer_acceptor(class paxos_change *_delegate,
+proposer_acceptor::proposer_acceptor(paxos_change *_delegate,

         bool _first, const node_t & _me, const value_t & _value)
     : delegate(_delegate), me (_me)
 {
         bool _first, const node_t & _me, const value_t & _value)
     : delegate(_delegate), me (_me)
 {

@@ -46,14 +46,17 @@ bool proposer_acceptor::run(unsigned instance, const nodes_t & cur_nodes, const
     }
     stable = false;
     bool r = false;
     }
     stable = false;
     bool r = false;

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

     nodes_t accepts;
     nodes_t accepts;

-    value_t v = newv;
+    value_t v;

     if (prepare(instance, accepts, cur_nodes, v)) {
 
         if (majority(cur_nodes, accepts)) {
             LOG("received a majority of prepare responses");
 
     if (prepare(instance, accepts, cur_nodes, v)) {
 
         if (majority(cur_nodes, accepts)) {
             LOG("received a majority of prepare responses");
 

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

             breakpoint1();
 
             nodes_t nodes;
             breakpoint1();
 
             nodes_t nodes;

@@ -203,17 +206,18 @@ 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("acceptor::commit: instance=" << instance << " has v=" << value);
+    LOG("instance=" << instance << " has v=" << value);

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

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

         values[instance] = value;
         l.loginstance(instance, value);
         instance_h = instance;
         accepted = promise = {0, me};
         values[instance] = value;
         l.loginstance(instance, value);
         instance_h = instance;
         accepted = promise = {0, me};

-        accepted_value.clear();
+        string v = value; // gaaahhh aliasing of value and accepted_value
+        accepted_value.clear(); // this wipes out "value", too

         if (delegate) {
             pxs_mutex_lock.unlock();
         if (delegate) {
             pxs_mutex_lock.unlock();

-            delegate->paxos_commit(instance, value);
+            delegate->paxos_commit(instance, v);

             pxs_mutex_lock.lock();
         }
     }
             pxs_mutex_lock.lock();
         }
     }