diff options
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/events/events_aio.c | 2 | ||||
| -rw-r--r-- | source4/lib/events/events_epoll.c | 2 | ||||
| -rw-r--r-- | source4/lib/events/events_select.c | 10 | ||||
| -rw-r--r-- | source4/lib/events/events_standard.c | 4 |
4 files changed, 7 insertions, 11 deletions
diff --git a/source4/lib/events/events_aio.c b/source4/lib/events/events_aio.c index cd3c32a9b8..90d4bdcc1f 100644 --- a/source4/lib/events/events_aio.c +++ b/source4/lib/events/events_aio.c @@ -219,7 +219,7 @@ static int setup_epoll_wait(struct aio_event_context *aio_ev) static int aio_event_loop(struct aio_event_context *aio_ev, struct timeval *tvalp) { int ret, i; - uint32_t destruction_count = aio_ev->destruction_count; + uint32_t destruction_count = ++aio_ev->destruction_count; struct timespec timeout; struct io_event events[8]; diff --git a/source4/lib/events/events_epoll.c b/source4/lib/events/events_epoll.c index efcbb97f0b..58eeb08cd5 100644 --- a/source4/lib/events/events_epoll.c +++ b/source4/lib/events/events_epoll.c @@ -204,7 +204,7 @@ static int epoll_event_loop(struct epoll_event_context *epoll_ev, struct timeval int ret, i; #define MAXEVENTS 8 struct epoll_event events[MAXEVENTS]; - uint32_t destruction_count = epoll_ev->destruction_count; + uint32_t destruction_count = ++epoll_ev->destruction_count; int timeout = -1; if (epoll_ev->epoll_fd == -1) return -1; diff --git a/source4/lib/events/events_select.c b/source4/lib/events/events_select.c index ea84353183..36b5afc42e 100644 --- a/source4/lib/events/events_select.c +++ b/source4/lib/events/events_select.c @@ -47,12 +47,8 @@ struct select_event_context { /* information for exiting from the event loop */ int exit_code; - /* this is changed by the destructors for the fd event - type. It is used to detect event destruction by event - handlers, which means the code that is calling the event - handler needs to assume that the linked list is no longer - valid - */ + /* this is incremented when the loop over events causes something which + could change the events yet to be processed */ uint32_t destruction_count; }; @@ -177,7 +173,7 @@ static int select_event_loop_select(struct select_event_context *select_ev, stru fd_set r_fds, w_fds; struct fd_event *fde; int selrtn; - uint32_t destruction_count = select_ev->destruction_count; + uint32_t destruction_count = ++select_ev->destruction_count; /* we maybe need to recalculate the maxfd */ if (select_ev->maxfd == EVENT_INVALID_MAXFD) { diff --git a/source4/lib/events/events_standard.c b/source4/lib/events/events_standard.c index 9c470235d0..48959526c0 100644 --- a/source4/lib/events/events_standard.c +++ b/source4/lib/events/events_standard.c @@ -219,7 +219,7 @@ static int epoll_event_loop(struct std_event_context *std_ev, struct timeval *tv int ret, i; #define MAXEVENTS 8 struct epoll_event events[MAXEVENTS]; - uint32_t destruction_count = std_ev->destruction_count; + uint32_t destruction_count = ++std_ev->destruction_count; int timeout = -1; if (std_ev->epoll_fd == -1) return -1; @@ -425,7 +425,7 @@ static int std_event_loop_select(struct std_event_context *std_ev, struct timeva fd_set r_fds, w_fds; struct fd_event *fde; int selrtn; - uint32_t destruction_count = std_ev->destruction_count; + uint32_t destruction_count = ++std_ev->destruction_count; /* we maybe need to recalculate the maxfd */ if (std_ev->maxfd == EVENT_INVALID_MAXFD) { |