From 8ce1517ef42d57a85669ec066388f26fdc357493 Mon Sep 17 00:00:00 2001 From: Arran Cudbard-Bell Date: Thu, 24 Apr 2025 20:02:49 -0400 Subject: [PATCH] Rename runnable_id to runnable --- src/lib/io/worker.c | 18 +++++++++--------- src/lib/server/request.c | 6 +++--- src/lib/server/request.h | 4 ++-- src/lib/unlang/interpret_synchronous.c | 4 ++-- src/lib/unlang/parallel.c | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/lib/io/worker.c b/src/lib/io/worker.c index acb384174f..1f122fda8a 100644 --- a/src/lib/io/worker.c +++ b/src/lib/io/worker.c @@ -589,7 +589,7 @@ static int worker_request_time_tracking_start(fr_worker_t *worker, request_t *re fr_time_tracking_yield(&request->async->tracking, now); worker->num_active++; - fr_assert(!fr_heap_entry_inserted(request->runnable_id)); + fr_assert(!fr_heap_entry_inserted(request->runnable)); (void) fr_heap_insert(&worker->runnable, request); return 0; @@ -624,7 +624,7 @@ static void worker_send_reply(fr_worker_t *worker, request_t *request, bool send /* * If we're sending a reply, then it's no longer runnable. */ - fr_assert(!fr_heap_entry_inserted(request->runnable_id)); + fr_assert(!fr_heap_entry_inserted(request->runnable)); if (send_reply) { size = request->async->listen->app_io->default_reply_size; @@ -721,7 +721,7 @@ static void worker_send_reply(fr_worker_t *worker, request_t *request, bool send worker->stats.out++; fr_assert(!fr_timer_armed(request->timeout)); - fr_assert(!fr_heap_entry_inserted(request->runnable_id)); + fr_assert(!fr_heap_entry_inserted(request->runnable)); fr_dlist_entry_unlink(&request->listen_entry); @@ -1150,7 +1150,7 @@ static void _worker_request_done_internal(request_t *request, UNUSED rlm_rcode_t worker_request_time_tracking_end(worker, request, fr_time()); - fr_assert(!fr_heap_entry_inserted(request->runnable_id)); + fr_assert(!fr_heap_entry_inserted(request->runnable)); fr_assert(!fr_timer_armed(request->timeout)); fr_assert(!fr_dlist_entry_in_list(&request->async->entry)); } @@ -1167,7 +1167,7 @@ static void _worker_request_done_detached(request_t *request, UNUSED rlm_rcode_t * so we don't need to call * worker_request_time_tracking_end. */ - fr_assert(!fr_heap_entry_inserted(request->runnable_id)); + fr_assert(!fr_heap_entry_inserted(request->runnable)); /* * Normally worker_request_time_tracking_end @@ -1245,7 +1245,7 @@ static void _worker_request_stop(request_t *request, void *uctx) * yank it back out, so it's not "runnable" * when we call request done. */ - if (fr_heap_entry_inserted(request->runnable_id)) fr_heap_extract(&worker->runnable, request); + if (fr_heap_entry_inserted(request->runnable)) fr_heap_extract(&worker->runnable, request); } /** Request is now runnable @@ -1282,7 +1282,7 @@ static void _worker_request_resume(request_t *request, UNUSED void *uctx) */ static bool _worker_request_scheduled(request_t const *request, UNUSED void *uctx) { - return fr_heap_entry_inserted(request->runnable_id); + return fr_heap_entry_inserted(request->runnable); } /** Run a request @@ -1315,7 +1315,7 @@ static inline CC_HINT(always_inline) void worker_run_request(fr_worker_t *worker ((request = fr_heap_pop(&worker->runnable)) != NULL)) { REQUEST_VERIFY(request); - fr_assert(!fr_heap_entry_inserted(request->runnable_id)); + fr_assert(!fr_heap_entry_inserted(request->runnable)); /* * For real requests, if the channel is gone, @@ -1422,7 +1422,7 @@ nomem: goto fail; } - worker->runnable = fr_heap_talloc_alloc(worker, worker_runnable_cmp, request_t, runnable_id, 0); + worker->runnable = fr_heap_talloc_alloc(worker, worker_runnable_cmp, request_t, runnable, 0); if (!worker->runnable) { fr_strerror_const("Failed creating runnable heap"); goto fail; diff --git a/src/lib/server/request.c b/src/lib/server/request.c index 29322fd251..099789bde5 100644 --- a/src/lib/server/request.c +++ b/src/lib/server/request.c @@ -380,11 +380,11 @@ static int _request_free(request_t *request) request->alloc_file, request->alloc_line, request->name ? request->name : "(null)"); - fr_assert_msg(!fr_heap_entry_inserted(request->runnable_id), + fr_assert_msg(!fr_heap_entry_inserted(request->runnable), "alloced %s:%i: %s still in the runnable heap ID %i", request->alloc_file, request->alloc_line, - request->name ? request->name : "(null)", request->runnable_id); + request->name ? request->name : "(null)", request->runnable); RDEBUG3("Request freed (%p)", request); @@ -420,7 +420,7 @@ static int _request_free(request_t *request) memset(request, 0, sizeof(*request)); request->component = "free_list"; #ifndef NDEBUG - request->runnable_id = FR_HEAP_INDEX_INVALID; + request->runnable = FR_HEAP_INDEX_INVALID; #endif /* diff --git a/src/lib/server/request.h b/src/lib/server/request.h index 11b4c0122b..90d039f466 100644 --- a/src/lib/server/request.h +++ b/src/lib/server/request.h @@ -235,8 +235,6 @@ struct request_s { fr_rb_node_t dedup_node; //!< entry in the deduplication tree. - fr_heap_index_t runnable_id; //!< entry in the heap of runnable packets - fr_timer_t *timeout; //!< Timer event for this request. This tracks when we need to ///< forcefully terminate a request. @@ -250,6 +248,8 @@ struct request_s { fr_dlist_t listen_entry; //!< request's entry in the list for this listener / socket fr_dlist_t free_entry; //!< Request's entry in the free list. + fr_heap_index_t runnable; //!< entry in the heap of runnable packets + }; /* request_t typedef */ /** Optional arguments for initialising requests diff --git a/src/lib/unlang/interpret_synchronous.c b/src/lib/unlang/interpret_synchronous.c index a18949e47c..48896a6a04 100644 --- a/src/lib/unlang/interpret_synchronous.c +++ b/src/lib/unlang/interpret_synchronous.c @@ -158,7 +158,7 @@ static void _request_resume(request_t *request, UNUSED void *uctx) static bool _request_scheduled(request_t const *request, UNUSED void *uctx) { - return fr_heap_entry_inserted(request->runnable_id); + return fr_heap_entry_inserted(request->runnable); } /** Allocate a new temporary interpreter @@ -169,7 +169,7 @@ static unlang_interpret_synchronous_t *unlang_interpret_synchronous_alloc(TALLOC unlang_interpret_synchronous_t *intps; MEM(intps = talloc_zero(ctx, unlang_interpret_synchronous_t)); - MEM(intps->runnable = fr_heap_talloc_alloc(intps, fr_pointer_cmp, request_t, runnable_id, 0)); + MEM(intps->runnable = fr_heap_talloc_alloc(intps, fr_pointer_cmp, request_t, runnable, 0)); if (el) { intps->el = el; } else { diff --git a/src/lib/unlang/parallel.c b/src/lib/unlang/parallel.c index 22c2c0cc8d..7b6a6cfacb 100644 --- a/src/lib/unlang/parallel.c +++ b/src/lib/unlang/parallel.c @@ -67,7 +67,7 @@ static inline CC_HINT(always_inline) void unlang_parallel_cancel_child(unlang_pa break; case CHILD_DONE: - fr_assert(!fr_heap_entry_inserted(child->runnable_id)); + fr_assert(!fr_heap_entry_inserted(child->runnable)); /* * Completed children just get freed @@ -239,7 +239,7 @@ static unlang_action_t unlang_parallel_resume(rlm_rcode_t *p_result, request_t * for (i = 0; i < state->num_children; i++) { if (!state->children[i].request) continue; - fr_assert(!fr_heap_entry_inserted(state->children[i].request->runnable_id)); + fr_assert(!fr_heap_entry_inserted(state->children[i].request->runnable)); TALLOC_FREE(state->children[i].request); } -- 2.47.2