Move thread stop to radiusd.c

So we can see the entire build up / tear down in radiusd.c
FreeRADIUS · Nov 10, 2015 · e4e6ffc · e4e6ffc
1 parent 36a35fd
commit e4e6ffc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/main/process.c b/src/main/process.c
@@ -5544,14 +5544,6 @@ void radius_event_free(void)
 	rbtree_walk(pl, RBTREE_DELETE_ORDER,  request_delete_cb, NULL);
 
 	if (spawn_workers) {
-		/*
-		 *	Now that all requests have been marked "please stop",
-		 *	ensure that all of the threads have exited.
-		 */
-#ifdef HAVE_PTHREAD_H
-		thread_pool_stop();
-#endif
-
 		/*
 		 *	Walk the lists again, ensuring that all
 		 *	requests are done.

diff --git a/src/main/radiusd.c b/src/main/radiusd.c
@@ -623,6 +623,11 @@ int main(int argc, char *argv[])
 	 *	SEGVs.
 	 */
 	radius_event_free();		/* Free the requests */
+
+#ifdef HAVE_PTHREAD_H
+	thread_pool_stop();		/* stop all the threads */
+#endif
+
 	talloc_free(global_state);	/* Free state entries */
 
 cleanup: