From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 31 Oct 2017 20:16:57 +0000 (-0400)
Subject: more preparations for eventual cleanup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4aaa7c8f1b2eb6b0b9dc090e8644b36ad6ea9015;p=thirdparty%2Ffreeradius-server.git

more preparations for eventual cleanup
---

diff --git a/src/lib/io/schedule.c b/src/lib/io/schedule.c
index 92beba914bf..00b5fadc358 100644
--- a/src/lib/io/schedule.c
+++ b/src/lib/io/schedule.c
@@ -77,6 +77,7 @@ typedef enum fr_schedule_child_status_t {
  */
 typedef struct fr_schedule_worker_t {
 	TALLOC_CTX	*ctx;			//!< our allocation ctx
+	fr_event_list_t	*el;			//!< our event list
 	pthread_t	pthread_id;		//!< the thread of this worker
 
 	int		id;			//!< a unique ID
@@ -150,7 +151,6 @@ static void *fr_schedule_worker_thread(void *arg)
 	fr_schedule_worker_t *sw = arg;
 	fr_schedule_t *sc = sw->sc;
 	fr_schedule_child_status_t status = FR_CHILD_FAIL;
-	fr_event_list_t *el = NULL;
 	char buffer[32];
 
 	sw->ctx = ctx = talloc_init("worker %d", sw->id);
@@ -161,14 +161,14 @@ static void *fr_schedule_worker_thread(void *arg)
 
 	fr_log(sc->log, L_INFO, "Worker %d starting\n", sw->id);
 
-	el = fr_event_list_alloc(ctx, NULL, NULL);
-	if (!el) {
+	sw->el = fr_event_list_alloc(ctx, NULL, NULL);
+	if (!sw->el) {
 		fr_log(sc->log, L_ERR, "Worker %d - Failed creating event list: %s",
 		       sw->id, fr_strerror());
 		goto fail;
 	}
 
-	sw->worker = fr_worker_create(ctx, el, sc->log, sc->lvl);
+	sw->worker = fr_worker_create(ctx, sw->el, sc->log, sc->lvl);
 	if (!sw->worker) {
 		fr_log(sc->log, L_ERR, "Worker %d - Failed creating worker: %s", sw->id, fr_strerror());
 		goto fail;
@@ -216,8 +216,6 @@ fail:
 		sw->worker = NULL;
 	}
 
-//	if (el) talloc_free(el);
-
 	fr_log(sc->log, L_INFO, "Worker %d exiting\n", sw->id);
 
 	/*