nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-09-20 07:08:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

htc: fix event wait loops for rpc clients

Browse source
This commit is contained in:
Michael Scire 2021-02-12 07:03:55 -08:00 committed by SciresM
parent f28a410ba0
commit 99a38dce32
4 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/libstratosphere/source/htc/server/rpc/htc_htcmisc_rpc_server.cpp
View file

@ -84,21 +84,19 @@ namespace ams::htc::server::rpc {
if (os::TryWaitEvent(event)) { if (os::TryWaitEvent(event)) {
return 1; return 1;
} }
if (m_driver->GetChannelState(m_channel_id) == state) {
return 0;
}
/* Wait. */ /* Wait. */
while (true) { while (m_driver->GetChannelState(m_channel_id) != state) {
const auto idx = os::WaitAny(m_driver->GetChannelStateEvent(m_channel_id), event); const auto idx = os::WaitAny(m_driver->GetChannelStateEvent(m_channel_id), event);
if (idx == 0) { if (idx != 0) {
if (m_driver->GetChannelState(m_channel_id) == state) {
return 0;
}
} else {
return idx; return idx;
} }
/* Clear the channel state event. */
os::ClearEvent(m_driver->GetChannelStateEvent(m_channel_id));
} }
return 0;
} }
Result HtcmiscRpcServer::ReceiveThread() { Result HtcmiscRpcServer::ReceiveThread() {

16
libraries/libstratosphere/source/htc/server/rpc/htc_rpc_client.cpp
View file

@ -184,21 +184,19 @@ namespace ams::htc::server::rpc {
if (os::TryWaitEvent(event)) { if (os::TryWaitEvent(event)) {
return 1; return 1;
} }
if (m_driver->GetChannelState(m_channel_id) == state) {
return 0;
}
/* Wait. */ /* Wait. */
while (true) { while (m_driver->GetChannelState(m_channel_id) != state) {
const auto idx = os::WaitAny(m_driver->GetChannelStateEvent(m_channel_id), event); const auto idx = os::WaitAny(m_driver->GetChannelStateEvent(m_channel_id), event);
if (idx == 0) { if (idx != 0) {
if (m_driver->GetChannelState(m_channel_id) == state) {
return 0;
}
} else {
return idx; return idx;
} }
/* Clear the channel state event. */
os::ClearEvent(m_driver->GetChannelStateEvent(m_channel_id));
} }
return 0;
} }
Result RpcClient::ReceiveThread() { Result RpcClient::ReceiveThread() {

2
libraries/libstratosphere/source/htcfs/htcfs_client_impl.cpp
View file

@ -147,7 +147,7 @@ namespace ams::htcfs {
} }
/* Clear the channel state event. */ /* Clear the channel state event. */
os::ClearEvent(channel_state_event);; os::ClearEvent(channel_state_event);
} }
return idx; return idx;
} }

5
libraries/libstratosphere/source/htcs/impl/htcs_monitor.cpp
View file

@ -77,7 +77,10 @@ namespace ams::htcs::impl {
} }
/* Start the rpc client. */ /* Start the rpc client. */
if (R_FAILED(m_rpc_client->Start())) { const Result start_result = m_rpc_client->Start();
if (R_FAILED(start_result)) {
/* DEBUG */
R_ABORT_UNLESS(start_result);
continue; continue;
} }