X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/5d99dbf06a14904944f5593c63705934bdfdcfb7..3abd3952c1f4441f0dd6eae9883b2d01ed9cd56b:/lock_server.cc diff --git a/lock_server.cc b/lock_server.cc index b724140..d7367bd 100644 --- 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]; } -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(); - rsm->set_state_transfer(this); + rsm_->set_state_transfer(this); } 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); - if (rsm && !rsm->amiprimary()) + if (rsm_ && !rsm_->amiprimary()) 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); - if (rsm && !rsm->amiprimary()) + if (rsm_ && !rsm_->amiprimary()) continue; LOG("Sending retry for " << lid); @@ -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); @@ -151,7 +151,7 @@ int lock_server::acquire(int &, lock_protocol::lockid_t lid, string id, lock_pro 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); @@ -171,7 +171,7 @@ string lock_server::marshal_state() { 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;