pyldb: avoid segfault when adding an element with no name
[sfrench/samba-autobuild/.git] / lib / tevent / tevent_epoll.c
index a662fee3a651d0b4c7d4a9b79ef35ab1138eabb1..9cbe505c98a4d817f43ec45091ad215add6b239a 100644 (file)
@@ -4,7 +4,8 @@
    main select loop and event handling - epoll implementation
 
    Copyright (C) Andrew Tridgell       2003-2005
-   Copyright (C) Stefan Metzmacher     2005-2009
+   Copyright (C) Stefan Metzmacher     2005-2013
+   Copyright (C) Jeremy Allison                2013
 
      ** NOTE! The following LGPL license applies to the tevent
      ** library. This does NOT imply that all of Samba is released
@@ -45,6 +46,11 @@ struct epoll_event_context {
        bool (*panic_fallback)(struct tevent_context *ev, bool replay);
 };
 
+#define EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT     (1<<0)
+#define EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR  (1<<1)
+#define EPOLL_ADDITIONAL_FD_FLAG_GOT_ERROR     (1<<2)
+#define EPOLL_ADDITIONAL_FD_FLAG_HAS_MPX       (1<<3)
+
 #ifdef TEST_PANIC_FALLBACK
 
 static int epoll_create_panic_fallback(struct epoll_event_context *epoll_ev,
@@ -110,23 +116,15 @@ static int epoll_wait_panic_fallback(struct epoll_event_context *epoll_ev,
 /*
   called to set the panic fallback function.
 */
-_PRIVATE_ bool tevent_epoll_set_panic_fallback(struct tevent_context *ev,
+_PRIVATE_ void tevent_epoll_set_panic_fallback(struct tevent_context *ev,
                                bool (*panic_fallback)(struct tevent_context *ev,
                                                       bool replay))
 {
-       struct epoll_event_context *epoll_ev;
+       struct epoll_event_context *epoll_ev =
+               talloc_get_type_abort(ev->additional_data,
+               struct epoll_event_context);
 
-       if (ev->additional_data == NULL) {
-               return false;
-       }
-
-       epoll_ev = talloc_get_type(ev->additional_data,
-                               struct epoll_event_context);
-       if (epoll_ev == NULL) {
-               return false;
-       }
        epoll_ev->panic_fallback = panic_fallback;
-       return true;
 }
 
 /*
@@ -157,7 +155,7 @@ static void epoll_panic(struct epoll_event_context *epoll_ev,
                abort();
        }
 
-       tevent_debug(ev, TEVENT_DEBUG_WARNING,
+       tevent_debug(ev, TEVENT_DEBUG_ERROR,
                     "%s (%s) replay[%u] - calling panic_fallback\n",
                     reason, strerror(errno), (unsigned)replay);
 
@@ -214,11 +212,11 @@ static int epoll_init_ctx(struct epoll_event_context *epoll_ev)
        return 0;
 }
 
-static void epoll_add_event(struct epoll_event_context *epoll_ev, struct tevent_fd *fde);
+static void epoll_update_event(struct epoll_event_context *epoll_ev, struct tevent_fd *fde);
 
 /*
   reopen the epoll handle when our pid changes
-  see http://junkcode.samba.org/ftp/unpacked/junkcode/epoll_fork.c for an 
+  see http://junkcode.samba.org/ftp/unpacked/junkcode/epoll_fork.c for an
   demonstration of why this is needed
  */
 static void epoll_check_reopen(struct epoll_event_context *epoll_ev)
@@ -246,7 +244,9 @@ static void epoll_check_reopen(struct epoll_event_context *epoll_ev)
        epoll_ev->pid = getpid();
        epoll_ev->panic_state = &panic_triggered;
        for (fde=epoll_ev->ev->fd_events;fde;fde=fde->next) {
-               epoll_add_event(epoll_ev, fde);
+               fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT;
+               epoll_update_event(epoll_ev, fde);
+
                if (panic_triggered) {
                        if (caller_panic_state != NULL) {
                                *caller_panic_state = true;
@@ -257,9 +257,100 @@ static void epoll_check_reopen(struct epoll_event_context *epoll_ev)
        epoll_ev->panic_state = NULL;
 }
 
-#define EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT     (1<<0)
-#define EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR  (1<<1)
-#define EPOLL_ADDITIONAL_FD_FLAG_GOT_ERROR     (1<<2)
+/*
+ epoll cannot add the same file descriptor twice, once
+ with read, once with write which is allowed by the
+ tevent backend. Multiplex the existing fde, flag it
+ as such so we can search for the correct fde on
+ event triggering.
+*/
+
+static int epoll_add_multiplex_fd(struct epoll_event_context *epoll_ev,
+                                 struct tevent_fd *add_fde)
+{
+       struct epoll_event event;
+       struct tevent_fd *mpx_fde;
+       int ret;
+
+       /* Find the existing fde that caused the EEXIST error. */
+       for (mpx_fde = epoll_ev->ev->fd_events; mpx_fde; mpx_fde = mpx_fde->next) {
+               if (mpx_fde->fd != add_fde->fd) {
+                       continue;
+               }
+
+               if (mpx_fde == add_fde) {
+                       continue;
+               }
+
+               break;
+       }
+       if (mpx_fde == NULL) {
+               tevent_debug(epoll_ev->ev, TEVENT_DEBUG_FATAL,
+                            "can't find multiplex fde for fd[%d]",
+                            add_fde->fd);
+               return -1;
+       }
+
+       if (mpx_fde->additional_flags & EPOLL_ADDITIONAL_FD_FLAG_HAS_MPX) {
+               /* Logic error. Can't have more than 2 multiplexed fde's. */
+               tevent_debug(epoll_ev->ev, TEVENT_DEBUG_FATAL,
+                            "multiplex fde for fd[%d] is already multiplexed\n",
+                            mpx_fde->fd);
+               return -1;
+       }
+
+       /*
+        * The multiplex fde must have the same fd, and also
+        * already have an epoll event attached.
+        */
+       if (!(mpx_fde->additional_flags & EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT)) {
+               /* Logic error. Can't have more than 2 multiplexed fde's. */
+               tevent_debug(epoll_ev->ev, TEVENT_DEBUG_FATAL,
+                            "multiplex fde for fd[%d] has no event\n",
+                            mpx_fde->fd);
+               return -1;
+       }
+
+       /* Modify the mpx_fde to add in the new flags. */
+       ZERO_STRUCT(event);
+       event.events = epoll_map_flags(mpx_fde->flags);
+       event.events |= epoll_map_flags(add_fde->flags);
+       event.data.ptr = mpx_fde;
+       ret = epoll_ctl(epoll_ev->epoll_fd, EPOLL_CTL_MOD, mpx_fde->fd, &event);
+       if (ret != 0 && errno == EBADF) {
+               tevent_debug(epoll_ev->ev, TEVENT_DEBUG_ERROR,
+                            "EPOLL_CTL_MOD EBADF for "
+                            "add_fde[%p] mpx_fde[%p] fd[%d] - disabling\n",
+                            add_fde, mpx_fde, add_fde->fd);
+               DLIST_REMOVE(epoll_ev->ev->fd_events, mpx_fde);
+               mpx_fde->wrapper = NULL;
+               mpx_fde->event_ctx = NULL;
+               DLIST_REMOVE(epoll_ev->ev->fd_events, add_fde);
+               add_fde->wrapper = NULL;
+               add_fde->event_ctx = NULL;
+               return 0;
+       } else if (ret != 0) {
+               return ret;
+       }
+
+       /*
+        * Make each fde->additional_data pointers point at each other
+        * so we can look them up from each other. They are now paired.
+        */
+       mpx_fde->additional_data = (struct tevent_fd *)add_fde;
+       add_fde->additional_data = (struct tevent_fd *)mpx_fde;
+
+       /* Now flag both fde's as being multiplexed. */
+       mpx_fde->additional_flags |= EPOLL_ADDITIONAL_FD_FLAG_HAS_MPX;
+       add_fde->additional_flags |= EPOLL_ADDITIONAL_FD_FLAG_HAS_MPX;
+
+       /* we need to keep the GOT_ERROR flag */
+       if (mpx_fde->additional_flags & EPOLL_ADDITIONAL_FD_FLAG_GOT_ERROR) {
+               add_fde->additional_flags |= EPOLL_ADDITIONAL_FD_FLAG_GOT_ERROR;
+       }
+
+       return 0;
+}
 
 /*
  add the epoll event to the given fd_event
@@ -268,26 +359,71 @@ static void epoll_add_event(struct epoll_event_context *epoll_ev, struct tevent_
 {
        struct epoll_event event;
        int ret;
+       struct tevent_fd *mpx_fde = NULL;
 
+       fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT;
        fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR;
 
-       /* if we don't want events yet, don't add an epoll_event */
-       if (fde->flags == 0) return;
+       if (fde->additional_flags & EPOLL_ADDITIONAL_FD_FLAG_HAS_MPX) {
+               /*
+                * This is a multiplexed fde, we need to include both
+                * flags in the modified event.
+                */
+               mpx_fde = talloc_get_type_abort(fde->additional_data,
+                                               struct tevent_fd);
+
+               mpx_fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT;
+               mpx_fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR;
+       }
 
        ZERO_STRUCT(event);
        event.events = epoll_map_flags(fde->flags);
+       if (mpx_fde != NULL) {
+               event.events |= epoll_map_flags(mpx_fde->flags);
+       }
        event.data.ptr = fde;
        ret = epoll_ctl(epoll_ev->epoll_fd, EPOLL_CTL_ADD, fde->fd, &event);
-       if (ret != 0) {
+       if (ret != 0 && errno == EBADF) {
+               tevent_debug(epoll_ev->ev, TEVENT_DEBUG_ERROR,
+                            "EPOLL_CTL_ADD EBADF for "
+                            "fde[%p] mpx_fde[%p] fd[%d] - disabling\n",
+                            fde, mpx_fde, fde->fd);
+               DLIST_REMOVE(epoll_ev->ev->fd_events, fde);
+               fde->wrapper = NULL;
+               fde->event_ctx = NULL;
+               if (mpx_fde != NULL) {
+                       DLIST_REMOVE(epoll_ev->ev->fd_events, mpx_fde);
+                       mpx_fde->wrapper = NULL;
+                       mpx_fde->event_ctx = NULL;
+               }
+               return;
+       } else if (ret != 0 && errno == EEXIST && mpx_fde == NULL) {
+               ret = epoll_add_multiplex_fd(epoll_ev, fde);
+               if (ret != 0) {
+                       epoll_panic(epoll_ev, "epoll_add_multiplex_fd failed",
+                                   false);
+                       return;
+               }
+       } else if (ret != 0) {
                epoll_panic(epoll_ev, "EPOLL_CTL_ADD failed", false);
                return;
        }
-       fde->additional_flags |= EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT;
 
+       fde->additional_flags |= EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT;
        /* only if we want to read we want to tell the event handler about errors */
        if (fde->flags & TEVENT_FD_READ) {
                fde->additional_flags |= EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR;
        }
+
+       if (mpx_fde == NULL) {
+               return;
+       }
+
+       mpx_fde->additional_flags |= EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT;
+       /* only if we want to read we want to tell the event handler about errors */
+       if (mpx_fde->flags & TEVENT_FD_READ) {
+               mpx_fde->additional_flags |= EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR;
+       }
 }
 
 /*
@@ -297,22 +433,51 @@ static void epoll_del_event(struct epoll_event_context *epoll_ev, struct tevent_
 {
        struct epoll_event event;
        int ret;
+       struct tevent_fd *mpx_fde = NULL;
 
+       fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT;
        fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR;
 
-       /* if there's no epoll_event, we don't need to delete it */
-       if (!(fde->additional_flags & EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT)) return;
+       if (fde->additional_flags & EPOLL_ADDITIONAL_FD_FLAG_HAS_MPX) {
+               /*
+                * This is a multiplexed fde, we need to modify both events.
+                */
+               mpx_fde = talloc_get_type_abort(fde->additional_data,
+                                               struct tevent_fd);
+
+               mpx_fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT;
+               mpx_fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR;
+       }
 
        ZERO_STRUCT(event);
-       event.events = epoll_map_flags(fde->flags);
-       event.data.ptr = fde;
        ret = epoll_ctl(epoll_ev->epoll_fd, EPOLL_CTL_DEL, fde->fd, &event);
-       if (ret != 0) {
-               tevent_debug(epoll_ev->ev, TEVENT_DEBUG_FATAL,
-                            "epoll_del_event failed! probable early close bug (%s)\n",
-                            strerror(errno));
+       if (ret != 0 && errno == ENOENT) {
+               /*
+                * This can happen after a epoll_check_reopen
+                * within epoll_event_fd_destructor.
+                */
+               tevent_debug(epoll_ev->ev, TEVENT_DEBUG_TRACE,
+                            "EPOLL_CTL_DEL ignoring ENOENT for fd[%d]\n",
+                            fde->fd);
+               return;
+       } else if (ret != 0 && errno == EBADF) {
+               tevent_debug(epoll_ev->ev, TEVENT_DEBUG_WARNING,
+                            "EPOLL_CTL_DEL EBADF for "
+                            "fde[%p] mpx_fde[%p] fd[%d] - disabling\n",
+                            fde, mpx_fde, fde->fd);
+               DLIST_REMOVE(epoll_ev->ev->fd_events, fde);
+               fde->wrapper = NULL;
+               fde->event_ctx = NULL;
+               if (mpx_fde != NULL) {
+                       DLIST_REMOVE(epoll_ev->ev->fd_events, mpx_fde);
+                       mpx_fde->wrapper = NULL;
+                       mpx_fde->event_ctx = NULL;
+               }
+               return;
+       } else if (ret != 0) {
+               epoll_panic(epoll_ev, "EPOLL_CTL_DEL failed", false);
+               return;
        }
-       fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT;
 }
 
 /*
@@ -320,33 +485,90 @@ static void epoll_del_event(struct epoll_event_context *epoll_ev, struct tevent_
 */
 static void epoll_mod_event(struct epoll_event_context *epoll_ev, struct tevent_fd *fde)
 {
+       struct tevent_fd *mpx_fde = NULL;
        struct epoll_event event;
        int ret;
 
+       fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT;
        fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR;
 
+       if (fde->additional_flags & EPOLL_ADDITIONAL_FD_FLAG_HAS_MPX) {
+               /*
+                * This is a multiplexed fde, we need to include both
+                * flags in the modified event.
+                */
+               mpx_fde = talloc_get_type_abort(fde->additional_data,
+                                               struct tevent_fd);
+
+               mpx_fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT;
+               mpx_fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR;
+       }
+
        ZERO_STRUCT(event);
        event.events = epoll_map_flags(fde->flags);
+       if (mpx_fde != NULL) {
+               event.events |= epoll_map_flags(mpx_fde->flags);
+       }
        event.data.ptr = fde;
        ret = epoll_ctl(epoll_ev->epoll_fd, EPOLL_CTL_MOD, fde->fd, &event);
-       if (ret != 0) {
+       if (ret != 0 && errno == EBADF) {
+               tevent_debug(epoll_ev->ev, TEVENT_DEBUG_ERROR,
+                            "EPOLL_CTL_MOD EBADF for "
+                            "fde[%p] mpx_fde[%p] fd[%d] - disabling\n",
+                            fde, mpx_fde, fde->fd);
+               DLIST_REMOVE(epoll_ev->ev->fd_events, fde);
+               fde->wrapper = NULL;
+               fde->event_ctx = NULL;
+               if (mpx_fde != NULL) {
+                       DLIST_REMOVE(epoll_ev->ev->fd_events, mpx_fde);
+                       mpx_fde->wrapper = NULL;
+                       mpx_fde->event_ctx = NULL;
+               }
+               return;
+       } else if (ret != 0) {
                epoll_panic(epoll_ev, "EPOLL_CTL_MOD failed", false);
                return;
        }
 
+       fde->additional_flags |= EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT;
        /* only if we want to read we want to tell the event handler about errors */
        if (fde->flags & TEVENT_FD_READ) {
                fde->additional_flags |= EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR;
        }
+
+       if (mpx_fde == NULL) {
+               return;
+       }
+
+       mpx_fde->additional_flags |= EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT;
+       /* only if we want to read we want to tell the event handler about errors */
+       if (mpx_fde->flags & TEVENT_FD_READ) {
+               mpx_fde->additional_flags |= EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR;
+       }
 }
 
-static void epoll_change_event(struct epoll_event_context *epoll_ev, struct tevent_fd *fde)
+static void epoll_update_event(struct epoll_event_context *epoll_ev, struct tevent_fd *fde)
 {
        bool got_error = (fde->additional_flags & EPOLL_ADDITIONAL_FD_FLAG_GOT_ERROR);
        bool want_read = (fde->flags & TEVENT_FD_READ);
        bool want_write= (fde->flags & TEVENT_FD_WRITE);
+       struct tevent_fd *mpx_fde = NULL;
 
-       fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR;
+       if (fde->additional_flags & EPOLL_ADDITIONAL_FD_FLAG_HAS_MPX) {
+               /*
+                * work out what the multiplexed fde wants.
+                */
+               mpx_fde = talloc_get_type_abort(fde->additional_data,
+                                               struct tevent_fd);
+
+               if (mpx_fde->flags & TEVENT_FD_READ) {
+                       want_read = true;
+               }
+
+               if (mpx_fde->flags & TEVENT_FD_WRITE) {
+                       want_write = true;
+               }
+       }
 
        /* there's already an event */
        if (fde->additional_flags & EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT) {
@@ -371,6 +593,38 @@ static void epoll_change_event(struct epoll_event_context *epoll_ev, struct teve
        }
 }
 
+/*
+  Cope with epoll returning EPOLLHUP|EPOLLERR on an event.
+  Return true if there's nothing else to do, false if
+  this event needs further handling.
+*/
+static bool epoll_handle_hup_or_err(struct epoll_event_context *epoll_ev,
+                               struct tevent_fd *fde)
+{
+       if (fde == NULL) {
+               /* Nothing to do if no event. */
+               return true;
+       }
+
+       fde->additional_flags |= EPOLL_ADDITIONAL_FD_FLAG_GOT_ERROR;
+       /*
+        * if we only wait for TEVENT_FD_WRITE, we should not tell the
+        * event handler about it, and remove the epoll_event,
+        * as we only report errors when waiting for read events,
+        * to match the select() behavior
+        */
+       if (!(fde->additional_flags & EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR)) {
+               /*
+                * Do the same as the poll backend and
+                * remove the writeable flag.
+                */
+               fde->flags &= ~TEVENT_FD_WRITE;
+               return true;
+       }
+       /* This has TEVENT_FD_READ set, we're not finished. */
+       return false;
+}
+
 /*
   event loop handling using epoll
 */
@@ -415,33 +669,71 @@ static int epoll_event_loop(struct epoll_event_context *epoll_ev, struct timeval
        }
 
        for (i=0;i<ret;i++) {
-               struct tevent_fd *fde = talloc_get_type(events[i].data.ptr, 
+               struct tevent_fd *fde = talloc_get_type(events[i].data.ptr,
                                                       struct tevent_fd);
                uint16_t flags = 0;
+               struct tevent_fd *mpx_fde = NULL;
 
                if (fde == NULL) {
                        epoll_panic(epoll_ev, "epoll_wait() gave bad data", true);
                        return -1;
                }
-               if (events[i].events & (EPOLLHUP|EPOLLERR)) {
-                       fde->additional_flags |= EPOLL_ADDITIONAL_FD_FLAG_GOT_ERROR;
+               if (fde->additional_flags & EPOLL_ADDITIONAL_FD_FLAG_HAS_MPX) {
                        /*
-                        * if we only wait for TEVENT_FD_WRITE, we should not tell the
-                        * event handler about it, and remove the epoll_event,
-                        * as we only report errors when waiting for read events,
-                        * to match the select() behavior
+                        * Save off the multiplexed event in case we need
+                        * to use it to call the handler function.
                         */
-                       if (!(fde->additional_flags & EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR)) {
-                               epoll_del_event(epoll_ev, fde);
+                       mpx_fde = talloc_get_type_abort(fde->additional_data,
+                                                       struct tevent_fd);
+               }
+               if (events[i].events & (EPOLLHUP|EPOLLERR)) {
+                       bool handled_fde = epoll_handle_hup_or_err(epoll_ev, fde);
+                       bool handled_mpx = epoll_handle_hup_or_err(epoll_ev, mpx_fde);
+
+                       if (handled_fde && handled_mpx) {
+                               epoll_update_event(epoll_ev, fde);
                                continue;
                        }
+
+                       if (!handled_mpx) {
+                               /*
+                                * If the mpx event was the one that needs
+                                * further handling, it's the TEVENT_FD_READ
+                                * event so switch over and call that handler.
+                                */
+                               fde = mpx_fde;
+                               mpx_fde = NULL;
+                       }
                        flags |= TEVENT_FD_READ;
                }
                if (events[i].events & EPOLLIN) flags |= TEVENT_FD_READ;
                if (events[i].events & EPOLLOUT) flags |= TEVENT_FD_WRITE;
+
+               if (flags & TEVENT_FD_WRITE) {
+                       if (fde->flags & TEVENT_FD_WRITE) {
+                               mpx_fde = NULL;
+                       }
+                       if (mpx_fde && mpx_fde->flags & TEVENT_FD_WRITE) {
+                               fde = mpx_fde;
+                               mpx_fde = NULL;
+                       }
+               }
+
+               if (mpx_fde) {
+                       /* Ensure we got the right fde. */
+                       if ((flags & fde->flags) == 0) {
+                               fde = mpx_fde;
+                               mpx_fde = NULL;
+                       }
+               }
+
+               /*
+                * make sure we only pass the flags
+                * the handler is expecting.
+                */
+               flags &= fde->flags;
                if (flags) {
-                       fde->handler(epoll_ev->ev, fde, flags, fde->private_data);
-                       break;
+                       return tevent_common_invoke_fd_handler(fde, flags, NULL);
                }
        }
 
@@ -485,6 +777,8 @@ static int epoll_event_fd_destructor(struct tevent_fd *fde)
        struct tevent_context *ev = fde->event_ctx;
        struct epoll_event_context *epoll_ev = NULL;
        bool panic_triggered = false;
+       struct tevent_fd *mpx_fde = NULL;
+       int flags = fde->flags;
 
        if (ev == NULL) {
                return tevent_common_fd_destructor(fde);
@@ -500,13 +794,35 @@ static int epoll_event_fd_destructor(struct tevent_fd *fde)
         */
        DLIST_REMOVE(ev->fd_events, fde);
 
+       if (fde->additional_flags & EPOLL_ADDITIONAL_FD_FLAG_HAS_MPX) {
+               mpx_fde = talloc_get_type_abort(fde->additional_data,
+                                               struct tevent_fd);
+
+               fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_HAS_MPX;
+               mpx_fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_HAS_MPX;
+
+               fde->additional_data = NULL;
+               mpx_fde->additional_data = NULL;
+
+               fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT;
+       }
+
        epoll_ev->panic_state = &panic_triggered;
        epoll_check_reopen(epoll_ev);
        if (panic_triggered) {
                return tevent_common_fd_destructor(fde);
        }
 
-       epoll_del_event(epoll_ev, fde);
+       if (mpx_fde != NULL) {
+               epoll_update_event(epoll_ev, mpx_fde);
+               if (panic_triggered) {
+                       return tevent_common_fd_destructor(fde);
+               }
+       }
+
+       fde->flags = 0;
+       epoll_update_event(epoll_ev, fde);
+       fde->flags = flags;
        if (panic_triggered) {
                return tevent_common_fd_destructor(fde);
        }
@@ -526,8 +842,9 @@ static struct tevent_fd *epoll_event_add_fd(struct tevent_context *ev, TALLOC_CT
                                            const char *handler_name,
                                            const char *location)
 {
-       struct epoll_event_context *epoll_ev = talloc_get_type(ev->additional_data,
-                                                          struct epoll_event_context);
+       struct epoll_event_context *epoll_ev =
+               talloc_get_type_abort(ev->additional_data,
+               struct epoll_event_context);
        struct tevent_fd *fde;
        bool panic_triggered = false;
 
@@ -545,7 +862,7 @@ static struct tevent_fd *epoll_event_add_fd(struct tevent_context *ev, TALLOC_CT
        }
        epoll_ev->panic_state = NULL;
 
-       epoll_add_event(epoll_ev, fde);
+       epoll_update_event(epoll_ev, fde);
 
        return fde;
 }
@@ -562,7 +879,8 @@ static void epoll_event_set_fd_flags(struct tevent_fd *fde, uint16_t flags)
        if (fde->flags == flags) return;
 
        ev = fde->event_ctx;
-       epoll_ev = talloc_get_type(ev->additional_data, struct epoll_event_context);
+       epoll_ev = talloc_get_type_abort(ev->additional_data,
+                                        struct epoll_event_context);
 
        fde->flags = flags;
 
@@ -573,16 +891,17 @@ static void epoll_event_set_fd_flags(struct tevent_fd *fde, uint16_t flags)
        }
        epoll_ev->panic_state = NULL;
 
-       epoll_change_event(epoll_ev, fde);
+       epoll_update_event(epoll_ev, fde);
 }
 
 /*
-  do a single event loop using the events defined in ev 
+  do a single event loop using the events defined in ev
 */
 static int epoll_event_loop_once(struct tevent_context *ev, const char *location)
 {
-       struct epoll_event_context *epoll_ev = talloc_get_type(ev->additional_data,
-                                                          struct epoll_event_context);
+       struct epoll_event_context *epoll_ev =
+               talloc_get_type_abort(ev->additional_data,
+               struct epoll_event_context);
        struct timeval tval;
        bool panic_triggered = false;
 
@@ -591,6 +910,10 @@ static int epoll_event_loop_once(struct tevent_context *ev, const char *location
                return 0;
        }
 
+       if (ev->threaded_contexts != NULL) {
+               tevent_common_threaded_activate_immediate(ev);
+       }
+
        if (ev->immediate_events &&
            tevent_common_loop_immediate(ev)) {
                return 0;
@@ -620,7 +943,7 @@ static const struct tevent_ops epoll_event_ops = {
        .set_fd_close_fn        = tevent_common_fd_set_close_fn,
        .get_fd_flags           = tevent_common_fd_get_flags,
        .set_fd_flags           = epoll_event_set_fd_flags,
-       .add_timer              = tevent_common_add_timer,
+       .add_timer              = tevent_common_add_timer_v2,
        .schedule_immediate     = tevent_common_schedule_immediate,
        .add_signal             = tevent_common_add_signal,
        .loop_once              = epoll_event_loop_once,