X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/4a160f880ce46153acb23b137f30fd588df5fb9d..6b5e09540e9392a7015fae1ad3b01b0973600ff2:/lock_server.h

diff --git a/lock_server.h b/lock_server.h
index 69ac2b8..6ba4902 100644
--- a/lock_server.h
+++ b/lock_server.h
@@ -6,7 +6,6 @@
 #include "rsm.h"
 #include "rpc/fifo.h"
 
-typedef string callback_t;
 typedef pair<callback_t, lock_protocol::xid_t> holder_t;
 
 class lock_state {
@@ -38,13 +37,13 @@ class lock_server : public rsm_state_transfer {
         rsm *rsm_;
     public:
         lock_server(rsm *r = 0);
-        lock_protocol::status stat(int &, lock_protocol::lockid_t);
         void revoker();
         void retryer();
         string marshal_state();
         void unmarshal_state(const string & state);
-        int acquire(int &, lock_protocol::lockid_t, const callback_t & id, lock_protocol::xid_t);
-        int release(int &, lock_protocol::lockid_t, const callback_t & id, lock_protocol::xid_t);
+        lock_protocol::status acquire(int &, lock_protocol::lockid_t, const callback_t & id, lock_protocol::xid_t);
+        lock_protocol::status release(int &, lock_protocol::lockid_t, const callback_t & id, lock_protocol::xid_t);
+        lock_protocol::status stat(int &, lock_protocol::lockid_t, const callback_t & id);
 };
 
 #endif