Clean-ups to types.

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

diff --git a/lock_server.cc b/lock_server.cc
index b724140..81cd805 100644 (file)
--- a/lock_server.cc
+++ b/lock_server.cc
@@ -29,10 +29,10 @@ lock_state & lock_server::get_lock_state(lock_protocol::lockid_t lid) {
     return lock_table[lid];
 }
 
     return lock_table[lid];
 }
 

-lock_server::lock_server(class rsm *_rsm) : rsm (_rsm) {
+lock_server::lock_server(rsm *r) : rsm_ (r) {

     thread(&lock_server::revoker, this).detach();
     thread(&lock_server::retryer, this).detach();
     thread(&lock_server::revoker, this).detach();
     thread(&lock_server::retryer, this).detach();

-    rsm->set_state_transfer(this);
+    rsm_->set_state_transfer(this);

 }
 
 void lock_server::revoker() [[noreturn]] {
 }
 
 void lock_server::revoker() [[noreturn]] {

@@ -40,7 +40,7 @@ void lock_server::revoker() [[noreturn]] {
         lock_protocol::lockid_t lid;
         revoke_fifo.deq(&lid);
         LOG("Revoking " << lid);
         lock_protocol::lockid_t lid;
         revoke_fifo.deq(&lid);
         LOG("Revoking " << lid);

-        if (rsm && !rsm->amiprimary())
+        if (rsm_ && !rsm_->amiprimary())

             continue;
 
         lock_state &st = get_lock_state(lid);
             continue;
 
         lock_state &st = get_lock_state(lid);

@@ -67,7 +67,7 @@ void lock_server::retryer() [[noreturn]] {
     while (1) {
         lock_protocol::lockid_t lid;
         retry_fifo.deq(&lid);
     while (1) {
         lock_protocol::lockid_t lid;
         retry_fifo.deq(&lid);

-        if (rsm && !rsm->amiprimary())
+        if (rsm_ && !rsm_->amiprimary())

             continue;
 
         LOG("Sending retry for " << lid);
             continue;
 
         LOG("Sending retry for " << lid);