mirror of
https://github.com/Atmosphere-NX/Atmosphere.git
synced 2025-05-24 19:54:22 -04:00
sm: reimplement using tipc instead of cmif (probably broken, untested)
This commit is contained in:
parent
58776f5ba8
commit
57c8bc432d
27 changed files with 904 additions and 735 deletions
|
@ -14,11 +14,7 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include <stratosphere.hpp>
|
||||
#include "sm_user_service.hpp"
|
||||
#include "sm_manager_service.hpp"
|
||||
#include "sm_debug_monitor_service.hpp"
|
||||
#include "impl/sm_service_manager.hpp"
|
||||
#include "impl/sm_wait_list.hpp"
|
||||
#include "sm_tipc_server.hpp"
|
||||
|
||||
extern "C" {
|
||||
extern u32 __start__;
|
||||
|
@ -78,46 +74,6 @@ void __appExit(void) {
|
|||
/* Nothing to clean up, because we're sm. */
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
||||
enum PortIndex {
|
||||
PortIndex_User,
|
||||
PortIndex_Manager,
|
||||
PortIndex_DebugMonitor,
|
||||
PortIndex_Count,
|
||||
};
|
||||
|
||||
class ServerManager final : public sf::hipc::ServerManager<PortIndex_Count> {
|
||||
private:
|
||||
virtual ams::Result OnNeedsToAccept(int port_index, Server *server) override;
|
||||
};
|
||||
|
||||
using Allocator = sf::ExpHeapAllocator;
|
||||
using ObjectFactory = sf::ObjectFactory<sf::ExpHeapAllocator::Policy>;
|
||||
|
||||
alignas(0x40) constinit u8 g_server_allocator_buffer[8_KB];
|
||||
Allocator g_server_allocator;
|
||||
|
||||
ServerManager g_server_manager;
|
||||
|
||||
ams::Result ServerManager::OnNeedsToAccept(int port_index, Server *server) {
|
||||
switch (port_index) {
|
||||
case PortIndex_User:
|
||||
return this->AcceptImpl(server, ObjectFactory::CreateSharedEmplaced<sm::impl::IUserInterface, sm::UserService>(std::addressof(g_server_allocator)));
|
||||
case PortIndex_Manager:
|
||||
return this->AcceptImpl(server, ObjectFactory::CreateSharedEmplaced<sm::impl::IManagerInterface, sm::ManagerService>(std::addressof(g_server_allocator)));
|
||||
case PortIndex_DebugMonitor:
|
||||
return this->AcceptImpl(server, ObjectFactory::CreateSharedEmplaced<sm::impl::IDebugMonitorInterface, sm::DebugMonitorService>(std::addressof(g_server_allocator)));
|
||||
AMS_UNREACHABLE_DEFAULT_CASE();
|
||||
}
|
||||
}
|
||||
|
||||
ams::Result ResumeImpl(os::WaitableHolderType *session_holder) {
|
||||
return g_server_manager.Process(session_holder);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void *operator new(size_t size) {
|
||||
AMS_ABORT("operator new(size_t) was called");
|
||||
}
|
||||
|
@ -144,52 +100,11 @@ int main(int argc, char **argv)
|
|||
os::SetThreadNamePointer(os::GetCurrentThread(), AMS_GET_SYSTEM_THREAD_NAME(sm, Main));
|
||||
AMS_ASSERT(os::GetThreadPriority(os::GetCurrentThread()) == AMS_GET_SYSTEM_THREAD_PRIORITY(sm, Main));
|
||||
|
||||
/* Setup server allocator. */
|
||||
g_server_allocator.Attach(lmem::CreateExpHeap(g_server_allocator_buffer, sizeof(g_server_allocator_buffer), lmem::CreateOption_None));
|
||||
/* Initialize the server. */
|
||||
sm::InitializeTipcServer();
|
||||
|
||||
/* Create sm:, (and thus allow things to register to it). */
|
||||
{
|
||||
Handle sm_h;
|
||||
R_ABORT_UNLESS(svc::ManageNamedPort(&sm_h, "sm:", 0x40));
|
||||
g_server_manager.RegisterServer(PortIndex_User, sm_h);
|
||||
}
|
||||
|
||||
/* Create sm:m manually. */
|
||||
{
|
||||
Handle smm_h;
|
||||
R_ABORT_UNLESS(sm::impl::RegisterServiceForSelf(&smm_h, sm::ServiceName::Encode("sm:m"), 1));
|
||||
g_server_manager.RegisterServer(PortIndex_Manager, smm_h);
|
||||
sm::impl::TestAndResume(ResumeImpl);
|
||||
}
|
||||
|
||||
/*===== ATMOSPHERE EXTENSION =====*/
|
||||
/* Create sm:dmnt manually. */
|
||||
{
|
||||
Handle smdmnt_h;
|
||||
R_ABORT_UNLESS(sm::impl::RegisterServiceForSelf(&smdmnt_h, sm::ServiceName::Encode("sm:dmnt"), 1));
|
||||
g_server_manager.RegisterServer(PortIndex_DebugMonitor, smdmnt_h);
|
||||
sm::impl::TestAndResume(ResumeImpl);
|
||||
}
|
||||
|
||||
/*================================*/
|
||||
|
||||
/* Loop forever, servicing our services. */
|
||||
while (true) {
|
||||
/* Get the next signaled holder. */
|
||||
auto *holder = g_server_manager.WaitSignaled();
|
||||
AMS_ABORT_UNLESS(holder != nullptr);
|
||||
|
||||
/* Process the holder. */
|
||||
R_TRY_CATCH(g_server_manager.Process(holder)) {
|
||||
R_CATCH(sf::ResultRequestDeferred) {
|
||||
sm::impl::ProcessRegisterRetry(holder);
|
||||
continue;
|
||||
}
|
||||
} R_END_TRY_CATCH_WITH_ABORT_UNLESS;
|
||||
|
||||
/* Test to see if anything can be undeferred. */
|
||||
sm::impl::TestAndResume(ResumeImpl);
|
||||
}
|
||||
/* Loop forever, processing our services. */
|
||||
sm::LoopProcessTipcServer();
|
||||
|
||||
/* This can never be reached. */
|
||||
AMS_ASSUME(false);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue