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

reduce Search tx log spam

Browse Source 
eg. if an interface disappears.
This commit is contained in:
Michael Davidsaver
2025-01-19 11:07:28 -08:00
parent 87abad5387
commit ff1d6510cb
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client.cpp
+16 -11
View File
@@ -1146,37 +1146,42 @@ void ContextImpl::tickSearch(SearchKind kind, bool poked)
to_wire(H, Header{CMD_SEARCH, 0, uint32_t(consumed-8u)});
}
for(auto& pair : searchDest) {
auto& dest = pair.first.addr.family()==AF_INET ? searchTx4 : searchTx6;
auto& dest = pair.dest.addr.family()==AF_INET ? searchTx4 : searchTx6;
if(pair.second) {
if(pair.isucast) {
*pflags |= pva_search_flags::Unicast;
} else {
*pflags &= ~pva_search_flags::Unicast;
dest.mcast_prep_sendto(pair.first);
dest.mcast_prep_sendto(pair.dest);
}
int ntx = sendto(dest.sock, (char*)searchMsg.data(), consumed, 0,
&pair.first.addr->sa, pair.first.addr.size());
&pair.dest.addr->sa, pair.dest.addr.size());
if(ntx<0) {
int err = evutil_socket_geterror(dest.sock);
auto lvl = Level::Warn;
if(err==EINTR || err==EPERM)
if(err==EINTR || err==EPERM || !pair.lastSuccess)
lvl = Level::Debug;
log_printf(io, lvl, "Search tx %s error (%d) %s\n",
pair.first.addr.tostring().c_str(), err, evutil_socket_error_to_string(err));
pair.dest.addr.tostring().c_str(), err, evutil_socket_error_to_string(err));
pair.lastSuccess = false;
} else if(unsigned(ntx)<consumed) {
log_warn_printf(io, "Search truncated %u < %u",
log_warn_printf(io, "Search tx truncated %u < %u",
unsigned(ntx), unsigned(consumed));
} else {
log_hex_printf(io, Level::Debug, (char*)searchMsg.data(), consumed,
"Search to %s %s\n",
std::string(SB()<<pair.first).c_str(),
pair.second ? "ucast" : "bcast");
auto lvl = Level::Info;
if(pair.lastSuccess)
lvl = Level::Debug;
log_hex_printf(io, lvl, (char*)searchMsg.data(), consumed,
"Search tx %s %s\n",
std::string(SB()<<pair.dest).c_str(),
pair.isucast ? "ucast" : "bcast");
pair.lastSuccess = true;
}
}
*pflags |= 0x80; // TCP search is always "unicast"
src/clientimpl.h
+8 -1
View File
@@ -289,7 +289,14 @@ struct ContextImpl : public std::enable_shared_from_this<ContextImpl>
std::vector<uint8_t> searchMsg;
// search destination address and whether to set the unicast flag
std::vector<std::pair<SockEndpoint, bool>> searchDest;
struct SearchDest {
const SockEndpoint dest;
const bool isucast;
bool lastSuccess = true;
SearchDest(SockEndpoint dest, bool isu) :dest(dest), isucast(isu) {}
};
std::vector<SearchDest> searchDest;
size_t currentBucket = 0u;
// Channels where we have yet to send out an initial search request