Cosmetic changes

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

diff --git a/lock_server.cc b/lock_server.cc
index 141a598..86e5ad2 100644 (file)
--- a/lock_server.cc
+++ b/lock_server.cc
@@ -34,13 +34,11 @@ lock_server::lock_server(rsm & r) : rsm_ (&r) {
 
     r.reg(lock_protocol::acquire, &lock_server::acquire, this);
     r.reg(lock_protocol::release, &lock_server::release, this);
 
     r.reg(lock_protocol::acquire, &lock_server::acquire, this);
     r.reg(lock_protocol::release, &lock_server::release, this);

-    r.reg(lock_protocol::stat, &lock_server::stat, this);

 }
 
 void lock_server::revoker () {
     while (1) {
 }
 
 void lock_server::revoker () {
     while (1) {

-        lock_protocol::lockid_t lid;
-        revoke_fifo.deq(&lid);
+        lock_protocol::lockid_t lid = revoke_fifo.deq();

         LOG << "Revoking " << lid;
         if (rsm_ && !rsm_->amiprimary())
             continue;
         LOG << "Revoking " << lid;
         if (rsm_ && !rsm_->amiprimary())
             continue;

@@ -60,8 +58,7 @@ void lock_server::revoker () {
 
 void lock_server::retryer() {
     while (1) {
 
 void lock_server::retryer() {
     while (1) {

-        lock_protocol::lockid_t lid;
-        retry_fifo.deq(&lid);
+        lock_protocol::lockid_t lid = retry_fifo.deq();

         if (rsm_ && !rsm_->amiprimary())
             continue;
 
         if (rsm_ && !rsm_->amiprimary())
             continue;
 

@@ -163,11 +160,3 @@ void lock_server::unmarshal_state(const string & state) {
     lock sl(lock_table_lock);
     unmarshall(state, false, nacquire, lock_table);
 }
     lock sl(lock_table_lock);
     unmarshall(state, false, nacquire, lock_table);
 }

-
-lock_protocol::status lock_server::stat(int & r, lock_protocol::lockid_t lid, const callback_t &) {
-    LOG << "stat request for " << lid;
-    VERIFY(0);
-    r = nacquire;
-    return lock_protocol::OK;
-}
-