mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-05-30 06:25:20 -04:00
Code Issues Projects Releases Packages Wiki Activity

strat: no longer materially constrained by sm session limit

Browse source
This commit is contained in:
Michael Scire 2021-04-13 23:58:10 -07:00
parent 997e4dd665
commit 2e1a93f1d1
37 changed files with 215 additions and 333 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libraries/libstratosphere/include/stratosphere/sm.hpp
View file

@ -19,7 +19,6 @@
#include <stratosphere/sm/sm_types.hpp>
#include <stratosphere/sm/sm_api.hpp>
#include <stratosphere/sm/sm_mitm_api.hpp>
#include <stratosphere/sm/sm_scoped_holder.hpp>
#include <stratosphere/sm/sm_manager_api.hpp>

17
libraries/libstratosphere/include/stratosphere/sm/sm_api.hpp
View file

@ -20,6 +20,10 @@
namespace ams::sm {
/* Initialization. */
Result Initialize();
Result Finalize();
/* Ordinary SM API. */
Result GetService(Service *out, ServiceName name);
Result RegisterService(Handle *out, ServiceName name, size_t max_sessions, bool is_light);
@ -29,17 +33,4 @@ namespace ams::sm {
Result HasService(bool *out, ServiceName name);
Result WaitService(ServiceName name);
/* Scoped session access. */
namespace impl {
void DoWithSessionImpl(void (*Invoker)(void *), void *Function);
}
template<typename F>
NX_CONSTEXPR void DoWithSession(F f) {
auto invoker = +[](void *func) { (*(F *)func)(); };
impl::DoWithSessionImpl(invoker, &f);
}
}

91
libraries/libstratosphere/include/stratosphere/sm/sm_scoped_holder.hpp
View file

@ -1,91 +0,0 @@
/*
* Copyright (c) 2018-2020 Atmosphère-NX
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
* version 2, as published by the Free Software Foundation.
*
* This program is distributed in the hope it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "sm_api.hpp"
namespace ams::sm {
/* Utility, for scoped access to libnx services. */
template<auto Initializer(), void Finalizer()>
class ScopedServiceHolder {
NON_COPYABLE(ScopedServiceHolder);
private:
Result result;
bool has_initialized;
public:
ScopedServiceHolder(bool initialize = true) : result(ResultSuccess()), has_initialized(false) {
if (initialize) {
this->Initialize();
}
}
~ScopedServiceHolder() {
if (this->has_initialized) {
this->Finalize();
}
}
ScopedServiceHolder(ScopedServiceHolder&& rhs) {
this->result = rhs.result;
this->has_initialized = rhs.has_initialized;
rhs.result = ResultSuccess();
rhs.has_initialized = false;
}
ScopedServiceHolder &operator=(ScopedServiceHolder&& rhs) {
rhs.Swap(*this);
return *this;
}
void Swap(ScopedServiceHolder &rhs) {
std::swap(this->result, rhs.result);
std::swap(this->has_initialized, rhs.has_initialized);
}
explicit operator bool() const {
return this->has_initialized;
}
Result Initialize() {
AMS_ABORT_UNLESS(!this->has_initialized);
sm::DoWithSession([&]() {
if constexpr (std::is_same<decltype(Initializer()), void>::value) {
Initializer();
this->result = ResultSuccess();
} else {
this->result = Initializer();
}
});
this->has_initialized = R_SUCCEEDED(this->result);
return this->result;
}
void Finalize() {
AMS_ABORT_UNLESS(this->has_initialized);
Finalizer();
this->has_initialized = false;
}
Result GetResult() const {
return this->result;
}
};
}