OmniNX/Atmosphere-Pro
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

htc: fix event wait loops for rpc clients

Browse Source
This commit is contained in:
Michael Scire authored and SciresM committed 2021-02-24 04:06:54 -08:00
1 parent f28a410ba0
commit 99a38dce32
4 files changed
+19 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libraries/libstratosphere/source/htc/server/rpc/htc_htcmisc_rpc_server.cpp
+7 -9
View File
@@ -84,21 +84,19 @@ namespace ams::htc::server::rpc {
if (os::TryWaitEvent(event)) {
return 1;
}
if (m_driver->GetChannelState(m_channel_id) == state) {
return 0;
}
/* Wait. */
while (true) {
while (m_driver->GetChannelState(m_channel_id) != state) {
const auto idx = os::WaitAny(m_driver->GetChannelStateEvent(m_channel_id), event);
if (idx == 0) {
if (m_driver->GetChannelState(m_channel_id) == state) {
return 0;
}
} else {
if (idx != 0) {
return idx;
}
/* Clear the channel state event. */
os::ClearEvent(m_driver->GetChannelStateEvent(m_channel_id));
}
return 0;
}
Result HtcmiscRpcServer::ReceiveThread() {
libraries/libstratosphere/source/htc/server/rpc/htc_rpc_client.cpp
+7 -9
View File
@@ -184,21 +184,19 @@ namespace ams::htc::server::rpc {
if (os::TryWaitEvent(event)) {
return 1;
}
if (m_driver->GetChannelState(m_channel_id) == state) {
return 0;
}
/* Wait. */
while (true) {
while (m_driver->GetChannelState(m_channel_id) != state) {
const auto idx = os::WaitAny(m_driver->GetChannelStateEvent(m_channel_id), event);
if (idx == 0) {
if (m_driver->GetChannelState(m_channel_id) == state) {
return 0;
}
} else {
if (idx != 0) {
return idx;
}
/* Clear the channel state event. */
os::ClearEvent(m_driver->GetChannelStateEvent(m_channel_id));
}
return 0;
}
Result RpcClient::ReceiveThread() {
libraries/libstratosphere/source/htcfs/htcfs_client_impl.cpp
+1 -1
View File
@@ -147,7 +147,7 @@ namespace ams::htcfs {
}
/* Clear the channel state event. */
os::ClearEvent(channel_state_event);;
os::ClearEvent(channel_state_event);
}
return idx;
}
libraries/libstratosphere/source/htcs/impl/htcs_monitor.cpp
+4 -1
View File
@@ -77,7 +77,10 @@ namespace ams::htcs::impl {
}
/* 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;
}