X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/26ade07ab0e62b98b452fbbd18edba0450035e35..ab9eee5d7f1fbe7a3fe6229d4a78136efb14371b:/rpc/connection.cc diff --git a/rpc/connection.cc b/rpc/connection.cc index d118539..7a6371a 100644 --- a/rpc/connection.cc +++ b/rpc/connection.cc @@ -1,10 +1,10 @@ -#include "connection.h" -#include "rpc_protocol.h" +#include "include/rpc/connection.h" +#include "include/rpc/rpc_protocol.h" #include #include #include #include -#include "marshall.h" +#include "include/rpc/marshall.h" connection_delegate::~connection_delegate() {} @@ -15,7 +15,7 @@ connection::connection(connection_delegate * delegate, socket_t && f1, int l1) signal(SIGPIPE, SIG_IGN); - poll_mgr::shared_mgr.add_callback(fd, CB_RDONLY, this); + global->shared_mgr.add_callback(fd, CB_RDONLY, this); } connection::~connection() { @@ -24,13 +24,12 @@ connection::~connection() { if (dead_) return; dead_ = true; - shutdown(fd,SHUT_RDWR); + fd.shutdown(SHUT_RDWR); } // after block_remove_fd, select will never wait on fd and no callbacks // will be active - poll_mgr::shared_mgr.block_remove_fd(fd); - VERIFY(dead_); - VERIFY(!wpdu_.buf.size()); + global->shared_mgr.block_remove_fd(fd); + VERIFY(dead_ && wpdu_.status == unused); } shared_ptr connection::to_dst(const sockaddr_in & dst, connection_delegate * delegate, int lossy) { @@ -42,46 +41,39 @@ shared_ptr connection::to_dst(const sockaddr_in & dst, connection_de return nullptr; } IF_LEVEL(2) LOG_NONMEMBER << "connection::to_dst fd=" << s << " to dst " << inet_ntoa(dst.sin_addr) << ":" << ntoh(dst.sin_port); - return make_shared(delegate, std::move(s), lossy); + return std::make_shared(delegate, std::move(s), lossy); } bool connection::send(const string & b) { lock ml(m_); - waiters_++; - while (!dead_ && wpdu_.buf.size()) + while (!dead_ && wpdu_.status != unused) send_wait_.wait(ml); - waiters_--; if (dead_) return false; - wpdu_.buf = b; - wpdu_.solong = 0; + wpdu_ = {inflight, b, 0}; - if (lossy_) { - if ((random()%100) < lossy_) { - IF_LEVEL(1) LOG << "send LOSSY TEST shutdown fd " << fd; - shutdown(fd,SHUT_RDWR); - } + if (std::bernoulli_distribution(lossy_*.01)(global->random_generator)) { + IF_LEVEL(1) LOG << "send LOSSY TEST shutdown fd " << fd; + fd.shutdown(SHUT_RDWR); } if (!writepdu()) { dead_ = true; ml.unlock(); - poll_mgr::shared_mgr.block_remove_fd(fd); + global->shared_mgr.block_remove_fd(fd); ml.lock(); - } else if (wpdu_.solong != wpdu_.buf.size()) { + } else if (wpdu_.status == inflight && wpdu_.cursor < b.size()) { // should be rare to need to explicitly add write callback - poll_mgr::shared_mgr.add_callback(fd, CB_WRONLY, this); - while (!dead_ && wpdu_.solong != size_t_max && wpdu_.solong < wpdu_.buf.size()) + global->shared_mgr.add_callback(fd, CB_WRONLY, this); + while (!dead_ && wpdu_.status == inflight && wpdu_.cursor < b.size()) send_complete_.wait(ml); } - bool ret = (!dead_ && wpdu_.solong == wpdu_.buf.size()); - wpdu_.solong = 0; - wpdu_.buf.clear(); - if (waiters_ > 0) - send_wait_.notify_all(); + bool ret = (!dead_ && wpdu_.status == inflight && wpdu_.cursor == b.size()); + wpdu_ = {unused, "", 0}; + send_wait_.notify_all(); return ret; } @@ -90,22 +82,38 @@ void connection::write_cb(int s) { lock ml(m_); VERIFY(!dead_); VERIFY(fd == s); - if (wpdu_.buf.size() == 0) { - poll_mgr::shared_mgr.del_callback(fd, CB_WRONLY); + if (wpdu_.status != inflight) { + global->shared_mgr.del_callback(fd, CB_WRONLY); return; } if (!writepdu()) { - poll_mgr::shared_mgr.del_callback(fd, CB_RDWR); + global->shared_mgr.del_callback(fd, CB_RDWR); dead_ = true; } else { - VERIFY(wpdu_.solong != size_t_max); - if (wpdu_.solong < wpdu_.buf.size()) { + VERIFY(wpdu_.status != error); + if (wpdu_.cursor < wpdu_.buf.size()) return; - } } send_complete_.notify_one(); } +bool connection::writepdu() { + VERIFY(wpdu_.status == inflight); + if (wpdu_.cursor == wpdu_.buf.size()) + return true; + + ssize_t n = fd.write(&wpdu_.buf[wpdu_.cursor], (wpdu_.buf.size()-wpdu_.cursor)); + if (n < 0) { + if (errno != EAGAIN) { + IF_LEVEL(1) LOG << "writepdu fd " << fd << " failure errno=" << errno; + wpdu_ = {error, "", 0}; + } + return (errno == EAGAIN); + } + wpdu_.cursor += (size_t)n; + return true; +} + // fd is ready to be read void connection::read_cb(int s) { lock ml(m_); @@ -115,45 +123,26 @@ void connection::read_cb(int s) { IF_LEVEL(5) LOG << "got data on fd " << s; - if (!rpdu_.buf.size() || rpdu_.solong < rpdu_.buf.size()) { + if (rpdu_.status == unused || rpdu_.cursor < rpdu_.buf.size()) { if (!readpdu()) { IF_LEVEL(5) LOG << "readpdu on fd " << s << " failed; dying"; - poll_mgr::shared_mgr.del_callback(fd, CB_RDWR); + global->shared_mgr.del_callback(fd, CB_RDWR); dead_ = true; send_complete_.notify_one(); } } - if (rpdu_.buf.size() && rpdu_.buf.size() == rpdu_.solong) { + if (rpdu_.status == inflight && rpdu_.buf.size() == rpdu_.cursor) { if (delegate_->got_pdu(shared_from_this(), rpdu_.buf)) { // connection_delegate has successfully consumed the pdu - rpdu_.buf.clear(); - rpdu_.solong = 0; + rpdu_ = {unused, "", 0}; } } } -bool connection::writepdu() { - VERIFY(wpdu_.solong != size_t_max); - if (wpdu_.solong == wpdu_.buf.size()) - return true; - - ssize_t n = write(fd, &wpdu_.buf[wpdu_.solong], (wpdu_.buf.size()-wpdu_.solong)); - if (n < 0) { - if (errno != EAGAIN) { - IF_LEVEL(1) LOG << "writepdu fd " << fd << " failure errno=" << errno; - wpdu_.solong = size_t_max; - wpdu_.buf.clear(); - } - return (errno == EAGAIN); - } - wpdu_.solong += (size_t)n; - return true; -} - bool connection::readpdu() { IF_LEVEL(5) LOG << "the receive buffer has length " << rpdu_.buf.size(); - if (!rpdu_.buf.size()) { + if (rpdu_.status == unused) { rpc_protocol::rpc_sz_t sz1; ssize_t n = fd.read(sz1); @@ -179,30 +168,28 @@ bool connection::readpdu() { IF_LEVEL(5) LOG << "read size of datagram = " << sz; - rpdu_.buf.assign(sz+sizeof(sz1), 0); - rpdu_.solong = sizeof(sz1); + rpdu_ = {inflight, string(sz+sizeof(sz1), 0), sizeof(sz1)}; } - ssize_t n = fd.read(&rpdu_.buf[rpdu_.solong], rpdu_.buf.size() - rpdu_.solong); + ssize_t n = fd.read(&rpdu_.buf[rpdu_.cursor], rpdu_.buf.size() - rpdu_.cursor); IF_LEVEL(5) LOG << "read " << n << " bytes"; if (n <= 0) { if (errno == EAGAIN) return true; - rpdu_.buf.clear(); - rpdu_.solong = 0; + rpdu_ = {unused, "", 0}; return false; } - rpdu_.solong += (size_t)n; + rpdu_.cursor += (size_t)n; return true; } connection_listener::connection_listener(connection_delegate * delegate, in_port_t port, int lossytest) : tcp_(socket(AF_INET, SOCK_STREAM, 0)), delegate_(delegate), lossy_(lossytest) { - tcp_.setsockopt(SOL_SOCKET, SO_REUSEADDR, (int)1); - tcp_.setsockopt(IPPROTO_TCP, TCP_NODELAY, (int)1); + tcp_.setsockopt(SOL_SOCKET, SO_REUSEADDR, int{1}); + tcp_.setsockopt(IPPROTO_TCP, TCP_NODELAY, int{1}); tcp_.setsockopt(SOL_SOCKET, SO_RCVTIMEO, timeval{0, 50000}); tcp_.setsockopt(SOL_SOCKET, SO_SNDTIMEO, timeval{0, 50000}); @@ -226,11 +213,11 @@ connection_listener::connection_listener(connection_delegate * delegate, in_port IF_LEVEL(2) LOG << "listen on " << port_ << " " << sin.sin_port; - poll_mgr::shared_mgr.add_callback(tcp_, CB_RDONLY, this); + global->shared_mgr.add_callback(tcp_, CB_RDONLY, this); } connection_listener::~connection_listener() { - poll_mgr::shared_mgr.block_remove_fd(tcp_); + global->shared_mgr.block_remove_fd(tcp_); } void connection_listener::read_cb(int) { @@ -239,11 +226,10 @@ void connection_listener::read_cb(int) { int s1 = accept(tcp_, (sockaddr *)&sin, &slen); if (s1 < 0) { perror("connection_listener::accept_conn error"); - throw runtime_error("connection listener failure"); + throw std::runtime_error("connection listener failure"); } IF_LEVEL(2) LOG << "accept_loop got connection fd=" << s1 << " " << inet_ntoa(sin.sin_addr) << ":" << ntoh(sin.sin_port); - auto ch = make_shared(delegate_, s1, lossy_); // garbage collect dead connections for (auto i = conns_.begin(); i != conns_.end();) { @@ -253,5 +239,5 @@ void connection_listener::read_cb(int) { ++i; } - conns_[s1] = ch; + conns_[s1] = std::make_shared(delegate_, s1, lossy_); }