Add LWP_DetachThread

Author: Extrems

gc/ogc/lwp.h

@@ -196,6 +196,15 @@ void LWP_ExitThread(void *value_ptr) __attribute__((noreturn));
 s32 LWP_JoinThread(lwp_t thethread,void **value_ptr);
 
 
+/*! \fn s32 LWP_DetachThread(lwp_t thethread)
+\brief Detach the given thread.
+\param[in] thethread handle to the thread's context which should be detached. If NULL, the current thread will be taken.
+
+\return 0 on success, non-zero on error
+*/
+s32 LWP_DetachThread(lwp_t thethread);
+
+
 /*! \fn s32 LWP_InitQueue(lwpq_t *thequeue)
 \brief Initialize the thread synchronization queue
 \param[in] thequeue pointer to a lwpq_t handle.

gc/ogc/lwp_threads.h

@@ -72,9 +72,15 @@ extern "C" {
 typedef enum
 {
 	LWP_CPU_BUDGET_ALGO_NONE = 0,
-	LWP_CPU_BUDGET_ALGO_TIMESLICE	
+	LWP_CPU_BUDGET_ALGO_TIMESLICE
 } lwp_cpu_budget_algorithms;
 
+typedef enum
+{
+	LWP_DETACH_STATE_DETACHED = 0,
+	LWP_DETACH_STATE_JOINABLE
+} lwp_detach_state;
+
 typedef struct _lwpwaitinfo {
 	u32 id;
 	u32 cnt;
@@ -105,6 +111,7 @@ typedef struct _lwpcntrl {
 	u32 stack_size;
 	u8 stack_allocated;
 	lwp_queue *ready;
+	lwp_detach_state detach_state;
 	lwp_thrqueue join_list;
 	frame_context context;		//16
 	void *libc_reent;

libogc/lwp.c

@@ -364,11 +364,16 @@ s32 LWP_JoinThread(lwp_t thethread,void **value_ptr)
 	lwp_cntrl *exec,*lwp_thread;
 
 	lwp_thread = __lwp_cntrl_open(thethread);
-	if(!lwp_thread) return EINVAL;
+	if(!lwp_thread) return ESRCH;
+
+	if(lwp_thread->detach_state==LWP_DETACH_STATE_DETACHED) {
+		__lwp_thread_dispatchenable();
+		return EINVAL;
+	}
 
 	if(__lwp_thread_isexec(lwp_thread)) {
 		__lwp_thread_dispatchenable();
-		return EDEADLK;			//EDEADLK
+		return EDEADLK;
 	}
 
 	if(__lwp_statewaitjoinatexit(lwp_thread->cur_state)) {
@@ -392,6 +397,27 @@ s32 LWP_JoinThread(lwp_t thethread,void **value_ptr)
 	return 0;
 }
 
+s32 LWP_DetachThread(lwp_t thethread)
+{
+	lwp_cntrl *lwp_thread;
+
+	if(thethread==LWP_THREAD_NULL) thethread = LWP_GetSelf();
+
+	lwp_thread = __lwp_cntrl_open(thethread);
+	if(!lwp_thread) return ESRCH;
+
+	if(lwp_thread->detach_state==LWP_DETACH_STATE_DETACHED) {
+		__lwp_thread_dispatchenable();
+		return EINVAL;
+	}
+
+	lwp_thread->detach_state = LWP_DETACH_STATE_DETACHED;
+	__lwp_thread_clearstate(lwp_thread,LWP_STATES_WAITING_FOR_JOINATEXIT);
+	__lwp_thread_dispatchenable();
+
+	return 0;
+}
+
 s32 LWP_InitQueue(lwpq_t *thequeue)
 {
 	tqueue_st *tq;

libogc/lwp_threads.c

@@ -646,6 +646,7 @@ u32 __lwp_thread_init(lwp_cntrl *thethread,void *stack_area,u32 stack_size,u32 p
 	}
 	thethread->stack_size = act_stack_size;
 
+	thethread->detach_state = LWP_DETACH_STATE_JOINABLE;
 	__lwp_threadqueue_init(&thethread->join_list,LWP_THREADQ_MODEFIFO,LWP_STATES_WAITING_FOR_JOIN,0);
 
 	memset(&thethread->context,0,sizeof(thethread->context));
@@ -720,14 +721,16 @@ void __lwp_thread_exit(lwp_cntrl *thethread,void *value_ptr)
 
 	__lwp_thread_dispatchdisable();
 	thethread->wait.ret_arg = value_ptr;
-	if((p=__lwp_threadqueue_dequeue(&thethread->join_list))) {
-		do {
-			*(void**)p->wait.ret_arg = value_ptr;
-		} while((p=__lwp_threadqueue_dequeue(&thethread->join_list)));
-	} else {
-		__lwp_thread_setstate(thethread,LWP_STATES_WAITING_FOR_JOINATEXIT);
-		__lwp_thread_dispatchenable();
-		__lwp_thread_dispatchdisable();
+	if(thethread->detach_state==LWP_DETACH_STATE_JOINABLE) {
+		if((p=__lwp_threadqueue_dequeue(&thethread->join_list))) {
+			do {
+				*(void**)p->wait.ret_arg = value_ptr;
+			} while((p=__lwp_threadqueue_dequeue(&thethread->join_list)));
+		} else {
+			__lwp_thread_setstate(thethread,LWP_STATES_WAITING_FOR_JOINATEXIT);
+			__lwp_thread_dispatchenable();
+			__lwp_thread_dispatchdisable();
+		}
 	}
 	__lwp_thread_close(thethread);
 	__lwp_thread_dispatchenable();