X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/f0dcb6b97d6d40f67698d1f71ac26970f1776f82..c279db4240a3a3c30f069ab9dea8055cf94280da:/lock_server.h diff --git a/lock_server.h b/lock_server.h index 1f30f87..88b9e11 100644 --- a/lock_server.h +++ b/lock_server.h @@ -6,7 +6,7 @@ #include "rsm.h" #include "rpc/fifo.h" -typedef pair holder_t; +typedef std::pair holder_t; class lock_state { public: @@ -14,22 +14,20 @@ public: lock_state(const lock_state & other); bool held; holder_t held_by; - list wanted_by; - map old_requests; - mutex m; + std::list wanted_by; + std::map old_requests; + std::mutex m; lock_state & operator=(const lock_state &); MEMBERS(held, held_by, wanted_by) }; -MARSHALLABLE_STRUCT(lock_state) - -typedef map lock_map; +typedef std::map lock_map; class lock_server : private rsm_state_transfer { private: int nacquire; - mutex lock_table_lock; + std::mutex lock_table_lock; lock_map lock_table; lock_state & get_lock_state(lock_protocol::lockid_t lid); fifo retry_fifo;