X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/dfe8486473094c0769fd1922329c3f0dfd8f43c0..5987a5357ccfd818d540a7aa58eb498a1be07aa1:/lock_smain.cc?ds=inline diff --git a/lock_smain.cc b/lock_smain.cc index 69cc433..086186e 100644 --- a/lock_smain.cc +++ b/lock_smain.cc @@ -3,7 +3,7 @@ #include #include #include -#include "lock_server_cache_rsm.h" +#include "lock_server.h" #include "paxos.h" #include "rsm.h" @@ -25,11 +25,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);