More clean-ups and cool template stuff

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

diff --git a/lock_smain.cc b/lock_smain.cc
index 086186e..d62a25b 100644 (file)
--- a/lock_smain.cc
+++ b/lock_smain.cc
@@ -1,23 +1,20 @@
 #include "rpc/rpc.h"
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include "rpc/rpc.h"
 #include <arpa/inet.h>
 #include <stdlib.h>

-#include <stdio.h>
+#include "threaded_log.h"

 #include <unistd.h>
 #include "lock_server.h"
 #include <unistd.h>
 #include "lock_server.h"

-#include "paxos.h"

 #include "rsm.h"
 
 // Main loop of lock_server
 
 #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);
 
     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]);
 
     if(argc != 3){
         fprintf(stderr, "Usage: %s [master:]port [me:]port\n", argv[0]);