X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/5987a5357ccfd818d540a7aa58eb498a1be07aa1..5d99dbf06a14904944f5593c63705934bdfdcfb7:/lock_server.h?ds=inline diff --git a/lock_server.h b/lock_server.h index 2aa8445..5c182e0 100644 --- a/lock_server.h +++ b/lock_server.h @@ -1,37 +1,30 @@ #ifndef lock_server_h #define lock_server_h -#include - -#include -#include +#include "types.h" #include "lock_protocol.h" -#include "rpc/rpc.h" -#include "rsm_state_transfer.h" #include "rsm.h" #include "rpc/fifo.h" -#include "lock.h" - -using std::string; -using std::pair; -using std::list; -using std::map; -typedef string callback; -typedef pair holder; +typedef string callback_t; +typedef pair holder_t; class lock_state { public: lock_state(); lock_state(const lock_state &other); bool held; - holder held_by; - list wanted_by; - map old_requests; + holder_t held_by; + list wanted_by; + map old_requests; mutex m; lock_state& operator=(const lock_state&); + + MEMBERS(held, held_by, wanted_by) }; +MARSHALLABLE(lock_state) + typedef map lock_map; class lock_server : public rsm_state_transfer {