Global destructor clean-ups and python test fixes

[invirt/third/libt4.git] / lock_client.cc

diff --git a/lock_client.cc b/lock_client.cc
index 7a44940..009e051 100644 (file)
--- a/lock_client.cc
+++ b/lock_client.cc
@@ -4,7 +4,7 @@
 #include <arpa/inet.h>
 
 void lock_state::wait(lock & mutex_lock) {
-    auto self = this_thread::get_id();
+    auto self = std::this_thread::get_id();
     c[self].wait(mutex_lock);
     c.erase(self);
 }
@@ -20,8 +20,6 @@ void lock_state::signal(thread::id who) {
         c[who].notify_one();
 }
 
-typedef map<lock_protocol::lockid_t, lock_state> lock_map;
-
 in_port_t lock_client::last_port = 0;
 
 lock_state & lock_client::get_lock_state(lock_protocol::lockid_t lid) {
@@ -36,7 +34,7 @@ lock_client::lock_client(string xdst, lock_release_user *_lu) : lu(_lu), next_xi
 
     srandom((uint32_t)time(NULL)^last_port);
     rlock_port = ((random()%32000) | (0x1 << 10));
-    id = "127.0.0.1:" + to_string(rlock_port);
+    id = "127.0.0.1:" + std::to_string(rlock_port);
     last_port = rlock_port;
     rlsrpc = unique_ptr<rpcs>(new rpcs(rlock_port));
     rlsrpc->reg(rlock_protocol::revoke, &lock_client::revoke_handler, this);
@@ -46,10 +44,22 @@ lock_client::lock_client(string xdst, lock_release_user *_lu) : lu(_lu), next_xi
     rlsrpc->start();
 }
 
+lock_client::~lock_client() {
+    release_fifo.enq(nothing<lock_protocol::lockid_t>());
+    releaser_thread.join();
+}
+
 void lock_client::releaser() {
     while (1) {
-        lock_protocol::lockid_t lid;
-        release_fifo.deq(&lid);
+        maybe<lock_protocol::lockid_t> mlid;
+        release_fifo.deq(&mlid);
+
+        if (!mlid) {
+            LOG << "Releaser stopping";
+            break;
+        }
+
+        lock_protocol::lockid_t lid = mlid;
         LOG << "Releaser: " << lid;
 
         lock_state & st = get_lock_state(lid);
@@ -81,7 +91,7 @@ int lock_client::stat(lock_protocol::lockid_t lid) {
 lock_protocol::status lock_client::acquire(lock_protocol::lockid_t lid) {
     lock_state & st = get_lock_state(lid);
     lock sl(st.m);
-    auto self = this_thread::get_id();
+    auto self = std::this_thread::get_id();
 
     // check for reentrancy
     VERIFY(st.state != lock_state::locked || st.held_by != self);
@@ -124,7 +134,7 @@ lock_protocol::status lock_client::acquire(lock_protocol::lockid_t lid) {
                 st.state = lock_state::locked;
                 st.held_by = releaser_thread.get_id();
                 LOG << "Queuing " << lid << " for release";
-                release_fifo.enq(lid);
+                release_fifo.enq(just(lid));
             } else if (front == self) {
                 st.wanted_by.pop_front();
                 st.state = lock_state::locked;
@@ -147,7 +157,7 @@ lock_protocol::status lock_client::acquire(lock_protocol::lockid_t lid) {
 lock_protocol::status lock_client::release(lock_protocol::lockid_t lid) {
     lock_state & st = get_lock_state(lid);
     lock sl(st.m);
-    auto self = this_thread::get_id();
+    auto self = std::this_thread::get_id();
     VERIFY(st.state == lock_state::locked && st.held_by == self);
     st.state = lock_state::free;
     LOG << "Lock " << lid << ": free";
@@ -158,7 +168,7 @@ lock_protocol::status lock_client::release(lock_protocol::lockid_t lid) {
             st.held_by = releaser_thread.get_id();
             st.wanted_by.pop_front();
             LOG << "Queuing " << lid << " for release";
-            release_fifo.enq(lid);
+            release_fifo.enq(just(lid));
         } else
             st.signal(front);
     }
@@ -181,7 +191,7 @@ rlock_protocol::status lock_client::revoke_handler(int &, lock_protocol::lockid_
         st.held_by = releaser_thread.get_id();
         if (st.wanted_by.size())
             st.wanted_by.pop_front();
-        release_fifo.enq(lid);
+        release_fifo.enq(just(lid));
     } else {
         // get in line
         st.wanted_by.push_back(releaser_thread.get_id());