move common code to fr_thread_start / fr_thread_exit

Author: alandekok

src/lib/io/coord.c

@@ -444,14 +444,13 @@ static void *fr_coordinate_thread(void *arg)
 {
 	fr_schedule_coord_t	*sc = talloc_get_type_abort(arg, fr_schedule_coord_t);
 	fr_coord_reg_t		*coord_reg = sc->coord_reg;
+	fr_thread_status_t	status = FR_THREAD_FAIL;
 	char			coordinate_name[64];
 
 	snprintf(coordinate_name, sizeof(coordinate_name), "Coordinate %s", coord_reg->name);
 
 	if (fr_thread_setup(&sc->thread, coordinate_name) < 0) goto fail;
 
-	INFO("%s - Starting", coordinate_name);
-
 	sc->coord = fr_coord_create(sc->thread.ctx, sc->thread.el, coord_reg, false, sc->max_workers);
 	if (!sc->coord) {
 		PERROR("%s - Failed creating coordinator thread", coordinate_name);
@@ -463,16 +462,19 @@ static void *fr_coordinate_thread(void *arg)
 	 */
 	if (fr_thread_instantiate(sc->thread.ctx, sc->thread.el) < 0) goto fail;
 
-	sem_post(sc->sem);
+	/*
+	 *	Tell the originator that the thread has started.
+	 */
+	fr_thread_start(&sc->thread, sc->sem);
 
 	fr_coordinate(sc->coord);
 
-fail:
-	INFO("%s - Exiting", coordinate_name);
+	status = FR_THREAD_EXITED;
 
+fail:
 	fr_thread_detach();
 
-	talloc_free(sc->thread.ctx);
+	fr_thread_exit(&sc->thread, status, sc->sem);
 
 	return NULL;
 }
@@ -487,6 +489,8 @@ static void *fr_coordinate_thread(void *arg)
  */
 int fr_coord_start(uint32_t num_workers, fr_sem_t *sem)
 {
+	int num = 0;
+
 	if (!coord_regs) return 0;
 
 	MEM(coord_threads = talloc(NULL, fr_dlist_head_t));
@@ -498,6 +502,7 @@ int fr_coord_start(uint32_t num_workers, fr_sem_t *sem)
 
 		MEM(sc = talloc_zero(coord_threads, fr_schedule_coord_t));
 
+		sc->thread.id = num++;
 		sc->coord_reg = coord_reg;
 		sc->max_workers = num_workers;
 		sc->sem = sem;

src/lib/io/schedule.c

@@ -130,8 +130,6 @@ static void *fr_schedule_worker_thread(void *arg)
 
 	if (fr_thread_setup(&sw->thread, worker_name) < 0) goto fail;
 
-	INFO("%s - Starting", worker_name);
-
 	sw->worker = fr_worker_alloc(sw->thread.ctx, sw->thread.el, worker_name, sc->log, sc->lvl, &sc->config->worker);
 	if (!sw->worker) {
 		PERROR("%s - Failed creating worker", worker_name);
@@ -156,8 +154,6 @@ static void *fr_schedule_worker_thread(void *arg)
 		}
 	}
 
-	sw->thread.status = FR_THREAD_RUNNING;
-
 	/*
 	 *	Add this worker to all network threads.
 	 */
@@ -170,12 +166,10 @@ static void *fr_schedule_worker_thread(void *arg)
 		}
 	}
 
-	DEBUG3("%s - Started", worker_name);
-
 	/*
 	 *	Tell the originator that the thread has started.
 	 */
-	sem_post(sc->worker_sem);
+	fr_thread_start(&sw->thread, sc->worker_sem);
 
 	/*
 	 *	Do all of the work.
@@ -185,30 +179,14 @@ static void *fr_schedule_worker_thread(void *arg)
 	status = FR_THREAD_EXITED;
 
 fail:
-	sw->thread.status = status;
-
 	if (sw->worker) {
 		fr_worker_destroy(sw->worker);
 		sw->worker = NULL;
 	}
 
-	INFO("%s - Exiting", worker_name);
-
 	if (sc->worker_thread_detach) sc->worker_thread_detach(NULL);	/* Fixme once we figure out what uctx should be */
 
