#include "rsm.h"
#include "rpc/fifo.h"
-typedef pair<callback_t, lock_protocol::xid_t> holder_t;
+typedef std::pair<callback_t, lock_protocol::xid_t> holder_t;
class lock_state {
public:
lock_state(const lock_state & other);
bool held;
holder_t held_by;
- list<holder_t> wanted_by;
- map<callback_t, lock_protocol::xid_t> old_requests;
- mutex m;
+ std::list<holder_t> wanted_by;
+ std::map<callback_t, lock_protocol::xid_t> old_requests;
+ std::mutex m;
lock_state & operator=(const lock_state &);
MEMBERS(held, held_by, wanted_by)
};
-MARSHALLABLE_STRUCT(lock_state)
-
-typedef map<lock_protocol::lockid_t, lock_state> lock_map;
+typedef std::map<lock_protocol::lockid_t, lock_state> 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<lock_protocol::lockid_t> retry_fifo;