X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/dfe8486473094c0769fd1922329c3f0dfd8f43c0..2546a41ad36fdc9ef6471cb35a1d56930ae1b527:/lock_smain.cc

diff --git a/lock_smain.cc b/lock_smain.cc
index 69cc433..d62a25b 100644
--- a/lock_smain.cc
+++ b/lock_smain.cc
@@ -1,23 +1,20 @@
 #include "rpc/rpc.h"
 #include <arpa/inet.h>
 #include <stdlib.h>
-#include <stdio.h>
+#include "threaded_log.h"
 #include <unistd.h>
-#include "lock_server_cache_rsm.h"
-#include "paxos.h"
+#include "lock_server.h"
 #include "rsm.h"
 
 // Main loop of lock_server
 
-char tprintf_thread_prefix = 's';
+char log_thread_prefix = 's';
 
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
     setvbuf(stdout, NULL, _IONBF, 0);
     setvbuf(stderr, NULL, _IONBF, 0);
 
-    srandom(getpid());
+    srandom((uint32_t)getpid());
 
     if(argc != 3){
         fprintf(stderr, "Usage: %s [master:]port [me:]port\n", argv[0]);
@@ -25,11 +22,12 @@ main(int argc, char *argv[])
     }
 
     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);