citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

fixup!

This commit is contained in:
Subv 2015-05-11 18:23:45 -05:00
parent 41f74a16fd
commit 25c010dc7d
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/hle/kernel/kernel.cpp
View File

@ -137,8 +137,10 @@ void Init() {
Kernel::ThreadingInit(); Kernel::ThreadingInit();
Kernel::TimersInit(); Kernel::TimersInit();
Process::next_process_id = 0;
Object::next_object_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 /// Shutdown the kernel

6
src/core/hle/kernel/process.h
View File

@ -57,12 +57,6 @@ public:
static u32 next_process_id; static u32 next_process_id;
/*
* Gets the process' id
* @returns The process' id
*/
u32 GetProcessId() const { return process_id; }
/// Name of the process /// Name of the process
std::string name; std::string name;
/// Title ID corresponding to the process /// Title ID corresponding to the process

18
src/core/hle/svc.cpp
View File

@ -426,28 +426,28 @@ static ResultCode ReleaseMutex(Handle handle) {
} }
/// Get the ID of the specified process /// Get the ID of the specified process
static ResultCode GetProcessId(u32* process_id, Handle handle) { static ResultCode GetProcessId(u32* process_id, Handle process_handle) {
LOG_TRACE(Kernel_SVC, "called process=0x%08X", 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) if (process == nullptr)
return ERR_INVALID_HANDLE; return ERR_INVALID_HANDLE;
*process_id = process->GetProcessId(); *process_id = process->process_id;
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }
/// Get the ID of the process that owns the specified thread /// Get the ID of the process that owns the specified thread
static ResultCode GetProcessIdOfThread(u32* process_id, Handle handle) { static ResultCode GetProcessIdOfThread(u32* process_id, Handle thread_handle) {
LOG_TRACE(Kernel_SVC, "called thread=0x%08X", 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) if (thread == nullptr)
return ERR_INVALID_HANDLE; return ERR_INVALID_HANDLE;
const SharedPtr<Kernel::Process> process = thread->owner_process; 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; *process_id = process->process_id;
return RESULT_SUCCESS; return RESULT_SUCCESS;