Cosmetic improvements.

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

diff --git a/lock_client.cc b/lock_client.cc
index 22e57f1..beca1cc 100644 (file)
--- a/lock_client.cc
+++ b/lock_client.cc
@@ -1,16 +1,10 @@
 // RPC stubs for clients to talk to lock_server, and cache the locks.
 
 #include "lock_client.h"
-#include "rpc/rpc.h"
-#include <algorithm>
-#include "threaded_log.h"
 #include <arpa/inet.h>
 
-#include "rsm_client.h"
-#include "lock.h"
-
 void lock_state::wait(lock & mutex_lock) {
-    auto self = std::this_thread::get_id();
+    auto self = this_thread::get_id();
     c[self].wait(mutex_lock);
     c.erase(self);
 }
@@ -28,36 +22,37 @@ void lock_state::signal(thread::id who) {
 
 typedef map<lock_protocol::lockid_t, lock_state> lock_map;
 
-unsigned int lock_client::last_port = 0;
+in_port_t lock_client::last_port = 0;
 
 lock_state & lock_client::get_lock_state(lock_protocol::lockid_t lid) {
     lock sl(lock_table_lock);
     return lock_table[lid]; // creates the lock if it doesn't already exist
 }
 
-lock_client::lock_client(string xdst, class lock_release_user *_lu) : lu(_lu), next_xid(0) {
-    cl = new rpcc(xdst);
+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");
 
     srandom((uint32_t)time(NULL)^last_port);
     rlock_port = ((random()%32000) | (0x1 << 10));
-    id = "127.0.0.1:" + std::to_string(rlock_port);
+    id = "127.0.0.1:" + to_string(rlock_port);
     last_port = rlock_port;
-    rpcs *rlsrpc = new rpcs(rlock_port);
+    rlsrpc = unique_ptr<rpcs>(new rpcs(rlock_port));
     rlsrpc->reg(rlock_protocol::revoke, &lock_client::revoke_handler, this);
     rlsrpc->reg(rlock_protocol::retry, &lock_client::retry_handler, this);
-    rsmc = new rsm_client(xdst);
+    rsmc = unique_ptr<rsm_client>(new rsm_client(xdst));
     releaser_thread = thread(&lock_client::releaser, this);
+    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);
 
-        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;
@@ -78,15 +73,15 @@ void lock_client::releaser() [[noreturn]] {
 int lock_client::stat(lock_protocol::lockid_t lid) {
     VERIFY(0);
     int r;
-    auto ret = (lock_protocol::status)cl->call(lock_protocol::stat, r, cl->id(), lid);
+    auto ret = (lock_protocol::status)cl->call(lock_protocol::stat, r, lid, id);
     VERIFY (ret == lock_protocol::OK);
     return r;
 }
 
 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 = std::this_thread::get_id();
+    auto self = this_thread::get_id();
 
     // check for reentrancy
     VERIFY(st.state != lock_state::locked || st.held_by != self);
@@ -149,9 +144,9 @@ 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_state & st = get_lock_state(lid);
     lock sl(st.m);
-    auto self = std::this_thread::get_id();
+    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");
@@ -172,7 +167,7 @@ lock_protocol::status lock_client::release(lock_protocol::lockid_t lid) {
 
 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);
+    lock_state & st = get_lock_state(lid);
     lock sl(st.m);
 
     if (st.state == lock_state::releasing || st.state == lock_state::none)
@@ -194,7 +189,7 @@ 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;