Keep initial kse and kse group just like we keep initial thread,

Don't free them, so some code can still reference them.

Reviewed by: deischen

2 files changed, 22 insertions, 18 deletions

diff --git a/lib/libkse/thread/thr_kern.c b/lib/libkse/thread/thr_kern.c
index c78a28a..ae151d7 100644
--- a/lib/libkse/thread/thr_kern.c
+++ b/lib/libkse/thread/thr_kern.c
@@ -1336,6 +1336,15 @@ thread_gc(struct pthread *curthread)
 
 	while ((td = TAILQ_FIRST(&worklist)) != NULL) {
 		TAILQ_REMOVE(&worklist, td, gcle);
+		/*
+		 * XXX we don't free initial thread and its kse
+		 * (if thread is a bound thread), because there might
+		 * have some code referencing initial thread and kse.
+		 */
+		if (td == _thr_initial) {
+			DBG_MSG("Initial thread won't be freed\n");
+			continue;
+		}
 
 		if ((td->attr.flags & PTHREAD_SCOPE_SYSTEM) != 0) {
 			crit = _kse_critical_enter();
@@ -1345,15 +1354,8 @@ thread_gc(struct pthread *curthread)
 			KSE_LOCK_RELEASE(curthread->kse, &kse_lock);
 			_kse_critical_leave(crit);
 		}
-		/*
-		 * XXX we don't free initial thread, because there might
-		 * have some code referencing initial thread.
-		 */
-		if (td != _thr_initial) {
-			DBG_MSG("Freeing thread %p\n", td);
-			_thr_free(curthread, td);
-		} else
-			DBG_MSG("Initial thread won't be freed\n");
+		DBG_MSG("Freeing thread %p\n", td);
+		_thr_free(curthread, td);
 	}
 }
 
diff --git a/lib/libpthread/thread/thr_kern.c b/lib/libpthread/thread/thr_kern.c
index c78a28a..ae151d7 100644
--- a/lib/libpthread/thread/thr_kern.c
+++ b/lib/libpthread/thread/thr_kern.c
@@ -1336,6 +1336,15 @@ thread_gc(struct pthread *curthread)
 
 	while ((td = TAILQ_FIRST(&worklist)) != NULL) {
 		TAILQ_REMOVE(&worklist, td, gcle);
+		/*
+		 * XXX we don't free initial thread and its kse
+		 * (if thread is a bound thread), because there might
+		 * have some code referencing initial thread and kse.
+		 */
+		if (td == _thr_initial) {
+			DBG_MSG("Initial thread won't be freed\n");
+			continue;
+		}
 
 		if ((td->attr.flags & PTHREAD_SCOPE_SYSTEM) != 0) {
 			crit = _kse_critical_enter();
@@ -1345,15 +1354,8 @@ thread_gc(struct pthread *curthread)
 			KSE_LOCK_RELEASE(curthread->kse, &kse_lock);
 			_kse_critical_leave(crit);
 		}
-		/*
-		 * XXX we don't free initial thread, because there might
-		 * have some code referencing initial thread.
-		 */
-		if (td != _thr_initial) {
-			DBG_MSG("Freeing thread %p\n", td);
-			_thr_free(curthread, td);
-		} else
-			DBG_MSG("Initial thread won't be freed\n");
+		DBG_MSG("Freeing thread %p\n", td);
+		_thr_free(curthread, td);
 	}
 }