mika/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-07-04 16:42:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

fs.mitm: Use unique_ptr

Browse Source
This commit is contained in:
Tony Wasserka 2018-06-16 17:09:15 +02:00
parent 0b41d57b0c
commit 1fdb9696b5
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
stratosphere/fs_mitm/source/fsmitm_main.cpp
View File

@ -99,8 +99,8 @@ int main(int argc, char **argv)
} }
/* TODO: What's a good timeout value to use here? */ /* TODO: What's a good timeout value to use here? */
MultiThreadedWaitableManager *server_manager = new MultiThreadedWaitableManager(1, U64_MAX, 0x20000); auto server_manager = std::make_unique<MultiThreadedWaitableManager>(1, U64_MAX, 0x20000);
//WaitableManager *server_manager = new WaitableManager(U64_MAX); //auto server_manager = std::make_unique<WaitableManager>(U64_MAX);
/* Create fsp-srv mitm. */ /* Create fsp-srv mitm. */
ISession<MitMQueryService<FsMitMService>> *fs_query_srv = NULL; ISession<MitMQueryService<FsMitMService>> *fs_query_srv = NULL;
@ -110,9 +110,7 @@ int main(int argc, char **argv)
/* Loop forever, servicing our services. */ /* Loop forever, servicing our services. */
server_manager->process(); server_manager->process();
/* Cleanup. */ return 0;
delete server_manager;
return 0;
} }

6
stratosphere/fs_mitm/source/fsmitm_worker.cpp
View File

@ -7,7 +7,7 @@ static SystemEvent *g_new_waitable_event = NULL;
static HosMutex g_new_waitable_mutex; static HosMutex g_new_waitable_mutex;
static HosSemaphore g_sema_new_waitable_finish; static HosSemaphore g_sema_new_waitable_finish;
static WaitableManager *g_worker_waiter = NULL; static std::unique_ptr<WaitableManager> g_worker_waiter;
Result FsMitMWorker::AddWaitableCallback(void *arg, Handle *handles, size_t num_handles, u64 timeout) { Result FsMitMWorker::AddWaitableCallback(void *arg, Handle *handles, size_t num_handles, u64 timeout) {
(void)arg; (void)arg;
@ -29,11 +29,9 @@ void FsMitMWorker::Main(void *arg) {
g_new_waitable_event = new SystemEvent(NULL, &FsMitMWorker::AddWaitableCallback); g_new_waitable_event = new SystemEvent(NULL, &FsMitMWorker::AddWaitableCallback);
/* Make a new waitable manager. */ /* Make a new waitable manager. */
g_worker_waiter = new WaitableManager(U64_MAX); g_worker_waiter = std::make_unique<WaitableManager>(U64_MAX);
g_worker_waiter->add_waitable(g_new_waitable_event); g_worker_waiter->add_waitable(g_new_waitable_event);
/* Service processes. */ /* Service processes. */
g_worker_waiter->process(); g_worker_waiter->process();
delete g_worker_waiter;
} }