Partially fixed a bug in the test suite that led to test runs randomly failing.

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

diff --git a/log.cc b/log.cc
index 627b7ac..3b881fa 100644 (file)
--- a/log.cc
+++ b/log.cc
@@ -1,28 +1,25 @@
+#include "log.h"

 #include "paxos.h"
 #include "paxos.h"

-#include <fstream>
-#include <iostream>
-#include "threaded_log.h"

 
 // Paxos must maintain some durable state (i.e., that survives power
 // failures) to run Paxos correct.  This module implements a log with
 // all durable state to run Paxos.  Since the values chosen correspond
 // to views, the log contains all views since the beginning of time.
 
 
 // Paxos must maintain some durable state (i.e., that survives power
 // failures) to run Paxos correct.  This module implements a log with
 // all durable state to run Paxos.  Since the values chosen correspond
 // to views, the log contains all views since the beginning of time.
 

-log::log(acceptor *_acc, std::string _me) : pxs (_acc) {
+log::log(proposer_acceptor *_acc, string _me) : pxs (_acc) {

     name = "paxos-" + _me + ".log";
     logread();
 }
 
 void log::logread(void) {
     name = "paxos-" + _me + ".log";
     logread();
 }
 
 void log::logread(void) {

-    std::ifstream from;
-    std::string type;
+    ifstream from(name);
+    string type;

     unsigned instance;
 
     unsigned instance;
 

-    from.open(name.c_str());

     LOG("logread");
     while (from >> type) {
         if (type == "done") {
     LOG("logread");
     while (from >> type) {
         if (type == "done") {

-            std::string v;
+            string v;

             from >> instance;
             from.get();
             getline(from, v);
             from >> instance;
             from.get();
             getline(from, v);

@@ -30,21 +27,19 @@ void log::logread(void) {
             pxs->instance_h = instance;
             LOG("logread: instance: " << instance << " w. v = " <<
                     pxs->values[instance]);
             pxs->instance_h = instance;
             LOG("logread: instance: " << instance << " w. v = " <<
                     pxs->values[instance]);

-            pxs->v_a.clear();
-            pxs->n_h.n = 0;
-            pxs->n_a.n = 0;
+            pxs->accepted_value.clear();
+            pxs->promise.n = 0;
+            pxs->accepted.n = 0;

         } else if (type == "propseen") {
         } else if (type == "propseen") {

-            from >> pxs->n_h.n;
-            from >> pxs->n_h.m;
-            LOG("logread: high update: " << pxs->n_h.n << "(" << pxs->n_h.m << ")");
+            from >> pxs->promise.n >> pxs->promise.m;
+            LOG("logread: high update: " << pxs->promise.n << "(" << pxs->promise.m << ")");

         } else if (type == "accepted") {
         } else if (type == "accepted") {

-            std::string v;
-            from >> pxs->n_a.n;
-            from >> pxs->n_a.m;
+            string v;
+            from >> pxs->accepted.n >> pxs->accepted.m;

             from.get();
             getline(from, v);
             from.get();
             getline(from, v);

-            pxs->v_a = v;
-            LOG("logread: prop update " << pxs->n_a.n << "(" << pxs->n_a.m << ") with v = " << pxs->v_a);
+            pxs->accepted_value = v;
+            LOG("logread: prop update " << pxs->accepted.n << "(" << pxs->accepted.m << ") with v = " << pxs->accepted_value);

         } else {
             LOG("logread: unknown log record");
             VERIFY(0);
         } else {
             LOG("logread: unknown log record");
             VERIFY(0);

@@ -53,50 +48,42 @@ void log::logread(void) {
     from.close();
 }
 
     from.close();
 }
 

-std::string log::dump() {
-    std::ifstream from;
-    std::string res;
-    std::string v;
-    from.open(name.c_str());
+string log::dump() {
+    ifstream from(name);
+    string res;
+    string v;

     while (getline(from, v))
         res += v + "\n";
     from.close();
     return res;
 }
 
     while (getline(from, v))
         res += v + "\n";
     from.close();
     return res;
 }
 

-void log::restore(std::string s) {
-    std::ofstream f;
+void log::restore(string s) {

     LOG("restore: " << s);
     LOG("restore: " << s);

-    f.open(name.c_str(), std::ios::trunc);
+    ofstream f(name, ios::trunc);

     f << s;
     f.close();
 }
 
 // XXX should be an atomic operation
     f << s;
     f.close();
 }
 
 // XXX should be an atomic operation

-void log::loginstance(unsigned instance, std::string v) {
-    std::ofstream f(name, std::ios::app);
+void log::loginstance(unsigned instance, string v) {
+    ofstream f(name, ios::app);

     f << "done " << instance << " " << v << "\n";
     f.close();
 }
 
     f << "done " << instance << " " << v << "\n";
     f.close();
 }
 

-// an acceptor should call logprop(n_h) when it
+// an acceptor should call logprop(promise) when it

 // receives a prepare to which it responds prepare_ok().
 // receives a prepare to which it responds prepare_ok().

-void log::logprop(prop_t n_h) {
-    std::ofstream f;
-    f.open(name.c_str(), std::ios::app);
-    f << "propseen";
-    f << " ";
-    f << n_h.n;
-    f << " ";
-    f << n_h.m;
-    f << "\n";
+void log::logprop(prop_t promise) {
+    ofstream f(name, ios::app);
+    f << "propseen " << promise.n << " " << promise.m << "\n";

     f.close();
 }
 
     f.close();
 }
 

-// an acceptor should call logaccept(n_a, v_a) when it
+// an acceptor should call logaccept(accepted, accepted_value) when it

 // receives an accept RPC to which it replies accept_ok().
 // receives an accept RPC to which it replies accept_ok().

-void log::logaccept(prop_t n, std::string v) {
-    std::ofstream f(name, std::ios::app);
+void log::logaccept(prop_t n, string v) {
+    ofstream f(name, ios::app);

     f << "accepted " << n.n << " " << n.m << " " << v << "\n";
     f.close();
 }
     f << "accepted " << n.n << " " << n.m << " " << v << "\n";
     f.close();
 }