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

Stratosphere: Replace more raw loops with algorithms

Browse source
This commit is contained in:
Tony Wasserka 2018-06-16 17:39:09 +02:00
parent c66b30a31d
commit 05f908da1f
2 changed files with 27 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
stratosphere/libstratosphere/include/stratosphere/domainowner.hpp
View file

@ -1,5 +1,6 @@
#pragma once
#include <switch.h>
#include <algorithm>
#include <memory>
#include <type_traits>
@ -11,18 +12,13 @@ class IServiceObject;
class DomainOwner {
private:
std::shared_ptr<IServiceObject> domain_objects[DOMAIN_ID_MAX];
std::array<std::shared_ptr<IServiceObject>, DOMAIN_ID_MAX> domain_objects;
public:
DomainOwner() {
for (unsigned int i = 0; i < DOMAIN_ID_MAX; i++) {
domain_objects[i].reset();
}
}
virtual ~DomainOwner() {
/* Shared ptrs should auto delete here. */
}
DomainOwner() = default;
/* Shared ptrs should auto delete here. */
virtual ~DomainOwner() = default;
std::shared_ptr<IServiceObject> get_domain_object(unsigned int i) {
if (i < DOMAIN_ID_MAX) {
return domain_objects[i];
@ -31,15 +27,15 @@ class DomainOwner {
}
Result reserve_object(std::shared_ptr<IServiceObject> object, unsigned int *out_i) {
for (unsigned int i = 4; i < DOMAIN_ID_MAX; i++) {
if (domain_objects[i] == NULL) {
domain_objects[i] = object;
object->set_owner(this);
*out_i = i;
return 0;
}
auto object_it = std::find(domain_objects.begin() + 4, domain_objects.end(), nullptr);
if (object_it == domain_objects.end()) {
return 0x1900B;
}
return 0x1900B;
*out_i = std::distance(domain_objects.begin(), object_it);
*object_it = object;
(*object_it)->set_owner(this);
return 0;
}
Result set_object(std::shared_ptr<IServiceObject> object, unsigned int i) {
@ -52,26 +48,18 @@ class DomainOwner {
}
unsigned int get_object_id(std::shared_ptr<IServiceObject> object) {
for (unsigned int i = 0; i < DOMAIN_ID_MAX; i++) {
if (domain_objects[i] == object) {
return i;
}
}
return DOMAIN_ID_MAX;
auto object_it = std::find(domain_objects.begin(), domain_objects.end(), object);
return std::distance(domain_objects.begin(), object_it);
}
void delete_object(unsigned int i) {
if (domain_objects[i]) {
domain_objects[i].reset();
}
domain_objects[i].reset();
}
void delete_object(std::shared_ptr<IServiceObject> object) {
for (unsigned int i = 0; i < DOMAIN_ID_MAX; i++) {
if (domain_objects[i] == object) {
domain_objects[i].reset();
break;
}
auto object_it = std::find(domain_objects.begin(), domain_objects.end(), object);
if (object_it != domain_objects.end()) {
object_it->reset();
}
}
};
};

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

@ -1,6 +1,7 @@
#include <switch.h>
#include <algorithm>
#include <functional>
#include <stratosphere/multithreadedwaitablemanager.hpp>
@ -44,21 +45,15 @@ IWaitable *MultiThreadedWaitableManager::get_waitable() {
rc = svcWaitSynchronization(&handle_index, handles.data(), this->waitables.size(), this->timeout);
IWaitable *w = this->waitables[handle_index];
if (R_SUCCEEDED(rc)) {
for (int i = 0; i < handle_index; i++) {
this->waitables[i]->update_priority();
}
std::for_each(waitables.begin(), waitables.begin() + handle_index, std::mem_fn(&IWaitable::update_priority));
this->waitables.erase(this->waitables.begin() + handle_index);
} else if (rc == 0xEA01) {
/* Timeout. */
for (auto & waitable : this->waitables) {
waitable->update_priority();
}
std::for_each(waitables.begin(), waitables.end(), std::mem_fn(&IWaitable::update_priority));
} else if (rc != 0xF601 && rc != 0xE401) {
/* TODO: Panic. When can this happen? */
} else {
for (int i = 0; i < handle_index; i++) {
this->waitables[i]->update_priority();
}
std::for_each(waitables.begin(), waitables.begin() + handle_index, std::mem_fn(&IWaitable::update_priority));
this->waitables.erase(this->waitables.begin() + handle_index);
delete w;
}
@ -107,4 +102,4 @@ void MultiThreadedWaitableManager::thread_func(void *t) {
}
}
}
}
}