LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Move SocketEvents logic to private method.

Browse source 
This separates the select() logic from the socket handling logic, setting up
for a switch to poll().
This commit is contained in:
Patrick Strateman 2018-09-26 21:51:46 -04:00
parent 7e403c0ae7
commit 28211a4bc9
2 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/net.cpp
View file

@ -1307,7 +1307,7 @@ bool CConnman::GenerateSelectSet(std::set<SOCKET> &recv_set, std::set<SOCKET> &s
return !recv_set.empty() || !send_set.empty() || !error_set.empty(); return !recv_set.empty() || !send_set.empty() || !error_set.empty();
} }
void CConnman::SocketHandler() void CConnman::SocketEvents(std::set<SOCKET> &recv_set, std::set<SOCKET> &send_set, std::set<SOCKET> &error_set)
{ {
std::set<SOCKET> recv_select_set, send_select_set, error_select_set; std::set<SOCKET> recv_select_set, send_select_set, error_select_set;
if (!GenerateSelectSet(recv_select_set, send_select_set, error_select_set)) { if (!GenerateSelectSet(recv_select_set, send_select_set, error_select_set)) {
@ -1362,12 +1362,38 @@ void CConnman::SocketHandler()
return; return;
} }
for (SOCKET hSocket : recv_select_set) {
if (FD_ISSET(hSocket, &fdsetRecv)) {
recv_set.insert(hSocket);
}
}
for (SOCKET hSocket : send_select_set) {
if (FD_ISSET(hSocket, &fdsetSend)) {
send_set.insert(hSocket);
}
}
for (SOCKET hSocket : error_select_set) {
if (FD_ISSET(hSocket, &fdsetError)) {
error_set.insert(hSocket);
}
}
}
void CConnman::SocketHandler()
{
std::set<SOCKET> recv_set, send_set, error_set;
SocketEvents(recv_set, send_set, error_set);
if (interruptNet) return;
// //
// Accept new connections // Accept new connections
// //
for (const ListenSocket& hListenSocket : vhListenSocket) for (const ListenSocket& hListenSocket : vhListenSocket)
{ {
if (hListenSocket.socket != INVALID_SOCKET && FD_ISSET(hListenSocket.socket, &fdsetRecv)) if (hListenSocket.socket != INVALID_SOCKET && recv_set.count(hListenSocket.socket) > 0)
{ {
AcceptConnection(hListenSocket); AcceptConnection(hListenSocket);
} }
@ -1398,9 +1424,9 @@ void CConnman::SocketHandler()
LOCK(pnode->cs_hSocket); LOCK(pnode->cs_hSocket);
if (pnode->hSocket == INVALID_SOCKET) if (pnode->hSocket == INVALID_SOCKET)
continue; continue;
recvSet = FD_ISSET(pnode->hSocket, &fdsetRecv); recvSet = recv_set.count(pnode->hSocket) > 0;
sendSet = FD_ISSET(pnode->hSocket, &fdsetSend); sendSet = send_set.count(pnode->hSocket) > 0;
errorSet = FD_ISSET(pnode->hSocket, &fdsetError); errorSet = error_set.count(pnode->hSocket) > 0;
} }
if (recvSet || errorSet) if (recvSet || errorSet)
{ {

1
src/net.h
View file

@ -343,6 +343,7 @@ private:
void NotifyNumConnectionsChanged(); void NotifyNumConnectionsChanged();
void InactivityCheck(CNode *pnode); void InactivityCheck(CNode *pnode);
bool GenerateSelectSet(std::set<SOCKET> &recv_set, std::set<SOCKET> &send_set, std::set<SOCKET> &error_set); bool GenerateSelectSet(std::set<SOCKET> &recv_set, std::set<SOCKET> &send_set, std::set<SOCKET> &error_set);
void SocketEvents(std::set<SOCKET> &recv_set, std::set<SOCKET> &send_set, std::set<SOCKET> &error_set);
void SocketHandler(); void SocketHandler();
void ThreadSocketHandler(); void ThreadSocketHandler();
void ThreadDNSAddressSeed(); void ThreadDNSAddressSeed();