mirrors/Atmosphere
0
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-04-23 13:04:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 46cd7e8847 into 28e4d4411d

Browse source
This commit is contained in:
Juan Antonio Hernández Cánovas 2018-09-07 18:33:50 +00:00 • committed by GitHub
commit 4e5086cd94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
stratosphere/libstratosphere/source/multithreadedwaitablemanager.cpp
View file

@ -58,6 +58,12 @@ IWaitable *MultiThreadedWaitableManager::get_waitable() {
handles.resize(this->waitables.size());
std::transform(this->waitables.begin(), this->waitables.end(), handles.begin(), [](IWaitable *w) { return w->get_handle(); });
if(this->waitables.size() == 0) {
continue;
}
if(this->waitables.size() > 0x40) {
/* TODO: panic. Too many waitables */
}
rc = svcWaitSynchronization(&handle_index, handles.data(), this->waitables.size(), this->timeout);
IWaitable *w = this->waitables[handle_index];
if (R_SUCCEEDED(rc)) {
@ -66,7 +72,20 @@ IWaitable *MultiThreadedWaitableManager::get_waitable() {
} else if (rc == 0xEA01) {
/* Timeout. */
std::for_each(waitables.begin(), waitables.end(), std::mem_fn(&IWaitable::update_priority));
} else if (rc != 0xF601 && rc != 0xE401) {
} else if (rc == 0xE401) {
/* Invalid handle */
/* handle_index does not get updated when this happens
so we don't know which waitable is the problem.
However switchbrew says that svcWaitSynchronization
does not accept 0xFFFF8001 or 0xFFFF8000 as handles
so we could at least remove them if any exists */
for(auto it = waitables.begin(); it != waitables.end(); it++) {
if((*it)->get_handle() == 0xFFFF8000 || (*it)->get_handle() == 0xFFFF8001) {
waitables.erase(it);
}
}
} else if (rc != 0xF601) {
/* TODO: Panic. When can this happen? */
} else {
std::for_each(waitables.begin(), waitables.begin() + handle_index, std::mem_fn(&IWaitable::update_priority));

22
stratosphere/libstratosphere/source/waitablemanager.cpp
View file

@ -51,7 +51,12 @@ void WaitableManager::process_internal(bool break_on_timeout) {
handles.resize(this->waitables.size());
std::transform(this->waitables.begin(), this->waitables.end(), handles.begin(), [](IWaitable *w) { return w->get_handle(); });
if(this->waitables.size() == 0) {
continue;
}
if(this->waitables.size() > 0x40) {
/* TODO: panic. Too many waitables */
}
rc = svcWaitSynchronization(&handle_index, handles.data(), this->waitables.size(), this->timeout);
if (R_SUCCEEDED(rc)) {
/* Handle a signaled waitable. */
@ -66,8 +71,21 @@ void WaitableManager::process_internal(bool break_on_timeout) {
if (break_on_timeout) {
return;
}
} else if (rc == 0xE401) {
/* Invalid handle */
/* handle_index does not get updated when this happens
so we don't know which waitable is the problem.
However switchbrew says that svcWaitSynchronization
does not accept 0xFFFF8001 or 0xFFFF8000 as handles
so we could at least remove them if any exists */
for(auto it = waitables.begin(); it != waitables.end(); it++) {
if((*it)->get_handle() == 0xFFFF8000 || (*it)->get_handle() == 0xFFFF8001) {
waitables.erase(it);
}
}
} else if (rc != 0xF601) {
/* TODO: Panic. When can this happen? */
/* TODO: panic. When can this happen? */
}
if (rc == 0xF601) {