Clean-ups to logging and type signatures

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

diff --git a/lock_server.cc b/lock_server.cc
index 81cd805..d7367bd 100644 (file)
--- a/lock_server.cc
+++ b/lock_server.cc
@@ -93,7 +93,7 @@ void lock_server::retryer() [[noreturn]] {
     }
 }
 
     }
 }
 

-int lock_server::acquire(int &, lock_protocol::lockid_t lid, string id, lock_protocol::xid_t xid) {
+int lock_server::acquire(int &, lock_protocol::lockid_t lid, const callback_t & id, lock_protocol::xid_t xid) {

     LOG("lid=" << lid << " client=" << id << "," << xid);
     holder_t h = holder_t(id, xid);
     lock_state &st = get_lock_state(lid);
     LOG("lid=" << lid << " client=" << id << "," << xid);
     holder_t h = holder_t(id, xid);
     lock_state &st = get_lock_state(lid);

@@ -151,7 +151,7 @@ int lock_server::acquire(int &, lock_protocol::lockid_t lid, string id, lock_pro
     return lock_protocol::RETRY;
 }
 
     return lock_protocol::RETRY;
 }
 

-int lock_server::release(int &, lock_protocol::lockid_t lid, callback_t id, lock_protocol::xid_t xid) {
+int lock_server::release(int &, lock_protocol::lockid_t lid, const callback_t & id, lock_protocol::xid_t xid) {

     LOG("lid=" << lid << " client=" << id << "," << xid);
     lock_state &st = get_lock_state(lid);
     lock sl(st.m);
     LOG("lid=" << lid << " client=" << id << "," << xid);
     lock_state &st = get_lock_state(lid);
     lock sl(st.m);

@@ -171,7 +171,7 @@ string lock_server::marshal_state() {
     return rep.content();
 }
 
     return rep.content();
 }
 

-void lock_server::unmarshal_state(string state) {
+void lock_server::unmarshal_state(const string & state) {

     lock sl(lock_table_lock);
     unmarshall rep(state, false);
     rep >> nacquire >> lock_table;
     lock sl(lock_table_lock);
     unmarshall rep(state, false);
     rep >> nacquire >> lock_table;