X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/2546a41ad36fdc9ef6471cb35a1d56930ae1b527..5bb7eb131773abd9e642f83629528b4c4e706b2e:/lock_server.cc

diff --git a/lock_server.cc b/lock_server.cc
index cac6a90..81cd805 100644
--- a/lock_server.cc
+++ b/lock_server.cc
@@ -1,18 +1,10 @@
 // the caching lock server implementation
 
+#include "types.h"
 #include "lock_server.h"
-#include <sstream>
 #include <unistd.h>
 #include <arpa/inet.h>
-#include "lang/verify.h"
 #include "handle.h"
-#include "threaded_log.h"
-#include "rpc/marshall.h"
-#include "lock.h"
-
-using std::ostringstream;
-using std::istringstream;
-using std::vector;
 
 lock_state::lock_state():
     held(false)
@@ -31,25 +23,16 @@ 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();
+    rsm_->set_state_transfer(this);
 }
 
 void lock_server::revoker() [[noreturn]] {
@@ -57,11 +40,11 @@ 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);
-        holder held_by;
+        holder_t held_by;
         {
             lock sl(st.m);
             held_by = st.held_by;
@@ -84,12 +67,12 @@ 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);
         lock_state &st = get_lock_state(lid);
-        holder front;
+        holder_t front;
         {
             lock sl(st.m);
             if (st.wanted_by.empty())
@@ -111,8 +94,8 @@ void lock_server::retryer() [[noreturn]] {
 }
 
 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);
+    LOG("lid=" << lid << " client=" << id << "," << xid);
+    holder_t h = holder_t(id, xid);
     lock_state &st = get_lock_state(lid);
     lock sl(st.m);
 
@@ -145,11 +128,11 @@ int lock_server::acquire(int &, lock_protocol::lockid_t lid, string id, lock_pro
 
     // get in line
     bool found = false;
-    for (list<holder>::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;
@@ -159,7 +142,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)
@@ -168,11 +151,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;
+int lock_server::release(int &, lock_protocol::lockid_t lid, 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");
     }
@@ -184,16 +167,14 @@ 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();
+    rep << nacquire << lock_table;
+    return rep.content();
 }
 
 void lock_server::unmarshal_state(string state) {
     lock sl(lock_table_lock);
-    unmarshall rep(state);
-    rep >> nacquire;
-    rep >> lock_table;
+    unmarshall rep(state, false);
+    rep >> nacquire >> lock_table;
 }
 
 lock_protocol::status lock_server::stat(int &r, lock_protocol::lockid_t lid) {