nuke extra threads, extra error support; use span instead of vector for poll fds

This commit is contained in:
lizzie
2026-07-02 03:28:10 +00:00
committed by crueter
parent 9129158851
commit 102d2cab1f
5 changed files with 27 additions and 40 deletions
+8 -9
View File
@@ -285,7 +285,9 @@ Errno TranslateNativeError(int e, CallType call_type = CallType::Other) {
NETWORK_ERROR_ELEM(NOTSUP) \
NETWORK_ERROR_ELEM(ADDRINUSE) \
NETWORK_ERROR_ELEM(ADDRNOTAVAIL) \
NETWORK_ERROR_ELEM(NOTSOCK)
NETWORK_ERROR_ELEM(NOTSOCK) \
NETWORK_ERROR_ELEM(ALREADY) \
NETWORK_ERROR_ELEM(STALE)
#define NETWORK_ERROR_ELEM(name) case E##name: return Errno::name;
NETWORK_ERROR_LIST
#undef NETWORK_ERROR_ELEM
@@ -889,7 +891,6 @@ std::variant<std::vector<AddrInfo>, GetAddrInfoError> GetAddressInfo(const std::
std::pair<s32, Errno> Poll(std::span<HostPollFD> pollfds, s32 timeout) {
LOG_DEBUG(Network, "pollfds={},timeout={}", pollfds.size(), timeout);
const size_t num = pollfds.size();
std::vector<WSAPOLLFD> host_pollfds(pollfds.size());
std::transform(pollfds.begin(), pollfds.end(), host_pollfds.begin(), [](auto const e) {
@@ -914,16 +915,14 @@ std::pair<s32, Errno> Poll(std::span<HostPollFD> pollfds, s32 timeout) {
return {0, Errno::SUCCESS};
}
for (size_t i = 0; i < num; ++i)
for (size_t i = 0; i < pollfds.size(); ++i)
pollfds[i].revents = TranslatePollRevents(host_pollfds[i].revents);
if (result > 0) {
return {result, Errno::SUCCESS};
if (result <= 0) {
ASSERT(result == SOCKET_ERROR);
return {-1, GetAndLogLastError()};
}
ASSERT(result == SOCKET_ERROR);
return {-1, GetAndLogLastError()};
return {result, Errno::SUCCESS};
}
Socket::~Socket() {
+2
View File
@@ -43,7 +43,9 @@ enum class Errno : u32 {
TIMEDOUT = 110,
CONNREFUSED = 111,
HOSTUNREACH = 113,
ALREADY = 114,
INPROGRESS = 115,
STALE = 116,
/* made up error? */
OTHER = 196,
};