archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

sys_net: fixup for race condition

Browse source 
Don't reset is_connecting without checking correctness.
Also cleanup dead WIN32 code.
This commit is contained in:
Nekotekina 2019-12-23 22:36:04 +03:00
parent 90e4fe23c5
commit abe2cc196a
2 changed files with 6 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

31
rpcs3/Emu/Cell/lv2/sys_net.cpp
View file

@ -92,7 +92,7 @@ void windows_poll(pollfd* fds, unsigned long nfds, int timeout, bool *connecting
{ {
int error = 0; int error = 0;
socklen_t intlen = sizeof(error); socklen_t intlen = sizeof(error);
if (getsockopt(fds[i].fd, SOL_SOCKET, SO_ERROR, (char*)&error, &intlen) == -1 || error != 0) if (getsockopt(fds[i].fd, SOL_SOCKET, SO_ERROR, reinterpret_cast<char*>(&error), &intlen) == -1 || error != 0)
{ {
// Connection silently failed // Connection silently failed
connecting[i] = false; connecting[i] = false;
@ -217,6 +217,7 @@ struct network_thread
::pollfd fds[lv2_socket::id_count]{}; ::pollfd fds[lv2_socket::id_count]{};
#ifdef _WIN32 #ifdef _WIN32
bool connecting[lv2_socket::id_count]{}; bool connecting[lv2_socket::id_count]{};
bool was_connecting[lv2_socket::id_count]{};
#endif #endif
while (thread_ctrl::state() != thread_state::aborting) while (thread_ctrl::state() != thread_state::aborting)
@ -237,7 +238,8 @@ struct network_thread
lv2_socket& sock = *socklist[i]; lv2_socket& sock = *socklist[i];
#ifdef _WIN32 #ifdef _WIN32
sock.is_connecting = connecting[i]; if (was_connecting[i] && !connecting[i])
sock.is_connecting = false;
#endif #endif
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))
@ -302,6 +304,7 @@ struct network_thread
0; 0;
fds[i].revents = 0; fds[i].revents = 0;
#ifdef _WIN32 #ifdef _WIN32
was_connecting[i] = socklist[i]->is_connecting;
connecting[i] = socklist[i]->is_connecting; connecting[i] = socklist[i]->is_connecting;
#endif #endif
} }
@ -349,9 +352,6 @@ error_code sys_net_bnet_accept(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sockaddr>
//if (!(sock.events & lv2_socket::poll::read)) //if (!(sock.events & lv2_socket::poll::read))
{ {
#ifdef _WIN32
sock.ev_set &= ~FD_ACCEPT;
#endif
native_socket = ::accept(sock.socket, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen); native_socket = ::accept(sock.socket, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen);
if (native_socket != -1) if (native_socket != -1)
@ -373,9 +373,6 @@ error_code sys_net_bnet_accept(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sockaddr>
{ {
if (events & lv2_socket::poll::read) if (events & lv2_socket::poll::read)
{ {
#ifdef _WIN32
sock.ev_set &= ~FD_ACCEPT;
#endif
native_socket = ::accept(sock.socket, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen); native_socket = ::accept(sock.socket, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen);
if (native_socket != -1 || (result = get_last_error(!sock.so_nbio))) if (native_socket != -1 || (result = get_last_error(!sock.so_nbio)))
@ -574,9 +571,6 @@ error_code sys_net_bnet_connect(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sockaddr
{ {
if (events & lv2_socket::poll::write) if (events & lv2_socket::poll::write)
{ {
#ifdef _WIN32
sock.ev_set &= ~FD_CONNECT;
#endif
int native_error; int native_error;
::socklen_t size = sizeof(native_error); ::socklen_t size = sizeof(native_error);
if (::getsockopt(sock.socket, SOL_SOCKET, SO_ERROR, reinterpret_cast<char*>(&native_error), &size) != 0 || size != sizeof(int)) if (::getsockopt(sock.socket, SOL_SOCKET, SO_ERROR, reinterpret_cast<char*>(&native_error), &size) != 0 || size != sizeof(int))
@ -605,9 +599,6 @@ error_code sys_net_bnet_connect(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sockaddr
{ {
if (events & lv2_socket::poll::write) if (events & lv2_socket::poll::write)
{ {
#ifdef _WIN32
sock.ev_set &= ~FD_CONNECT;
#endif
int native_error; int native_error;
::socklen_t size = sizeof(native_error); ::socklen_t size = sizeof(native_error);
if (::getsockopt(sock.socket, SOL_SOCKET, SO_ERROR, reinterpret_cast<char*>(&native_error), &size) != 0 || size != sizeof(int)) if (::getsockopt(sock.socket, SOL_SOCKET, SO_ERROR, reinterpret_cast<char*>(&native_error), &size) != 0 || size != sizeof(int))
@ -1028,9 +1019,6 @@ error_code sys_net_bnet_recvfrom(ppu_thread& ppu, s32 s, vm::ptr<void> buf, u32
//if (!(sock.events & lv2_socket::poll::read)) //if (!(sock.events & lv2_socket::poll::read))
{ {
#ifdef _WIN32
if (!(native_flags & MSG_PEEK)) sock.ev_set &= ~FD_READ;
#endif
native_result = ::recvfrom(sock.socket, reinterpret_cast<char*>(buf.get_ptr()), len, native_flags, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen); native_result = ::recvfrom(sock.socket, reinterpret_cast<char*>(buf.get_ptr()), len, native_flags, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen);
if (native_result >= 0) if (native_result >= 0)
@ -1052,9 +1040,6 @@ error_code sys_net_bnet_recvfrom(ppu_thread& ppu, s32 s, vm::ptr<void> buf, u32
{ {
if (events & lv2_socket::poll::read) if (events & lv2_socket::poll::read)
{ {
#ifdef _WIN32
if (!(native_flags & MSG_PEEK)) sock.ev_set &= ~FD_READ;
#endif
native_result = ::recvfrom(sock.socket, reinterpret_cast<char*>(buf.get_ptr()), len, native_flags, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen); native_result = ::recvfrom(sock.socket, reinterpret_cast<char*>(buf.get_ptr()), len, native_flags, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen);
if (native_result >= 0 || (result = get_last_error(!sock.so_nbio && (flags & SYS_NET_MSG_DONTWAIT) == 0))) if (native_result >= 0 || (result = get_last_error(!sock.so_nbio && (flags & SYS_NET_MSG_DONTWAIT) == 0)))
@ -1204,9 +1189,6 @@ error_code sys_net_bnet_sendto(ppu_thread& ppu, s32 s, vm::cptr<void> buf, u32 l
//if (!(sock.events & lv2_socket::poll::write)) //if (!(sock.events & lv2_socket::poll::write))
{ {
#ifdef _WIN32
sock.ev_set &= ~FD_WRITE;
#endif
native_result = ::sendto(sock.socket, reinterpret_cast<const char*>(buf.get_ptr()), len, native_flags, addr ? reinterpret_cast<struct sockaddr*>(&name) : nullptr, addr ? namelen : 0); native_result = ::sendto(sock.socket, reinterpret_cast<const char*>(buf.get_ptr()), len, native_flags, addr ? reinterpret_cast<struct sockaddr*>(&name) : nullptr, addr ? namelen : 0);
if (native_result >= 0) if (native_result >= 0)
@ -1228,9 +1210,6 @@ error_code sys_net_bnet_sendto(ppu_thread& ppu, s32 s, vm::cptr<void> buf, u32 l
{ {
if (events & lv2_socket::poll::write) if (events & lv2_socket::poll::write)
{ {
#ifdef _WIN32
sock.ev_set &= ~FD_WRITE;
#endif
native_result = ::sendto(sock.socket, reinterpret_cast<const char*>(buf.get_ptr()), len, native_flags, addr ? reinterpret_cast<struct sockaddr*>(&name) : nullptr, addr ? namelen : 0); native_result = ::sendto(sock.socket, reinterpret_cast<const char*>(buf.get_ptr()), len, native_flags, addr ? reinterpret_cast<struct sockaddr*>(&name) : nullptr, addr ? namelen : 0);
if (native_result >= 0 || (result = get_last_error(!sock.so_nbio && (flags & SYS_NET_MSG_DONTWAIT) == 0))) if (native_result >= 0 || (result = get_last_error(!sock.so_nbio && (flags & SYS_NET_MSG_DONTWAIT) == 0)))

2
rpcs3/Emu/Cell/lv2/sys_net.h
View file

@ -334,8 +334,6 @@ struct lv2_socket final
shared_mutex mutex; shared_mutex mutex;
#ifdef _WIN32 #ifdef _WIN32
// Remember events (WSAEnumNetworkEvents)
u32 ev_set = 0;
// Tracks connect for WSAPoll workaround // Tracks connect for WSAPoll workaround
bool is_connecting = false; bool is_connecting = false;
#endif #endif