epics/pvxs
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configurable timeout (with $EPICS_PVA_CONN_TMO)

Browse Source
This commit is contained in:
Michael Davidsaver
2021-06-08 09:45:49 -07:00
parent e5b21535ab
commit da004bc54b
9 changed files with 108 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/clientconn.cpp
+6 -2
View File
@@ -24,7 +24,8 @@ Connection::Connection(const std::shared_ptr<Context::Pvt>& context, const SockA
bufferevent_setcb(bev.get(), &bevReadS, nullptr, &bevEventS, this);
// shorter timeout until connect() ?
bufferevent_set_timeouts(bev.get(), &tcp_timeout, &tcp_timeout);
timeval tmo(totv(context->effective.tcpTimeout));
bufferevent_set_timeouts(bev.get(), &tmo, &tmo);
if(bufferevent_socket_connect(bev.get(), const_cast<sockaddr*>(&peerAddr->sa), peerAddr.size()))
throw std::runtime_error("Unable to begin connecting");
@@ -99,7 +100,10 @@ void Connection::bevEvent(short events)
throw std::logic_error("Unable to enable BEV");
// start echo timer
if(event_add(echoTimer.get(), &tcp_echo_period))
// tcpTimeout(40) -> 15 second echo period
// bound echo to range [1, 15]
timeval tmo(totv(std::max(1.0, std::min(15.0, context->effective.tcpTimeout*3.0/8.0))));
if(event_add(echoTimer.get(), &tmo))
log_err_printf(io, "Server %s error starting echoTimer\n", peerName.c_str());
}
}