X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/c279db4240a3a3c30f069ab9dea8055cf94280da..02967a43024ce81912cd1ec96a800397457f8066:/lock_client.cc diff --git a/lock_client.cc b/lock_client.cc index b29fff4..ca21d9d 100644 --- a/lock_client.cc +++ b/lock_client.cc @@ -26,16 +26,12 @@ lock_state & lock_client::get_lock_state(lock_protocol::lockid_t lid) { } lock_client::lock_client(string xdst, lock_release_user *_lu) : lu(_lu), next_xid(0) { - cl = unique_ptr(new rpcc(xdst)); - if (cl->bind() < 0) - LOG << "lock_client: call bind"; - rlock_port = std::uniform_int_distribution(1024,32000+1024)(global->random_generator); id = "127.0.0.1:" + std::to_string(rlock_port); - rlsrpc = unique_ptr(new rpcs(rlock_port)); + rlsrpc = std::make_unique(rlock_port); rlsrpc->reg(rlock_protocol::revoke, &lock_client::revoke_handler, this); rlsrpc->reg(rlock_protocol::retry, &lock_client::retry_handler, this); - rsmc = unique_ptr(new rsm_client(xdst)); + rsmc = std::make_unique(xdst); releaser_thread = thread(&lock_client::releaser, this); rlsrpc->start(); } @@ -69,14 +65,6 @@ void lock_client::releaser() { LOG << "Releaser stopping"; } -int lock_client::stat(lock_protocol::lockid_t lid) { - VERIFY(0); - int r; - auto ret = (lock_protocol::status)cl->call(lock_protocol::stat, r, lid, id); - VERIFY (ret == lock_protocol::OK); - return r; -} - lock_protocol::status lock_client::acquire(lock_protocol::lockid_t lid) { lock_state & st = get_lock_state(lid); lock sl(st.m); @@ -213,7 +201,3 @@ t4_status t4_lock_client_acquire(t4_lock_client *client, t4_lockid_t lid) { t4_status t4_lock_client_release(t4_lock_client *client, t4_lockid_t lid) { return ((lock_client *)client)->release(lid); } - -t4_status t4_lock_client_stat(t4_lock_client *client, t4_lockid_t lid) { - return ((lock_client *)client)->stat(lid); -}