Includes cleanups

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

diff --git a/lock_client.cc b/lock_client.cc
index 99dcb5b..388de88 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) {
 #include <arpa/inet.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);
 }
     c[self].wait(mutex_lock);
     c.erase(self);
 }

@@ -22,15 +22,15 @@ void lock_state::signal(thread::id who) {
 
 typedef map<lock_protocol::lockid_t, lock_state> lock_map;
 
 
 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_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");
 
     if (cl->bind() < 0)
         LOG("lock_client: call bind");
 

@@ -38,11 +38,12 @@ lock_client::lock_client(string xdst, class lock_release_user *_lu) : lu(_lu), n
     rlock_port = ((random()%32000) | (0x1 << 10));
     id = "127.0.0.1:" + to_string(rlock_port);
     last_port = rlock_port;
     rlock_port = ((random()%32000) | (0x1 << 10));
     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);
     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);
     releaser_thread = thread(&lock_client::releaser, this);

+    rlsrpc->start();

 }
 
 void lock_client::releaser() [[noreturn]] {
 }
 
 void lock_client::releaser() [[noreturn]] {

@@ -80,7 +81,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);
 lock_protocol::status lock_client::acquire(lock_protocol::lockid_t 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);
 
     // check for reentrancy
     VERIFY(st.state != lock_state::locked || st.held_by != self);

@@ -145,7 +146,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);
 lock_protocol::status lock_client::release(lock_protocol::lockid_t 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");
     VERIFY(st.state == lock_state::locked && st.held_by == self);
     st.state = lock_state::free;
     LOG("Lock " << lid << ": free");