Remove LOCAL_PID hacks, we'll reimplement it in libkqueue

diff --git a/src/lib/util/event.c b/src/lib/util/event.c
index 45b8ecbfd36e1448f86f9141573b815fe845dced..7e7e2ab6864e92b303b38a15bf7c32468789e573 100644 (file)
--- a/src/lib/util/event.c
+++ b/src/lib/util/event.c
@@ -296,10 +296,6 @@ struct fr_event_fd {
 #endif
 };
 
-#ifdef __linux__
-#define LOCAL_PID (1)
-#endif
-
 struct fr_event_pid {
        fr_event_list_t         *el;                    //!< because talloc_parent() is O(N) in number of objects
        pid_t                   pid;                    //!< child to wait for
@@ -308,10 +304,6 @@ struct fr_event_pid {
        fr_event_pid_cb_t       callback;               //!< callback to run when the child exits
        void                    *uctx;                  //!< Context pointer to pass to each file descriptor callback.
 
-#ifdef LOCAL_PID
-       fr_lst_index_t          lst_id;
-#endif
-
 #ifndef NDEBUG
        char const              *file;                  //!< Source file this event was last updated in.
        int                     line;                   //!< Line this event was last updated on.
@@ -353,9 +345,6 @@ typedef struct {
 struct fr_event_list {
        fr_lst_t                *times;                 //!< of timer events to be executed.
        fr_rb_tree_t            *fds;                   //!< Tree used to track FDs with filters in kqueue.
-#ifdef LOCAL_PID
-       fr_lst_t                *pids;                  //!< PIDs to wait for
-#endif
 
        int                     will_exit;              //!< Will exit on next call to fr_event_corral.
        int                     exit;                   //!< If non-zero event loop will prevent the addition
@@ -418,15 +407,6 @@ static int8_t fr_event_fd_cmp(void const *one, void const *two)
        return CMP(a->filter, b->filter);
 }
 
-#ifdef LOCAL_PID
-static int8_t fr_event_pid_cmp(void const *one, void const *two)
-{
-       fr_event_pid_t const    *a = one, *b = two;
-
-       return CMP(a->pid, b->pid);
-}
-#endif
-
 /** Return the number of file descriptors is_registered with this event loop
  *
  */
@@ -1404,21 +1384,14 @@ int fr_event_timer_delete(fr_event_timer_t const **ev_p)
  */
 static int _event_pid_free(fr_event_pid_t *ev)
 {
-#ifndef LOCAL_PID
        struct kevent evset;
-#endif
-
        if (ev->parent) *ev->parent = NULL;
 
-#ifndef LOCAL_PID
        if (ev->pid == 0) return 0; /* already deleted from kevent */
 
        EV_SET(&evset, ev->pid, EVFILT_PROC, EV_DELETE, NOTE_EXIT, 0, ev);
 
        (void) kevent(ev->el->kq, &evset, 1, NULL, 0, NULL);
-#else
-       (void) fr_lst_extract(ev->el->pids, ev);
-#endif
 
        return 0;
 }
@@ -1446,9 +1419,7 @@ int _fr_event_pid_wait(NDEBUG_LOCATION_ARGS
                       pid_t pid, fr_event_pid_cb_t callback, void *uctx)
 {
        fr_event_pid_t *ev;
-#ifndef LOCAL_PID
        struct kevent evset;
-#endif
 
        ev = talloc(ctx, fr_event_pid_t);
        ev->el = el;
@@ -1461,8 +1432,6 @@ int _fr_event_pid_wait(NDEBUG_LOCATION_ARGS
        ev->line = line;
 #endif
 
-#ifndef LOCAL_PID
-
 #ifndef NOTE_EXITSTATUS
 #define NOTE_EXITSTATUS (0)
 #endif
@@ -1494,16 +1463,6 @@ int _fr_event_pid_wait(NDEBUG_LOCATION_ARGS
 
                return -1;
        }
-#else  /* LOCAL_PID */
-
-       ev->lst_id = 0;
-       if (unlikely(fr_lst_insert(el->pids, ev) < 0)) {
-               fr_strerror_printf("Failed adding waiter for PID %ld - %s", (long) pid, fr_strerror());
-               talloc_free(ev);
-               return -1;
-       }
-
-#endif
 
        talloc_set_destructor(ev, _event_pid_free);
 
@@ -1743,12 +1702,6 @@ int fr_event_corral(fr_event_list_t *el, fr_time_t now, bool wait)
        int                     num_fd_events;
        bool                    timer_event_ready = false;
        fr_event_timer_t        *ev;
-#ifdef LOCAL_PID
-       fr_event_pid_t          *pid;
-       fr_lst_iter_t           iter;
-       int                     num_pid_events;
-#endif
-
 
        el->num_fd_events = 0;
 
@@ -1826,7 +1779,6 @@ int fr_event_corral(fr_event_list_t *el, fr_time_t now, bool wait)
         *      that occurred since this function was last called
         *      or wait for the next timer event.
         */
-#ifndef LOCAL_PID
        num_fd_events = kevent(el->kq, NULL, 0, el->events, FR_EV_BATCH_FDS, ts_wake);
 
        /*
@@ -1841,71 +1793,6 @@ int fr_event_corral(fr_event_list_t *el, fr_time_t now, bool wait)
                }
        }
 
-#else  /* LOCAL_PID */
-       num_pid_events = 0;
-
-       /*
-        *      Brute-force wait for all open PIDs
-        */
-       for (pid = fr_lst_iter_init(el->pids, &iter);
-            pid != NULL;
-            pid = fr_lst_iter_next(el->pids, &iter)) {
-               int status;
-
-               if (waitpid(pid->pid, &status, WNOHANG) != pid->pid) continue;
-
-               /*
-                *      Synthesize a kevent for the exit status.
-                */
-               el->events[num_pid_events].filter = EVFILT_PROC;
-               el->events[num_pid_events].ident = pid->pid;
-               el->events[num_pid_events].flags = 0;
-               el->events[num_pid_events].fflags = NOTE_EXIT;
-               el->events[num_pid_events].data = status;
-               el->events[num_pid_events].udata = pid;
-
-               num_pid_events++;
-
-               /*
-                *      Limit the number of PID events to no
-                *      more than half of events.  This should
-                *      be more than enough for most exec
-                *      scenarios.  And, it allows us to still
-                *      service FD events.
-                */
-               if (num_pid_events >= (FR_EV_BATCH_FDS / 2)) break;
-       }
-
-       /*
-        *      Wake up NOW, in order to service the PID events.
-        */
-       if (num_pid_events > 0) {
-               ts_when.tv_sec = 0;
-               ts_when.tv_nsec = 0;
-               ts_wake = &ts_when;
-       }
-
-       num_fd_events = kevent(el->kq, NULL, 0, &el->events[num_pid_events], FR_EV_BATCH_FDS - num_pid_events, ts_wake);
-
-       /*
-        *      Interrupt is different from timeout / FD events.
-        */
-       if (unlikely(num_fd_events < 0)) {
-               if (errno != EINTR) {
-                       fr_strerror_printf("Failed calling kevent: %s", fr_syserror(errno));
-                       return -1;
-               }
-
-               if (num_pid_events == 0) {
-                       return 0;
-               }
-
-               num_fd_events = 0; /* still service the PID events */
-       }
-
-       num_fd_events += num_pid_events;
-#endif /* LOCAL_PID */
-
        el->num_fd_events = num_fd_events;
 
        EVENT_DEBUG("%s - kevent returned %u FD events", __FUNCTION__, el->num_fd_events);
@@ -2291,14 +2178,6 @@ fr_event_list_t *fr_event_list_alloc(TALLOC_CTX *ctx, fr_event_status_cb_t statu
                goto error;
        }
 
-#ifdef LOCAL_PID
-       el->pids = fr_lst_talloc_alloc(el, fr_event_pid_cmp, fr_event_pid_t, lst_id, 0);
-       if (!el->pids) {
-               fr_strerror_const("Failed allocating PID lst");
-               goto error;
-       }
-#endif
-
        el->kq = kqueue();
        if (el->kq < 0) {
                fr_strerror_printf("Failed allocating kqueue: %s", fr_syserror(errno));