Actually, you know, build.

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

diff --git a/lock_server_cache_rsm.cc b/lock_server_cache_rsm.cc
index 0e43ec5..8f3cf2b 100644 (file)
--- a/lock_server_cache_rsm.cc
+++ b/lock_server_cache_rsm.cc
@@ -81,7 +81,7 @@ void lock_server_cache_rsm::revoker() {
         proxy = handle(held_by.first).safebind();
         if (proxy) {
             int r;
         proxy = handle(held_by.first).safebind();
         if (proxy) {
             int r;

-            rlock_protocol::status ret = proxy->call(rlock_protocol::revoke, lid, held_by.second, r);
+            rlock_protocol::status ret = proxy->call(rlock_protocol::revoke, r, lid, held_by.second);

             LOG("Revoke returned " << ret);
         }
     }
             LOG("Revoke returned " << ret);
         }
     }

@@ -113,13 +113,13 @@ void lock_server_cache_rsm::retryer() {
         proxy = handle(front.first).safebind();
         if (proxy) {
             int r;
         proxy = handle(front.first).safebind();
         if (proxy) {
             int r;

-            ret = proxy->call(rlock_protocol::retry, lid, front.second, r);
+            ret = proxy->call(rlock_protocol::retry, r, lid, front.second);

             LOG("Retry returned " << ret);
         }
     }
 }
 
             LOG("Retry returned " << ret);
         }
     }
 }
 

-int lock_server_cache_rsm::acquire(lock_protocol::lockid_t lid, string id, lock_protocol::xid_t xid, int &) {
+int lock_server_cache_rsm::acquire(int &r, lock_protocol::lockid_t lid, string id, lock_protocol::xid_t xid) {

     LOG_FUNC_ENTER_SERVER;
     holder h = holder(id, xid);
     lock_state &st = get_lock_state(lid);
     LOG_FUNC_ENTER_SERVER;
     holder h = holder(id, xid);
     lock_state &st = get_lock_state(lid);

@@ -177,7 +177,7 @@ int lock_server_cache_rsm::acquire(lock_protocol::lockid_t lid, string id, lock_
     return lock_protocol::RETRY;
 }
 
     return lock_protocol::RETRY;
 }
 

-int lock_server_cache_rsm::release(lock_protocol::lockid_t lid, callback id, lock_protocol::xid_t xid, int &r) {
+int lock_server_cache_rsm::release(int &r, lock_protocol::lockid_t lid, callback id, lock_protocol::xid_t xid) {

     LOG_FUNC_ENTER_SERVER;
     lock_state &st = get_lock_state(lid);
     lock sl(st.m);
     LOG_FUNC_ENTER_SERVER;
     lock_state &st = get_lock_state(lid);
     lock sl(st.m);

@@ -205,7 +205,7 @@ void lock_server_cache_rsm::unmarshal_state(string state) {
     rep >> lock_table;
 }
 
     rep >> lock_table;
 }
 

-lock_protocol::status lock_server_cache_rsm::stat(lock_protocol::lockid_t lid, int &r) {
+lock_protocol::status lock_server_cache_rsm::stat(int &r, lock_protocol::lockid_t lid) {

     printf("stat request\n");
     r = nacquire;
     return lock_protocol::OK;
     printf("stat request\n");
     r = nacquire;
     return lock_protocol::OK;