-	/*
-	 *	Not looping at this point, but may catch timer/fd
-	 *	insertions being done after the thread should have
-	 *	exited.
-	 */
-	if (sw->thread.el) fr_event_loop_exit(sw->thread.el, 1);
-
-	/*
-	 *	Tell the scheduler we're done.
-	 */
-	sem_post(sc->worker_sem);
-
-	talloc_free(sw->thread.ctx);
+	fr_thread_exit(&sw->thread, status, sc->worker_sem);
 
 	return NULL;
 }
@@ -247,21 +225,18 @@ static void *fr_schedule_network_thread(void *arg)
 		goto fail;
 	}
 
-	sn->thread.status = FR_THREAD_RUNNING;
-
 	/*
 	 *	Tell the originator that the thread has started.
 	 */
-	sem_post(sc->network_sem);
-
-	DEBUG3("%s - Started", network_name);
+	fr_thread_start(&sn->thread, sc->network_sem);
 
 	/*
 	 *	Print out statistics for this network IO handler.
 	 */
 	if (fr_time_delta_ispos(sc->config->stats_interval)) {
 		(void) fr_timer_in(sn, sn->thread.el->tl, &sn->ev, sn->sc->config->stats_interval, false, stats_timer, sn);
 	}
+
 	/*
 	 *	Call the main event processing loop of the network
 	 *	thread Will not return until the worker is about
@@ -272,16 +247,7 @@ static void *fr_schedule_network_thread(void *arg)
 	status = FR_THREAD_EXITED;
 
 fail:
-	sn->thread.status = status;
-
-	INFO("%s - Exiting", network_name);
-
-	/*
-	 *	Tell the scheduler we're done.
-	 */
-	sem_post(sc->network_sem);
-
-	talloc_free(sn->thread.ctx);
+	fr_thread_exit(&sn->thread, status, sc->network_sem);
 
 	return NULL;
 }

src/lib/io/thread.c

@@ -193,3 +193,42 @@ void fr_thread_detach(void)
 	virtual_servers_thread_detach();
 	modules_rlm_thread_detach();
 }
+
+
+/** Signal the parent that we're done.
+ *
+ * @param[out]	thread which is starting
+ * @param[in]	sem semaphore to signal.
+ */
+void fr_thread_start(fr_thread_t *thread, fr_sem_t *sem)
+{
+	thread->status = FR_THREAD_RUNNING;
+
+	INFO("%s - Starting", thread->name);
+
+	sem_post(sem);
+}
+
+/** Signal the parent that we're done.
+ *
+ * @param[out]	thread which is exiting
+ * @param[in]	status to write
+ * @param[in]	sem semaphore to signal.
+ */
+void fr_thread_exit(fr_thread_t *thread, fr_thread_status_t status, fr_sem_t *sem)
+{
+	INFO("%s - Exiting", thread->name);
+
+	thread->status = status;
+
+	/*
+	 *	Not looping at this point, but may catch timer/fd
+	 *	insertions being done after the thread should have
+	 *	exited.
+	 */
+	if (thread->el) fr_event_loop_exit(thread->el, 1);
+
+	TALLOC_FREE(thread->ctx);
+
+	sem_post(sem);
+}

src/lib/io/thread.h

@@ -69,3 +69,7 @@ int	fr_thread_setup(fr_thread_t *out, char const *name) CC_HINT(nonnull);
 int	fr_thread_instantiate(TALLOC_CTX *ctx, fr_event_list_t *el) CC_HINT(nonnull);
 
 void	fr_thread_detach(void);
+
+void	fr_thread_start(fr_thread_t *thread, fr_sem_t *sem) CC_HINT(nonnull);
+
+void	fr_thread_exit(fr_thread_t *thread, fr_thread_status_t status, fr_sem_t *sem) CC_HINT(nonnull);