Rolled handle infrastructure into rpcc.

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

diff --git a/lock_smain.cc b/lock_smain.cc
index 0a3c209..c6f3356 100644 (file)
--- a/lock_smain.cc
+++ b/lock_smain.cc
@@ -4,26 +4,20 @@
 
 // Main loop of lock_server
 
-char log_thread_prefix = 's';
-
 int main(int argc, char *argv[]) {
+    global = new t4_state('s');
     setvbuf(stdout, NULL, _IONBF, 0);
     setvbuf(stderr, NULL, _IONBF, 0);
 
     srandom((uint32_t)getpid());
 
     if(argc != 3){
-        LOG_NONMEMBER("Usage: " << argv[0] << " [master:]port [me:]port");
+        LOG_NONMEMBER << "Usage: " << argv[0] << " [master:]port [me:]port";
         exit(1);
     }
 
     rsm rsm(argv[1], argv[2]);
-    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);
+    lock_server ls(rsm);
 
     rsm.start();