hle: kernel: svc: Migrate CreateThread.

merge-requests/60/head
bunnei 2021-04-02 23:50:39 +07:00
parent 0eeecde67c
commit de4746ff69
1 changed files with 21 additions and 14 deletions

@ -1521,6 +1521,7 @@ static ResultCode CreateThread(Core::System& system, Handle* out_handle, VAddr e
return ResultInvalidPriority; return ResultInvalidPriority;
} }
// Reserve a new thread from the process resource limit (waiting up to 100ms).
KScopedResourceReservation thread_reservation( KScopedResourceReservation thread_reservation(
kernel.CurrentProcess(), LimitableResource::Threads, 1, kernel.CurrentProcess(), LimitableResource::Threads, 1,
system.CoreTiming().GetGlobalTimeNs().count() + 100000000); system.CoreTiming().GetGlobalTimeNs().count() + 100000000);
@ -1529,27 +1530,33 @@ static ResultCode CreateThread(Core::System& system, Handle* out_handle, VAddr e
return ResultResourceLimitedExceeded; return ResultResourceLimitedExceeded;
} }
std::shared_ptr<KThread> thread; // Create the thread.
KThread* thread = KThread::CreateWithKernel(kernel);
if (!thread) {
LOG_ERROR(Kernel_SVC, "Unable to create new threads. Thread creation limit reached.");
return ResultOutOfResource;
}
SCOPE_EXIT({ thread->Close(); });
// Initialize the thread.
{ {
KScopedLightLock lk{process.GetStateLock()}; KScopedLightLock lk{process.GetStateLock()};
CASCADE_RESULT(thread, R_TRY(KThread::InitializeUserThread(system, thread, entry_point, arg, stack_bottom,
KThread::CreateUserThread(system, ThreadType::User, "", entry_point, priority, core_id, &process));
priority, arg, core_id, stack_bottom, &process));
} }
const auto new_thread_handle = process.GetHandleTable().Create(thread);
if (new_thread_handle.Failed()) {
LOG_ERROR(Kernel_SVC, "Failed to create handle with error=0x{:X}",
new_thread_handle.Code().raw);
return new_thread_handle.Code();
}
*out_handle = *new_thread_handle;
// Set the thread name for debugging purposes. // Set the thread name for debugging purposes.
thread->SetName( thread->SetName(fmt::format("thread[entry_point={:X}, handle={:X}]", entry_point, *out_handle));
fmt::format("thread[entry_point={:X}, handle={:X}]", entry_point, *new_thread_handle));
// Commit the thread reservation.
thread_reservation.Commit(); thread_reservation.Commit();
// Register the new thread.
KThread::Register(thread);
// Add the thread to the handle table.
R_TRY(process.GetHandleTable().Add(out_handle, thread));
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }