Clean-ups to types.

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

diff --git a/rsm.h b/rsm.h
index f2eb5bd..ef919ff 100644 (file)
--- a/rsm.h
+++ b/rsm.h
@@ -22,12 +22,12 @@ class rsm : public config_view_change {
     protected:
         map<int, handler *> procs;
         config *cfg;
     protected:
         map<int, handler *> procs;
         config *cfg;

-        class rsm_state_transfer *stf;
+        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
         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;
         string primary;
         bool insync;
         bool inviewchange;

@@ -61,7 +61,6 @@ class rsm : public config_view_change {
         bool statetransferdone(string m, lock & rsm_mutex_lock);
         bool join(string m, lock & rsm_mutex_lock);
         void set_primary(unsigned vid);
         bool statetransferdone(string m, lock & rsm_mutex_lock);
         bool join(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);
         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);