X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/f2170465073de34adf89161d4287182b518352c4..f0dcb6b97d6d40f67698d1f71ac26970f1776f82:/lock_server.cc?ds=sidebyside diff --git a/lock_server.cc b/lock_server.cc index a82231e..90ad5b2 100644 --- a/lock_server.cc +++ b/lock_server.cc @@ -1,29 +1,20 @@ // the caching lock server implementation #include "lock_server.h" -#include #include #include -#include "lang/verify.h" #include "handle.h" -#include "tprintf.h" -#include "rpc/marshall.h" -#include "lock.h" - -using std::ostringstream; -using std::istringstream; -using std::vector; lock_state::lock_state(): held(false) { } -lock_state::lock_state(const lock_state &other) { +lock_state::lock_state(const lock_state & other) { *this = other; } -lock_state& lock_state::operator=(const lock_state& o) { +lock_state & lock_state::operator=(const lock_state & o) { held = o.held; held_by = o.held_by; wanted_by = o.wanted_by; @@ -31,37 +22,32 @@ lock_state& lock_state::operator=(const lock_state& o) { return *this; } -marshall & operator<<(marshall &m, const lock_state &d) { - return m << d.held << d.held_by << d.wanted_by; -} - -unmarshall & operator>>(unmarshall &u, lock_state &d) { - return u >> d.held >> d.held_by >> d.wanted_by; -} - lock_state & lock_server::get_lock_state(lock_protocol::lockid_t lid) { lock sl(lock_table_lock); - // by the semantics of map, this will create - // the lock if it doesn't already exist + // this will create the lock if it doesn't already exist return lock_table[lid]; } -lock_server::lock_server(class rsm *_rsm) : rsm (_rsm) { - std::thread(&lock_server::revoker, this).detach(); - std::thread(&lock_server::retryer, this).detach(); - rsm->set_state_transfer(this); +lock_server::lock_server(rsm & r) : rsm_ (&r) { + thread(&lock_server::revoker, this).detach(); + thread(&lock_server::retryer, this).detach(); + r.set_state_transfer(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() [[noreturn]] { +void lock_server::revoker () { while (1) { 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); - holder held_by; + lock_state & st = get_lock_state(lid); + holder_t held_by; { lock sl(st.m); held_by = st.held_by; @@ -74,22 +60,22 @@ void lock_server::revoker() [[noreturn]] { proxy = handle(held_by.first).safebind(); if (proxy) { int r; - rlock_protocol::status ret = proxy->call(rlock_protocol::revoke, r, lid, held_by.second); + auto ret = (rlock_protocol::status)proxy->call(rlock_protocol::revoke, r, lid, held_by.second); LOG("Revoke returned " << ret); } } } -void lock_server::retryer() [[noreturn]] { +void lock_server::retryer() { 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); - lock_state &st = get_lock_state(lid); - holder front; + lock_state & st = get_lock_state(lid); + holder_t front; { lock sl(st.m); if (st.wanted_by.empty()) @@ -97,8 +83,6 @@ void lock_server::retryer() [[noreturn]] { front = st.wanted_by.front(); } - rlock_protocol::status ret = -1; - rpcc *proxy = NULL; // try a few times? //int t=5; @@ -106,16 +90,16 @@ void lock_server::retryer() [[noreturn]] { proxy = handle(front.first).safebind(); if (proxy) { int r; - ret = proxy->call(rlock_protocol::retry, r, lid, front.second); + auto ret = (rlock_protocol::status)proxy->call(rlock_protocol::retry, r, lid, front.second); LOG("Retry returned " << ret); } } } -int lock_server::acquire(int &, 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); +lock_protocol::status 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); lock sl(st.m); // deal with duplicated requests @@ -147,11 +131,11 @@ int lock_server::acquire(int &, lock_protocol::lockid_t lid, string id, lock_pro // get in line bool found = false; - for (list::iterator i = st.wanted_by.begin(); i != st.wanted_by.end(); i++) { - if (i->first == id) { + for (auto p : st.wanted_by) { + if (p.first == id) { // make sure client is obeying serialization - if (i->second != xid) { - LOG("Client " << id << " sent acquire xid=" << xid << " with in-progress xid=" << i->second); + if (p.second != xid) { + LOG("Client " << id << " sent acquire xid=" << xid << " with in-progress xid=" << p.second); return lock_protocol::RPCERR; } found = true; @@ -161,7 +145,7 @@ int lock_server::acquire(int &, lock_protocol::lockid_t lid, string id, lock_pro if (!found) st.wanted_by.push_back(h); - LOG("wanted_by=" << make_iterator_pair(st.wanted_by.begin(), st.wanted_by.end())); + LOG("wanted_by=" << st.wanted_by); // send revoke if we're first in line if (st.wanted_by.front() == h) @@ -170,11 +154,11 @@ 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 id, lock_protocol::xid_t xid) { - LOG_FUNC_ENTER_SERVER; - lock_state &st = get_lock_state(lid); +lock_protocol::status 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); - if (st.held && st.held_by == holder(id, xid)) { + if (st.held && st.held_by == holder_t(id, xid)) { st.held = false; LOG("Lock " << lid << " not held"); } @@ -185,20 +169,15 @@ int lock_server::release(int &, lock_protocol::lockid_t lid, callback id, lock_p string lock_server::marshal_state() { lock sl(lock_table_lock); - marshall rep; - rep << nacquire; - rep << lock_table; - return rep.str(); + return marshall(nacquire, lock_table).content(); } -void lock_server::unmarshal_state(string state) { +void lock_server::unmarshal_state(const string & state) { lock sl(lock_table_lock); - unmarshall rep(state); - rep >> nacquire; - rep >> lock_table; + unmarshall(state, false, nacquire, lock_table); } -lock_protocol::status lock_server::stat(int &r, lock_protocol::lockid_t lid) { +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;