Fixed a race condition!

[invirt/third/libt4.git] / rsm.h

diff --git a/rsm.h b/rsm.h
index f2eb5bd..8fdf2d5 100644 (file)
--- a/rsm.h
+++ b/rsm.h
@@ -12,7 +12,7 @@
 class rsm_state_transfer {
     public:
         virtual string marshal_state() = 0;
-        virtual void unmarshal_state(string) = 0;
+        virtual void unmarshal_state(const string &) = 0;
         virtual ~rsm_state_transfer() {}
 };
 
@@ -21,13 +21,13 @@ class rsm : public config_view_change {
         void reg1(int proc, handler *);
     protected:
         map<int, handler *> procs;
-        config *cfg;
-        class rsm_state_transfer *stf;
+        unique_ptr<config> cfg;
+        rsm_state_transfer *stf = nullptr;
         rpcs *rsmrpc;
         // On slave: expected viewstamp of next invoke request
         // On primary: viewstamp for the next request from rsm_client
-        viewstamp myvs;
-        viewstamp last_myvs;   // Viewstamp of the last executed request
+        viewstamp last_myvs{0, 0};   // Viewstamp of the last executed request
+        viewstamp myvs{0, 1};
         string primary;
         bool insync;
         bool inviewchange;
@@ -36,32 +36,30 @@ class rsm : public config_view_change {
         vector<string> backups;   // A list of unsynchronized backups
 
         // For testing purposes
-        rpcs *testsvr;
+        unique_ptr<rpcs> testsvr;
         bool partitioned;
         bool dopartition;
         bool break1;
         bool break2;
 
         rsm_client_protocol::status client_members(vector<string> &r, int i);
-        rsm_protocol::status invoke(int &, int proc, viewstamp vs, string mreq);
-        rsm_protocol::status transferreq(rsm_protocol::transferres &r, string src,
+        rsm_protocol::status invoke(int &, int proc, viewstamp vs, const string & mreq);
+        rsm_protocol::status transferreq(rsm_protocol::transferres &r, const string & src,
                 viewstamp last, unsigned vid);
-        rsm_protocol::status transferdonereq(int &, string m, unsigned vid);
-        rsm_protocol::status joinreq(string & log, string src,
-                viewstamp last);
+        rsm_protocol::status transferdonereq(int &, const string & m, unsigned vid);
+        rsm_protocol::status joinreq(string & log, const string & src, viewstamp last);
         rsm_test_protocol::status test_net_repairreq(rsm_test_protocol::status &r, int heal);
         rsm_test_protocol::status breakpointreq(rsm_test_protocol::status &r, int b);
 
         mutex rsm_mutex, invoke_mutex;
         cond recovery_cond, sync_cond;
 
-        void execute(int procno, string req, string &r);
-        rsm_client_protocol::status client_invoke(string &r, int procno, string req);
-        bool statetransfer(string m, lock & rsm_mutex_lock);
-        bool statetransferdone(string m, lock & rsm_mutex_lock);
-        bool join(string m, lock & rsm_mutex_lock);
+        void execute(int procno, const string & req, string & r);
+        rsm_client_protocol::status client_invoke(string & r, int procno, const string & req);
+        bool statetransfer(const string & m, lock & rsm_mutex_lock);
+        bool statetransferdone(const string & m, lock & rsm_mutex_lock);
+        bool join(const string & m, lock & rsm_mutex_lock);
         void set_primary(unsigned vid);
-        string find_highest(viewstamp &vs, string &m, unsigned &vid);
         bool sync_with_backups(lock & rsm_mutex_lock);
         bool sync_with_primary(lock & rsm_mutex_lock);
         void net_repair(bool heal, lock & rsm_mutex_lock);
@@ -70,8 +68,7 @@ class rsm : public config_view_change {
         void partition1(lock & rsm_mutex_lock);
         void commit_change(unsigned vid, lock & rsm_mutex_lock);
     public:
-        rsm (string _first, string _me);
-        ~rsm() {}
+        rsm (const string & _first, const string & _me);
 
         bool amiprimary();
         void set_state_transfer(rsm_state_transfer *_stf) { stf = _stf; }
@@ -79,6 +76,8 @@ class rsm : public config_view_change {
         void commit_change(unsigned vid);
 
         template<class F, class C=void> void reg(int proc, F f, C *c=nullptr);
+
+        void start();
 };
 
 template<class F, class C> void rsm::reg(int proc, F f, C *c) {