Clean-ups

[invirt/third/libt4.git] / lock_server.h

diff --git a/lock_server.h b/lock_server.h
index 1f30f87..88b9e11 100644 (file)
--- a/lock_server.h
+++ b/lock_server.h
@@ -6,7 +6,7 @@
 #include "rsm.h"
 #include "rpc/fifo.h"
 
 #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:
 
 class lock_state {
 public:

@@ -14,22 +14,20 @@ public:
     lock_state(const lock_state & other);
     bool held;
     holder_t held_by;
     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)
 };
 
     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;
 
 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;
         lock_map lock_table;
         lock_state & get_lock_state(lock_protocol::lockid_t lid);
         fifo<lock_protocol::lockid_t> retry_fifo;