yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #12858 from liamwhite/non-blocking 

internal_network: only poll for accept on blocking sockets
This commit is contained in:
Narr the Reg 2024-01-31 10:24:30 -06:00 committed by GitHub
parent 22492b68b7 5510b31972
commit 12e5293c73
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/core/internal_network/network.cpp
View File

@ -693,20 +693,23 @@ std::pair<SocketBase::AcceptResult, Errno> Socket::Accept() {
sockaddr_in addr; sockaddr_in addr;
socklen_t addrlen = sizeof(addr); socklen_t addrlen = sizeof(addr);
std::vector<WSAPOLLFD> host_pollfds{ const bool wait_for_accept = !is_non_blocking;
WSAPOLLFD{fd, POLLIN, 0}, if (wait_for_accept) {
WSAPOLLFD{GetInterruptSocket(), POLLIN, 0}, std::vector<WSAPOLLFD> host_pollfds{
}; WSAPOLLFD{fd, POLLIN, 0},
WSAPOLLFD{GetInterruptSocket(), POLLIN, 0},
};
while (true) { while (true) {
const int pollres = const int pollres =
WSAPoll(host_pollfds.data(), static_cast<ULONG>(host_pollfds.size()), -1); WSAPoll(host_pollfds.data(), static_cast<ULONG>(host_pollfds.size()), -1);
if (host_pollfds[1].revents != 0) { if (host_pollfds[1].revents != 0) {
// Interrupt signaled before a client could be accepted, break // Interrupt signaled before a client could be accepted, break
return {AcceptResult{}, Errno::AGAIN}; return {AcceptResult{}, Errno::AGAIN};
} }
if (pollres > 0) { if (pollres > 0) {
break; break;
}
} }
} }
@ -913,6 +916,7 @@ Errno Socket::SetRcvTimeo(u32 value) {
Errno Socket::SetNonBlock(bool enable) { Errno Socket::SetNonBlock(bool enable) {
if (EnableNonBlock(fd, enable)) { if (EnableNonBlock(fd, enable)) {
is_non_blocking = enable;
return Errno::SUCCESS; return Errno::SUCCESS;
} }
return GetAndLogLastError(); return GetAndLogLastError();

3
src/core/internal_network/sockets.h
View File

@ -166,6 +166,9 @@ public:
bool IsOpened() const override; bool IsOpened() const override;
void HandleProxyPacket(const ProxyPacket& packet) override; void HandleProxyPacket(const ProxyPacket& packet) override;
private:
bool is_non_blocking = false;
}; };
std::pair<s32, Errno> Poll(std::vector<PollFD>& poll_fds, s32 timeout); std::pair<s32, Errno> Poll(std::vector<PollFD>& poll_fds, s32 timeout);