The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-23 08:11:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix svcSignalProcessWideKey and svcWaitSynchronization timeout overflow

Browse Source 
This commit mainly just fixes svcSignalProcessWideKey and svcWaitSynchronization and their related issues.
This commit is contained in:
◱ PixelyIon 2020-01-13 02:07:22 +05:30 committed by ◱ PixelyIon
parent 493a1a93ec
commit 36f05ee7e0
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
app/src/main/cpp/.clang-tidy → .clang-tidy
View File

19
app/src/main/cpp/skyline/kernel/svc.cpp
View File

@ -314,8 +314,9 @@ namespace skyline::kernel::svc {
} }
objectTable.push_back(std::static_pointer_cast<type::KSyncObject>(object)); objectTable.push_back(std::static_pointer_cast<type::KSyncObject>(object));
} }
state.logger->Debug("svcWaitSynchronization: Waiting on handles:\n{}Timeout: 0x{:X} ns", handleStr, state.ctx->registers.x3); auto timeout = state.ctx->registers.x3;
auto timeout = state.ctx->registers.x3 + GetCurrTimeNs(); state.logger->Debug("svcWaitSynchronization: Waiting on handles:\n{}Timeout: 0x{:X} ns", handleStr, timeout);
auto start = GetCurrTimeNs();
while (true) { while (true) {
uint index{}; uint index{};
for (const auto &object : objectTable) { for (const auto &object : objectTable) {
@ -327,7 +328,8 @@ namespace skyline::kernel::svc {
} }
index++; index++;
} }
if (GetCurrTimeNs() >= timeout) { if ((GetCurrTimeNs() - start) >= timeout) {
state.logger->Debug("svcWaitSynchronization: Wait has timed out");
state.ctx->registers.w0 = constant::status::Timeout; state.ctx->registers.w0 = constant::status::Timeout;
return; return;
} }
@ -397,14 +399,15 @@ namespace skyline::kernel::svc {
void SignalProcessWideKey(DeviceState &state) { void SignalProcessWideKey(DeviceState &state) {
auto address = state.ctx->registers.x0; auto address = state.ctx->registers.x0;
auto count = state.ctx->registers.x1; auto count = state.ctx->registers.w1;
try { try {
state.logger->Debug("svcSignalProcessWideKey: Signalling Conditional-Variable at 0x{:X} for {}", address, count); state.logger->Debug("svcSignalProcessWideKey: Signalling Conditional-Variable at 0x{:X} for {}", address, count);
auto &cvar = state.process->condVarMap.at(address); auto &cvar = state.process->condVarMap.at(address);
/* if(count == UINT32_MAX)
for (u32 iter = 0; iter < count; iter++) pthread_cond_broadcast(&cvar);
pthread_cond_signal(&cvar); else
*/ for (u32 iter = 0; iter < count; iter++)
pthread_cond_signal(&cvar);
} catch (const std::out_of_range &) { } catch (const std::out_of_range &) {
state.logger->Debug("svcSignalProcessWideKey: No Conditional-Variable at 0x{:X}", address); state.logger->Debug("svcSignalProcessWideKey: No Conditional-Variable at 0x{:X}", address);
state.process->condVarMap[address] = PTHREAD_COND_INITIALIZER; state.process->condVarMap[address] = PTHREAD_COND_INITIALIZER;