More renaming

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

diff --git a/lock_smain.cc b/lock_smain.cc
index c256cbe..086186e 100644 (file)
--- a/lock_smain.cc
+++ b/lock_smain.cc
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
-#include "lock_server_cache_rsm.h"
+#include "lock_server.h"
 #include "paxos.h"
 #include "rsm.h"
 
@@ -14,8 +14,6 @@ char tprintf_thread_prefix = 's';
 int
 main(int argc, char *argv[])
 {
-    int count = 0;
-
     setvbuf(stdout, NULL, _IONBF, 0);
     setvbuf(stderr, NULL, _IONBF, 0);
 
@@ -26,17 +24,13 @@ main(int argc, char *argv[])
         exit(1);
     }
 
-    char *count_env = getenv("RPC_COUNT");
-    if(count_env != NULL){
-        count = atoi(count_env);
-    }
-
     rsm rsm(argv[1], argv[2]);
-    lock_server_cache_rsm ls(&rsm);
-    rsm.set_state_transfer((rsm_state_transfer *)&ls);
-    rsm.reg(lock_protocol::acquire, &ls, &lock_server_cache_rsm::acquire);
-    rsm.reg(lock_protocol::release, &ls, &lock_server_cache_rsm::release);
-    rsm.reg(lock_protocol::stat, &ls, &lock_server_cache_rsm::stat);
+    lock_server ls(&rsm);
+    rsm.set_state_transfer(&ls);
+
+    rsm.reg(lock_protocol::acquire, &lock_server::acquire, &ls);
+    rsm.reg(lock_protocol::release, &lock_server::release, &ls);
+    rsm.reg(lock_protocol::stat, &lock_server::stat, &ls);
 
     while(1)
         sleep(1000);