kern: KObjectContainer::Register -> void

This commit is contained in:
Michael Scire 2020-12-01 13:49:30 -08:00
parent 59ada14680
commit 2e0378c724
15 changed files with 19 additions and 23 deletions

View file

@ -56,8 +56,8 @@ namespace ams::kern {
void Initialize() { MESOSPHERE_ASSERT_THIS(); }
void Finalize() { MESOSPHERE_ASSERT_THIS(); }
Result Register(KAutoObjectWithList *obj);
Result Unregister(KAutoObjectWithList *obj);
void Register(KAutoObjectWithList *obj);
void Unregister(KAutoObjectWithList *obj);
size_t GetOwnedCount(KProcess *owner);
};

View file

@ -108,7 +108,7 @@ namespace ams::kern {
return obj;
}
static Result Register(Derived *obj) {
static void Register(Derived *obj) {
return s_container.Register(obj);
}

View file

@ -18,24 +18,20 @@
namespace ams::kern {
Result KAutoObjectWithListContainer::Register(KAutoObjectWithList *obj) {
void KAutoObjectWithListContainer::Register(KAutoObjectWithList *obj) {
MESOSPHERE_ASSERT_THIS();
KScopedLightLock lk(this->lock);
this->object_list.insert(*obj);
return ResultSuccess();
}
Result KAutoObjectWithListContainer::Unregister(KAutoObjectWithList *obj) {
void KAutoObjectWithListContainer::Unregister(KAutoObjectWithList *obj) {
MESOSPHERE_ASSERT_THIS();
KScopedLightLock lk(this->lock);
this->object_list.erase(this->object_list.iterator_to(*obj));
return ams::svc::ResultNotFound();
}
size_t KAutoObjectWithListContainer::GetOwnedCount(KProcess *owner) {

View file

@ -56,7 +56,7 @@ namespace ams::kern::svc {
R_TRY(code_mem->Initialize(address, size));
/* Register the code memory. */
R_TRY(KCodeMemory::Register(code_mem));
KCodeMemory::Register(code_mem);
/* Add the code memory to the handle table. */
R_TRY(GetCurrentProcess().GetHandleTable().Add(out, code_mem));

View file

@ -43,7 +43,7 @@ namespace ams::kern::svc {
R_TRY(das->Initialize(das_address, das_size));
/* Register the device address space. */
R_TRY(KDeviceAddressSpace::Register(das));
KDeviceAddressSpace::Register(das);
/* Add to the handle table. */
R_TRY(GetCurrentProcess().GetHandleTable().Add(out, das));

View file

@ -81,7 +81,7 @@ namespace ams::kern::svc {
};
/* Register the event. */
R_TRY(KEvent::Register(event));
KEvent::Register(event);
/* Add the writable event to the handle table. */
R_TRY(handle_table.Add(out_write, std::addressof(event->GetWritableEvent())));

View file

@ -51,7 +51,7 @@ namespace ams::kern::svc {
R_TRY(event->Initialize(interrupt_id, type));
/* Register the event. */
R_TRY(KInterruptEvent::Register(event));
KInterruptEvent::Register(event);
/* Add the event to the handle table. */
R_TRY(handle_table.Add(out, event));

View file

@ -187,7 +187,7 @@ namespace ams::kern::svc {
};
/* Register the event. */
R_TRY(KEvent::Register(event));
KEvent::Register(event);
/* Add the readable event to the handle table. */
R_TRY(handle_table.Add(out_event_handle, std::addressof(event->GetReadableEvent())));

View file

@ -46,7 +46,7 @@ namespace ams::kern::svc {
port->Initialize(max_sessions, false, 0);
/* Register the port. */
R_TRY(KPort::Register(port));
KPort::Register(port);
/* Register the handle in the table. */
handle_table.Register(*out_server_handle, std::addressof(port->GetServerPort()));
@ -95,7 +95,7 @@ namespace ams::kern::svc {
};
/* Register the port. */
R_TRY(KPort::Register(port));
KPort::Register(port);
/* Add the client to the handle table. */
R_TRY(handle_table.Add(out_client, std::addressof(port->GetClientPort())));

View file

@ -230,7 +230,7 @@ namespace ams::kern::svc {
R_TRY(process->Initialize(params, user_caps, num_caps, process_resource_limit, pool));
/* Register the process. */
R_TRY(KProcess::Register(process));
KProcess::Register(process);
/* Add the process to the handle table. */
R_TRY(handle_table.Add(out, process));

View file

@ -78,8 +78,8 @@ namespace ams::kern::svc {
/* Initialize the resource limit. */
resource_limit->Initialize();
/* Try to register the limit. */
R_TRY(KResourceLimit::Register(resource_limit));
/* Register the limit. */
KResourceLimit::Register(resource_limit);
/* Add the limit to the handle table. */
R_TRY(GetCurrentProcess().GetHandleTable().Add(out_handle, resource_limit));

View file

@ -48,7 +48,7 @@ namespace ams::kern::svc {
};
/* Register the session. */
R_TRY(T::Register(session));
T::Register(session);
/* Add the server session to the handle table. */
R_TRY(handle_table.Add(out_server, std::addressof(session->GetServerSession())));

View file

@ -117,7 +117,7 @@ namespace ams::kern::svc {
R_TRY(shmem->Initialize(GetCurrentProcessPointer(), size, owner_perm, remote_perm));
/* Register the shared memory. */
R_TRY(KSharedMemory::Register(shmem));
KSharedMemory::Register(shmem);
/* Add the shared memory to the handle table. */
R_TRY(GetCurrentProcess().GetHandleTable().Add(out, shmem));

View file

@ -61,7 +61,7 @@ namespace ams::kern::svc {
thread->GetContext().CloneFpuStatus();
/* Register the new thread. */
R_TRY(KThread::Register(thread));
KThread::Register(thread);
/* Add the thread to the handle table. */
R_TRY(process.GetHandleTable().Add(out, thread));

View file

@ -111,7 +111,7 @@ namespace ams::kern::svc {
trmem_reservation.Commit();
/* Register the transfer memory. */
R_TRY(KTransferMemory::Register(trmem));
KTransferMemory::Register(trmem);
/* Add the transfer memory to the handle table. */
R_TRY(handle_table.Add(out, trmem));