mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-29 22:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated sys_net to use WSAPoll on win32 as this fixes connection issues

Browse Source 
in Metal Gear Online. Also aligns with implementations on non win32
platforms
This commit is contained in:
Jayveer 2019-12-04 19:55:40 +00:00 committed by Ivan
parent e3e97da7bb
commit 364ba95d26
2 changed files with 16 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpcs3/Emu/Cell/Modules/cellNetCtl.cpp
View File

@ -280,10 +280,16 @@ error_code cellNetCtlNetStartDialogUnloadAsync(vm::ptr<CellNetCtlNetStartDialogR
if (result->size != 8) if (result->size != 8)
{ {
result->result = CELL_NET_CTL_ERROR_INVALID_SIZE;
return CELL_NET_CTL_ERROR_INVALID_SIZE; return CELL_NET_CTL_ERROR_INVALID_SIZE;
} }
result->result = CELL_NET_CTL_ERROR_DIALOG_CANCELED; if (g_cfg.net.net_status == CELL_NET_CTL_STATE_Disconnected)
{
result->result = CELL_NET_CTL_ERROR_NET_NOT_CONNECTED;
return CELL_NET_CTL_ERROR_NET_NOT_CONNECTED;
}
sysutil_send_system_cmd(CELL_SYSUTIL_NET_CTL_NETSTART_UNLOADED, 0); sysutil_send_system_cmd(CELL_SYSUTIL_NET_CTL_NETSTART_UNLOADED, 0);
return CELL_OK; return CELL_OK;

89
rpcs3/Emu/Cell/lv2/sys_net.cpp
View File

@ -175,14 +175,9 @@ struct network_thread
{ {
#ifdef _WIN32 #ifdef _WIN32
WSACleanup(); WSACleanup();
CloseHandle(_eventh);
#endif #endif
} }
#ifdef _WIN32
HANDLE _eventh = CreateEventW(nullptr, false, false, nullptr);
#endif
void operator()() void operator()()
{ {
std::vector<std::shared_ptr<lv2_socket>> socklist; std::vector<std::shared_ptr<lv2_socket>> socklist;
@ -190,16 +185,13 @@ struct network_thread
s_to_awake.clear(); s_to_awake.clear();
#ifdef _WIN32
#else
::pollfd fds[lv2_socket::id_count]{}; ::pollfd fds[lv2_socket::id_count]{};
#endif
while (thread_ctrl::state() != thread_state::aborting) while (thread_ctrl::state() != thread_state::aborting)
{ {
// Wait with 1ms timeout // Wait with 1ms timeout
#ifdef _WIN32 #ifdef _WIN32
WaitForSingleObjectEx(_eventh, 1, false); ::WSAPoll(fds, socklist.size(), 1);
#else #else
::poll(fds, socklist.size(), 1); ::poll(fds, socklist.size(), 1);
#endif #endif
@ -212,40 +204,12 @@ struct network_thread
lv2_socket& sock = *socklist[i]; lv2_socket& sock = *socklist[i];
#ifdef _WIN32
WSANETWORKEVENTS nwe;
if (WSAEnumNetworkEvents(sock.socket, nullptr, &nwe) == 0)
{
sock.ev_set |= nwe.lNetworkEvents;
if (sock.ev_set & (FD_READ | FD_ACCEPT | FD_CLOSE) && sock.events.test_and_reset(lv2_socket::poll::read))
events += lv2_socket::poll::read;
if (sock.ev_set & (FD_WRITE | FD_CONNECT) && sock.events.test_and_reset(lv2_socket::poll::write))
events += lv2_socket::poll::write;
if ((nwe.lNetworkEvents & FD_READ && nwe.iErrorCode[FD_READ_BIT]) ||
(nwe.lNetworkEvents & FD_ACCEPT && nwe.iErrorCode[FD_ACCEPT_BIT]) ||
(nwe.lNetworkEvents & FD_CLOSE && nwe.iErrorCode[FD_CLOSE_BIT]) ||
(nwe.lNetworkEvents & FD_WRITE && nwe.iErrorCode[FD_WRITE_BIT]) ||
(nwe.lNetworkEvents & FD_CONNECT && nwe.iErrorCode[FD_CONNECT_BIT]))
{
// TODO
if (sock.events.test_and_reset(lv2_socket::poll::error))
events += lv2_socket::poll::error;
}
}
else
{
sys_net.error("WSAEnumNetworkEvents() failed (s=%d)", i);
}
#else
if (fds[i].revents & (POLLIN | POLLHUP) && socklist[i]->events.test_and_reset(lv2_socket::poll::read)) if (fds[i].revents & (POLLIN | POLLHUP) && socklist[i]->events.test_and_reset(lv2_socket::poll::read))
events += lv2_socket::poll::read; events += lv2_socket::poll::read;
if (fds[i].revents & POLLOUT && socklist[i]->events.test_and_reset(lv2_socket::poll::write)) if (fds[i].revents & POLLOUT && socklist[i]->events.test_and_reset(lv2_socket::poll::write))
events += lv2_socket::poll::write; events += lv2_socket::poll::write;
if (fds[i].revents & POLLERR && socklist[i]->events.test_and_reset(lv2_socket::poll::error)) if (fds[i].revents & POLLERR && socklist[i]->events.test_and_reset(lv2_socket::poll::error))
events += lv2_socket::poll::error; events += lv2_socket::poll::error;
#endif
if (events) if (events)
{ {
@ -295,16 +259,12 @@ struct network_thread
{ {
auto events = socklist[i]->events.load(); auto events = socklist[i]->events.load();
#ifdef _WIN32
verify(HERE), 0 == WSAEventSelect(socklist[i]->socket, _eventh, FD_READ | FD_ACCEPT | FD_CLOSE | FD_WRITE | FD_CONNECT);
#else
fds[i].fd = events ? socklist[i]->socket : -1; fds[i].fd = events ? socklist[i]->socket : -1;
fds[i].events = fds[i].events =
(events & lv2_socket::poll::read ? POLLIN : 0) | (events & lv2_socket::poll::read ? POLLIN : 0) |
(events & lv2_socket::poll::write ? POLLOUT : 0) | (events & lv2_socket::poll::write ? POLLOUT : 0) |
0; 0;
fds[i].revents = 0; fds[i].revents = 0;
#endif
} }
} }
} }
@ -1616,15 +1576,11 @@ error_code sys_net_bnet_poll(ppu_thread& ppu, vm::ptr<sys_net_pollfd> fds, s32 n
reader_lock lock(id_manager::g_mutex); reader_lock lock(id_manager::g_mutex);
#ifndef _WIN32
::pollfd _fds[1024]{}; ::pollfd _fds[1024]{};
#endif
for (s32 i = 0; i < nfds; i++) for (s32 i = 0; i < nfds; i++)
{ {
#ifndef _WIN32
_fds[i].fd = -1; _fds[i].fd = -1;
#endif
fds[i].revents = 0; fds[i].revents = 0;
if (fds[i].fd < 0) if (fds[i].fd < 0)
@ -1636,23 +1592,11 @@ error_code sys_net_bnet_poll(ppu_thread& ppu, vm::ptr<sys_net_pollfd> fds, s32 n
{ {
if (fds[i].events & ~(SYS_NET_POLLIN | SYS_NET_POLLOUT)) if (fds[i].events & ~(SYS_NET_POLLIN | SYS_NET_POLLOUT))
sys_net.error("sys_net_bnet_poll(fd=%d): events=0x%x", fds[i].fd, fds[i].events); sys_net.error("sys_net_bnet_poll(fd=%d): events=0x%x", fds[i].fd, fds[i].events);
#ifdef _WIN32
if (fds[i].events & SYS_NET_POLLIN && sock->ev_set & (FD_READ | FD_ACCEPT | FD_CLOSE))
fds[i].revents |= SYS_NET_POLLIN;
if (fds[i].events & SYS_NET_POLLOUT && sock->ev_set & (FD_WRITE | FD_CONNECT))
fds[i].revents |= SYS_NET_POLLOUT;
if (fds[i].revents)
{
signaled++;
}
#else
_fds[i].fd = sock->socket; _fds[i].fd = sock->socket;
if (fds[i].events & SYS_NET_POLLIN) if (fds[i].events & SYS_NET_POLLIN)
_fds[i].events |= POLLIN; _fds[i].events |= POLLIN;
if (fds[i].events & SYS_NET_POLLOUT) if (fds[i].events & SYS_NET_POLLOUT)
_fds[i].events |= POLLOUT; _fds[i].events |= POLLOUT;
#endif
} }
else else
{ {
@ -1661,9 +1605,11 @@ error_code sys_net_bnet_poll(ppu_thread& ppu, vm::ptr<sys_net_pollfd> fds, s32 n
} }
} }
#ifndef _WIN32 #ifdef _WIN32
::WSAPoll(_fds, nfds, 0);
#else
::poll(_fds, nfds, 0); ::poll(_fds, nfds, 0);
#endif
for (s32 i = 0; i < nfds; i++) for (s32 i = 0; i < nfds; i++)
{ {
if (_fds[i].revents & (POLLIN | POLLHUP)) if (_fds[i].revents & (POLLIN | POLLHUP))
@ -1678,7 +1624,6 @@ error_code sys_net_bnet_poll(ppu_thread& ppu, vm::ptr<sys_net_pollfd> fds, s32 n
signaled++; signaled++;
} }
} }
#endif
if (ms == 0 || signaled) if (ms == 0 || signaled)
{ {
@ -1791,15 +1736,11 @@ error_code sys_net_bnet_select(ppu_thread& ppu, s32 nfds, vm::ptr<sys_net_fd_set
reader_lock lock(id_manager::g_mutex); reader_lock lock(id_manager::g_mutex);
#ifndef _WIN32
::pollfd _fds[1024]{}; ::pollfd _fds[1024]{};
#endif
for (s32 i = 0; i < nfds; i++) for (s32 i = 0; i < nfds; i++)
{ {
#ifndef _WIN32
_fds[i].fd = -1; _fds[i].fd = -1;
#endif
bs_t<lv2_socket::poll> selected{}; bs_t<lv2_socket::poll> selected{};
if (readfds && readfds->bit(i)) if (readfds && readfds->bit(i))
@ -1820,24 +1761,11 @@ error_code sys_net_bnet_select(ppu_thread& ppu, s32 nfds, vm::ptr<sys_net_fd_set
if (auto sock = idm::check_unlocked<lv2_socket>((lv2_socket::id_base & -1024) + i)) if (auto sock = idm::check_unlocked<lv2_socket>((lv2_socket::id_base & -1024) + i))
{ {
#ifdef _WIN32
bool sig = false;
if (sock->ev_set & (FD_READ | FD_ACCEPT | FD_CLOSE) && selected & lv2_socket::poll::read)
sig = true, rread.set(i);
if (sock->ev_set & (FD_WRITE | FD_CONNECT) && selected & lv2_socket::poll::write)
sig = true, rwrite.set(i);
if (sig)
{
signaled++;
}
#else
_fds[i].fd = sock->socket; _fds[i].fd = sock->socket;
if (selected & lv2_socket::poll::read) if (selected & lv2_socket::poll::read)
_fds[i].events |= POLLIN; _fds[i].events |= POLLIN;
if (selected & lv2_socket::poll::write) if (selected & lv2_socket::poll::write)
_fds[i].events |= POLLOUT; _fds[i].events |= POLLOUT;
#endif
} }
else else
{ {
@ -1845,9 +1773,11 @@ error_code sys_net_bnet_select(ppu_thread& ppu, s32 nfds, vm::ptr<sys_net_fd_set
} }
} }
#ifndef _WIN32 #ifdef _WIN32
::WSAPoll(_fds, nfds, 0);
#else
::poll(_fds, nfds, 0); ::poll(_fds, nfds, 0);
#endif
for (s32 i = 0; i < nfds; i++) for (s32 i = 0; i < nfds; i++)
{ {
bool sig = false; bool sig = false;
@ -1861,7 +1791,6 @@ error_code sys_net_bnet_select(ppu_thread& ppu, s32 nfds, vm::ptr<sys_net_fd_set
signaled++; signaled++;
} }
} }
#endif
if ((_timeout && !timeout) || signaled) if ((_timeout && !timeout) || signaled)
{ {