X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/03b35a9a1bd1f583e32b27d260b223a0989d6c75..06282fd37814c4a9d53bca089b048709b368f5b3:/lock_client.h diff --git a/lock_client.h b/lock_client.h index 5cdb26e..74f17a8 100644 --- a/lock_client.h +++ b/lock_client.h @@ -9,6 +9,7 @@ #include "lock_protocol.h" #include "rpc/fifo.h" #include "rsm_client.h" +#include "maybe.h" class lock_release_user { public: @@ -52,18 +53,18 @@ class lock_client { string id; std::mutex xid_mutex; lock_protocol::xid_t next_xid; - fifo release_fifo; + fifo> release_fifo; std::mutex lock_table_lock; lock_map lock_table; lock_state & get_lock_state(lock_protocol::lockid_t lid); public: static in_port_t last_port; lock_client(string xdst, lock_release_user *l = 0); - ~lock_client() {} + ~lock_client(); lock_protocol::status acquire(lock_protocol::lockid_t); lock_protocol::status release(lock_protocol::lockid_t); int stat(lock_protocol::lockid_t); - void releaser NORETURN (); + void releaser(); rlock_protocol::status revoke_handler(int &, lock_protocol::lockid_t, lock_protocol::xid_t); rlock_protocol::status retry_handler(int &, lock_protocol::lockid_t, lock_protocol::xid_t); };