From: Alan T. DeKok Date: Fri, 16 Jun 2017 17:54:36 +0000 (-0400) Subject: get worker->el to thread instantiate function X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a759e78c8eec41d18c8620f48ee7c2d99708dc49;p=thirdparty%2Ffreeradius-server.git get worker->el to thread instantiate function --- diff --git a/src/lib/io/schedule.c b/src/lib/io/schedule.c index 714bdc14753..d4d388c8fea 100644 --- a/src/lib/io/schedule.c +++ b/src/lib/io/schedule.c @@ -219,7 +219,7 @@ static void *fr_schedule_worker_thread(void *arg) * @todo make this a registry */ if (sc->worker_thread_instantiate && - (sc->worker_thread_instantiate(sc->worker_instantiate_ctx) < 0)) { + (sc->worker_thread_instantiate(sc->worker_instantiate_ctx, fr_worker_el(sw->worker)) < 0)) { fr_log(sc->log, L_ERR, "Worker %d - Failed calling thread instantiate: %s", sw->id, fr_strerror()); goto fail; } diff --git a/src/lib/io/schedule.h b/src/lib/io/schedule.h index a06611e3afe..60d50c9029f 100644 --- a/src/lib/io/schedule.h +++ b/src/lib/io/schedule.h @@ -34,7 +34,7 @@ extern "C" { #endif typedef struct fr_schedule_t fr_schedule_t; -typedef int (*fr_schedule_thread_instantiate_t)(void *ctx); +typedef int (*fr_schedule_thread_instantiate_t)(void *ctx, fr_event_list_t *el); fr_schedule_t *fr_schedule_create(TALLOC_CTX *ctx, fr_log_t *log, int max_inputs, int max_workers, fr_schedule_thread_instantiate_t worker_thread_instantiate,