Merge pull request #250 from Subv/cbranch_2
SVC: Implemented GetThreadId.
This commit is contained in:
commit
17fae11fc7
|
@ -49,6 +49,8 @@ public:
|
||||||
|
|
||||||
ThreadContext context;
|
ThreadContext context;
|
||||||
|
|
||||||
|
u32 thread_id;
|
||||||
|
|
||||||
u32 status;
|
u32 status;
|
||||||
u32 entry_point;
|
u32 entry_point;
|
||||||
u32 stack_top;
|
u32 stack_top;
|
||||||
|
@ -76,6 +78,9 @@ static Common::ThreadQueueList<Handle> thread_ready_queue;
|
||||||
static Handle current_thread_handle;
|
static Handle current_thread_handle;
|
||||||
static Thread* current_thread;
|
static Thread* current_thread;
|
||||||
|
|
||||||
|
static const u32 INITIAL_THREAD_ID = 1; ///< The first available thread id at startup
|
||||||
|
static u32 next_thread_id; ///< The next available thread id
|
||||||
|
|
||||||
/// Gets the current thread
|
/// Gets the current thread
|
||||||
inline Thread* GetCurrentThread() {
|
inline Thread* GetCurrentThread() {
|
||||||
return current_thread;
|
return current_thread;
|
||||||
|
@ -325,6 +330,7 @@ Thread* CreateThread(Handle& handle, const char* name, u32 entry_point, s32 prio
|
||||||
thread_queue.push_back(handle);
|
thread_queue.push_back(handle);
|
||||||
thread_ready_queue.prepare(priority);
|
thread_ready_queue.prepare(priority);
|
||||||
|
|
||||||
|
thread->thread_id = next_thread_id++;
|
||||||
thread->status = THREADSTATUS_DORMANT;
|
thread->status = THREADSTATUS_DORMANT;
|
||||||
thread->entry_point = entry_point;
|
thread->entry_point = entry_point;
|
||||||
thread->stack_top = stack_top;
|
thread->stack_top = stack_top;
|
||||||
|
@ -465,9 +471,21 @@ void Reschedule() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ResultCode GetThreadId(u32* thread_id, Handle handle) {
|
||||||
|
Thread* thread = g_object_pool.Get<Thread>(handle);
|
||||||
|
if (thread == nullptr)
|
||||||
|
return ResultCode(ErrorDescription::InvalidHandle, ErrorModule::OS,
|
||||||
|
ErrorSummary::WrongArgument, ErrorLevel::Permanent);
|
||||||
|
|
||||||
|
*thread_id = thread->thread_id;
|
||||||
|
|
||||||
|
return RESULT_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
void ThreadingInit() {
|
void ThreadingInit() {
|
||||||
|
next_thread_id = INITIAL_THREAD_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ThreadingShutdown() {
|
void ThreadingShutdown() {
|
||||||
|
|
|
@ -58,6 +58,14 @@ void Reschedule();
|
||||||
/// Stops the current thread
|
/// Stops the current thread
|
||||||
ResultCode StopThread(Handle thread, const char* reason);
|
ResultCode StopThread(Handle thread, const char* reason);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieves the ID of the specified thread handle
|
||||||
|
* @param thread_id Will contain the output thread id
|
||||||
|
* @param handle Handle to the thread we want
|
||||||
|
* @return Whether the function was successful or not
|
||||||
|
*/
|
||||||
|
ResultCode GetThreadId(u32* thread_id, Handle handle);
|
||||||
|
|
||||||
/// Resumes a thread from waiting by marking it as "ready"
|
/// Resumes a thread from waiting by marking it as "ready"
|
||||||
void ResumeThreadFromWait(Handle handle);
|
void ResumeThreadFromWait(Handle handle);
|
||||||
|
|
||||||
|
|
|
@ -281,10 +281,11 @@ static Result ReleaseMutex(Handle handle) {
|
||||||
return res.raw;
|
return res.raw;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Get current thread ID
|
/// Get the ID for the specified thread.
|
||||||
static Result GetThreadId(u32* thread_id, Handle thread) {
|
static Result GetThreadId(u32* thread_id, Handle handle) {
|
||||||
ERROR_LOG(SVC, "(UNIMPLEMENTED) called thread=0x%08X", thread);
|
DEBUG_LOG(SVC, "called thread=0x%08X", handle);
|
||||||
return 0;
|
ResultCode result = Kernel::GetThreadId(thread_id, handle);
|
||||||
|
return result.raw;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Query memory
|
/// Query memory
|
||||||
|
|
Reference in New Issue