set request->el and request->backlog for new listeners

diff --git a/src/lib/io/listen.h b/src/lib/io/listen.h
index 24cd0750b2cfc8342af035fb24aa6af9bd1641c4..fd8ff2ad25b117b1ad85b2c227b25a2b80226024 100644 (file)
--- a/src/lib/io/listen.h
+++ b/src/lib/io/listen.h
@@ -39,7 +39,6 @@ struct fr_listen {
  */
 struct fr_async_t {
        fr_dlist_t              time_order;     //!< tracking requests by time order
-       fr_heap_t               *runnable;      //!< heap of runnable requests
 
        fr_time_t               recv_time;
        fr_time_t               *original_recv_time;

diff --git a/src/lib/io/worker.c b/src/lib/io/worker.c
index 2306659abce1400f30264b4053bc600687fbc595..062d44974f6e123a17866038a6baf0c25a651f87 100644 (file)
--- a/src/lib/io/worker.c
+++ b/src/lib/io/worker.c
@@ -669,6 +669,8 @@ static REQUEST *fr_worker_get_request(fr_worker_t *worker, fr_time_t now)
        ctx = request = request_alloc(NULL);
        if (!request) goto nak;
 
+       request->el = worker->el;
+       request->backlog = worker->runnable;
        request->packet = fr_radius_alloc(request, false);
        rad_assert(request->packet != NULL);
        request->reply = fr_radius_alloc(request, false);
@@ -694,7 +696,6 @@ static REQUEST *fr_worker_get_request(fr_worker_t *worker, fr_time_t now)
        request->async->channel = cd->channel.ch;
        request->async->original_recv_time = cd->request.start_time;
        request->async->recv_time = cd->m.when;
-       request->async->runnable = worker->runnable;
        request->async->el = worker->el;
        request->number = worker->number++;
 
@@ -1233,25 +1234,6 @@ void fr_worker(fr_worker_t *worker)
        }
 }
 
-#if 0
-/*
- *     A local copy of unlang_resume(), so we know what we're supposed to do.
- */
-void worker_resume_request(REQUEST *request)
-{
-       /*
-        *      The request is no longer in the "yielded" list.  But
-        *      it isn't resumed (yet) so we don't add CPU time for
-        *      it.
-        */
-       fr_dlist_remove(&request->async->tracking.list);
-
-       /*
-        *      It's runnable again.
-        */
-       (void) fr_heap_insert(request->async->runnable, request);
-}
-#endif
 
 /** Print debug information about the worker structure
  *