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

Remove lambda in sys_net_bnet_poll

Browse source
This commit is contained in:
Nekotekina 2020-06-06 03:10:40 +03:00
parent 5d27f1c732
commit 3d7c38ff9d
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1872,13 +1872,13 @@ error_code sys_net_bnet_poll(ppu_thread& ppu, vm::ptr<sys_net_pollfd> fds, s32 n
std::vector<sys_net_pollfd> fds_buf; std::vector<sys_net_pollfd> fds_buf;
if (auto res = [&]() -> std::pair<bool, u32> if (true)
{ {
fds_buf.assign(fds.get_ptr(), fds.get_ptr() + nfds); fds_buf.assign(fds.get_ptr(), fds.get_ptr() + nfds);
std::lock_guard nw_lock(g_fxo->get<network_context>()->s_nw_mutex); std::unique_lock nw_lock(g_fxo->get<network_context>()->s_nw_mutex);
reader_lock lock(id_manager::g_mutex); std::shared_lock lock(id_manager::g_mutex);
::pollfd _fds[1024]{}; ::pollfd _fds[1024]{};
#ifdef _WIN32 #ifdef _WIN32
@ -1942,7 +1942,10 @@ error_code sys_net_bnet_poll(ppu_thread& ppu, vm::ptr<sys_net_pollfd> fds, s32 n
if (ms == 0 || signaled) if (ms == 0 || signaled)
{ {
return {true, +signaled}; lock.unlock();
nw_lock.unlock();
std::memcpy(fds.get_ptr(), fds_buf.data(), nfds * sizeof(fds[0]));
return not_an_error(signaled);
} }
for (s32 i = 0; i < nfds; i++) for (s32 i = 0; i < nfds; i++)
@ -1993,11 +1996,6 @@ error_code sys_net_bnet_poll(ppu_thread& ppu, vm::ptr<sys_net_pollfd> fds, s32 n
} }
lv2_obj::sleep(ppu, timeout); lv2_obj::sleep(ppu, timeout);
return {false, 0};
}(); res.first)
{
std::memcpy(fds.get_ptr(), fds_buf.data(), nfds * sizeof(fds[0]));
return not_an_error(res.second);
} }
while (!ppu.state.test_and_reset(cpu_flag::signal)) while (!ppu.state.test_and_reset(cpu_flag::signal))