Close handle on thread release

reswitched · Dec 12, 2017 · aeca2c3 · aeca2c3
1 parent f1870ec
commit aeca2c3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/pthread/phal.h b/pthread/phal.h
@@ -5,6 +5,9 @@
 
 int phal_thread_create(phal_tid *tid, void (*start_routine)(void*), void *arg);
 void phal_thread_exit(phal_tid *tid);
+
+// Called after the thread exited, to free up any potential resources
+int phal_thread_destroy(phal_tid *tid);
 void **phal_get_tls();
 
 int phal_semaphore_create(phal_semaphore *sem);

diff --git a/pthread/rthread_thread.c b/pthread/rthread_thread.c
@@ -239,6 +239,9 @@ _rthread_reaper(void)
 			// TODO: stack and tib
 			//_rthread_free_stack(thread->stack);
 			//_dl_free_tib(thread->tib, sizeof(*thread));
+			int res = phal_thread_destroy(&thread->tib_tid);
+			if (res)
+				_rthread_debug(3, "Failed to free tid %d: %d", &thread->tib_tid, res);
 		} else {
 			/* initial thread isn't part of TIB allocation */
 			_rthread_debug(3, "rthread reaping %p (initial)\n",

diff --git a/pthread/sys/switch/phal.c b/pthread/sys/switch/phal.c
@@ -27,6 +27,10 @@ void phal_thread_exit(phal_tid *tid) {
 	svcExitThread();
 }
 
+int phal_thread_destroy(phal_tid *tid) {
+	return svcCloseHandle(*tid);
+}
+
 int phal_thread_sleep(uint64_t msec) {
 	u64 nanos = msec * 1000 * 1000;
 	return svcSleepThread(nanos);