mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-23 12:50:41 +02:00
fixup!
This commit is contained in:
parent
41f74a16fd
commit
25c010dc7d
@ -137,8 +137,10 @@ void Init() {
|
||||
Kernel::ThreadingInit();
|
||||
Kernel::TimersInit();
|
||||
|
||||
Process::next_process_id = 0;
|
||||
Object::next_object_id = 0;
|
||||
// TODO(Subv): Start the process ids from 10 for now, as lower PIDs are
|
||||
// reserved for low-level services
|
||||
Process::next_process_id = 10;
|
||||
}
|
||||
|
||||
/// Shutdown the kernel
|
||||
|
@ -57,12 +57,6 @@ public:
|
||||
|
||||
static u32 next_process_id;
|
||||
|
||||
/*
|
||||
* Gets the process' id
|
||||
* @returns The process' id
|
||||
*/
|
||||
u32 GetProcessId() const { return process_id; }
|
||||
|
||||
/// Name of the process
|
||||
std::string name;
|
||||
/// Title ID corresponding to the process
|
||||
|
@ -426,28 +426,28 @@ static ResultCode ReleaseMutex(Handle handle) {
|
||||
}
|
||||
|
||||
/// Get the ID of the specified process
|
||||
static ResultCode GetProcessId(u32* process_id, Handle handle) {
|
||||
LOG_TRACE(Kernel_SVC, "called process=0x%08X", handle);
|
||||
static ResultCode GetProcessId(u32* process_id, Handle process_handle) {
|
||||
LOG_TRACE(Kernel_SVC, "called process=0x%08X", process_handle);
|
||||
|
||||
const SharedPtr<Kernel::Process> process = Kernel::g_handle_table.Get<Kernel::Process>(handle);
|
||||
const SharedPtr<Kernel::Process> process = Kernel::g_handle_table.Get<Kernel::Process>(process_handle);
|
||||
if (process == nullptr)
|
||||
return ERR_INVALID_HANDLE;
|
||||
|
||||
*process_id = process->GetProcessId();
|
||||
*process_id = process->process_id;
|
||||
return RESULT_SUCCESS;
|
||||
}
|
||||
|
||||
/// Get the ID of the process that owns the specified thread
|
||||
static ResultCode GetProcessIdOfThread(u32* process_id, Handle handle) {
|
||||
LOG_TRACE(Kernel_SVC, "called thread=0x%08X", handle);
|
||||
static ResultCode GetProcessIdOfThread(u32* process_id, Handle thread_handle) {
|
||||
LOG_TRACE(Kernel_SVC, "called thread=0x%08X", thread_handle);
|
||||
|
||||
const SharedPtr<Kernel::Thread> thread = Kernel::g_handle_table.Get<Kernel::Thread>(handle);
|
||||
const SharedPtr<Kernel::Thread> thread = Kernel::g_handle_table.Get<Kernel::Thread>(thread_handle);
|
||||
if (thread == nullptr)
|
||||
return ERR_INVALID_HANDLE;
|
||||
|
||||
const SharedPtr<Kernel::Process> process = thread->owner_process;
|
||||
if (process == nullptr)
|
||||
return ERR_INVALID_HANDLE;
|
||||
|
||||
ASSERT_MSG(process != nullptr, "Invalid parent process for thread=0x%08X", thread_handle);
|
||||
|
||||
*process_id = process->process_id;
|
||||
return RESULT_SUCCESS;
|
||||
|
Loading…
Reference in New Issue
Block a user