Simplifications and clean-ups

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

diff --git a/lock_client.cc b/lock_client.cc
index 8864ce9..7a44940 100644 (file)
--- a/lock_client.cc
+++ b/lock_client.cc
@@ -32,7 +32,7 @@ lock_state & lock_client::get_lock_state(lock_protocol::lockid_t lid) {
 lock_client::lock_client(string xdst, lock_release_user *_lu) : lu(_lu), next_xid(0) {
     cl = unique_ptr<rpcc>(new rpcc(xdst));
     if (cl->bind() < 0)
-        LOG("lock_client: call bind");
+        LOG << "lock_client: call bind";
 
     srandom((uint32_t)time(NULL)^last_port);
     rlock_port = ((random()%32000) | (0x1 << 10));
@@ -46,13 +46,13 @@ lock_client::lock_client(string xdst, lock_release_user *_lu) : lu(_lu), next_xi
     rlsrpc->start();
 }
 
-void lock_client::releaser() [[noreturn]] {
+void lock_client::releaser() {
     while (1) {
         lock_protocol::lockid_t lid;
         release_fifo.deq(&lid);
-        LOG("Releaser: " << lid);
+        LOG << "Releaser: " << lid;
 
-        lock_state &st = get_lock_state(lid);
+        lock_state & st = get_lock_state(lid);
         lock sl(st.m);
         VERIFY(st.state == lock_state::locked && st.held_by == releaser_thread.get_id());
         st.state = lock_state::releasing;
@@ -65,7 +65,7 @@ void lock_client::releaser() [[noreturn]] {
             sl.lock();
         }
         st.state = lock_state::none;
-        LOG("Lock " << lid << ": none");
+        LOG << "Lock " << lid << ": none";
         st.signal();
     }
 }
@@ -79,19 +79,20 @@ 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_state & st = get_lock_state(lid);
     lock sl(st.m);
     auto self = this_thread::get_id();
 
     // check for reentrancy
     VERIFY(st.state != lock_state::locked || st.held_by != self);
-    VERIFY(find(st.wanted_by.begin(), st.wanted_by.end(), self) == st.wanted_by.end());
+    VERIFY(std::find(st.wanted_by.begin(), st.wanted_by.end(), self)
+            == st.wanted_by.end());
 
     st.wanted_by.push_back(self);
 
     while (1) {
         if (st.state != lock_state::free)
-            LOG("Lock " << lid << ": not free");
+            LOG << "Lock " << lid << ": not free";
 
         if (st.state == lock_state::none || st.state == lock_state::retrying) {
             if (st.state == lock_state::none) {
@@ -99,7 +100,7 @@ lock_protocol::status lock_client::acquire(lock_protocol::lockid_t lid) {
                 st.xid = next_xid++;
             }
             st.state = lock_state::acquiring;
-            LOG("Lock " << lid << ": acquiring");
+            LOG << "Lock " << lid << ": acquiring";
             lock_protocol::status result;
             {
                 sl.unlock();
@@ -107,10 +108,10 @@ lock_protocol::status lock_client::acquire(lock_protocol::lockid_t lid) {
                 result = (lock_protocol::status)rsmc->call(lock_protocol::acquire, r, lid, id, st.xid);
                 sl.lock();
             }
-            LOG("acquire returned " << result);
+            LOG << "acquire returned " << result;
             if (result == lock_protocol::OK) {
                 st.state = lock_state::free;
-                LOG("Lock " << lid << ": free");
+                LOG << "Lock " << lid << ": free";
             }
         }
 
@@ -122,7 +123,7 @@ lock_protocol::status lock_client::acquire(lock_protocol::lockid_t lid) {
                 st.wanted_by.pop_front();
                 st.state = lock_state::locked;
                 st.held_by = releaser_thread.get_id();
-                LOG("Queuing " << lid << " for release");
+                LOG << "Queuing " << lid << " for release";
                 release_fifo.enq(lid);
             } else if (front == self) {
                 st.wanted_by.pop_front();
@@ -134,40 +135,40 @@ lock_protocol::status lock_client::acquire(lock_protocol::lockid_t lid) {
             }
         }
 
-        LOG("waiting...");
+        LOG << "waiting...";
         st.wait(sl);
-        LOG("wait ended");
+        LOG << "wait ended";
     }
 
-    LOG("Lock " << lid << ": locked");
+    LOG << "Lock " << lid << ": locked";
     return lock_protocol::OK;
 }
 
 lock_protocol::status lock_client::release(lock_protocol::lockid_t lid) {
-    lock_state &st = get_lock_state(lid);
+    lock_state & st = get_lock_state(lid);
     lock sl(st.m);
     auto self = this_thread::get_id();
     VERIFY(st.state == lock_state::locked && st.held_by == self);
     st.state = lock_state::free;
-    LOG("Lock " << lid << ": free");
+    LOG << "Lock " << lid << ": free";
     if (st.wanted_by.size()) {
         auto front = st.wanted_by.front();
         if (front == releaser_thread.get_id()) {
             st.state = lock_state::locked;
             st.held_by = releaser_thread.get_id();
             st.wanted_by.pop_front();
-            LOG("Queuing " << lid << " for release");
+            LOG << "Queuing " << lid << " for release";
             release_fifo.enq(lid);
         } else
             st.signal(front);
     }
-    LOG("Finished signaling.");
+    LOG << "Finished signaling.";
     return lock_protocol::OK;
 }
 
 rlock_protocol::status lock_client::revoke_handler(int &, lock_protocol::lockid_t lid, lock_protocol::xid_t xid) {
-    LOG("Revoke handler " << lid << " " << xid);
-    lock_state &st = get_lock_state(lid);
+    LOG << "Revoke handler " << lid << " " << xid;
+    lock_state & st = get_lock_state(lid);
     lock sl(st.m);
 
     if (st.state == lock_state::releasing || st.state == lock_state::none)
@@ -189,11 +190,11 @@ rlock_protocol::status lock_client::revoke_handler(int &, lock_protocol::lockid_
 }
 
 rlock_protocol::status lock_client::retry_handler(int &, lock_protocol::lockid_t lid, lock_protocol::xid_t) {
-    lock_state &st = get_lock_state(lid);
+    lock_state & st = get_lock_state(lid);
     lock sl(st.m);
     VERIFY(st.state == lock_state::acquiring);
     st.state = lock_state::retrying;
-    LOG("Lock " << lid << ": none");
+    LOG << "Lock " << lid << ": none";
     st.signal(); // only one thread needs to wake up
     return rlock_protocol::OK;
 }