assert(0 != sock);
Debug((DEBUG_ENGINE, "epoll: Deleting socket %d [%p], state %s",
s_fd(sock), sock, state_to_name(s_state(sock))));
assert(0 != sock);
Debug((DEBUG_ENGINE, "epoll: Deleting socket %d [%p], state %s",
s_fd(sock), sock, state_to_name(s_state(sock))));
- /* No action necessary; epoll removes the socket on close(). */
+ /* Drop any unprocessed events citing this socket. */
+ for (ii = events_i; ii < events_used; ii++) {
+ if (events[ii].data.ptr == sock) {
+ events[ii] = events[--events_used];
+ }
+ }
- int events_count, i, wait, nevs, errcode;
+ int events_count, tmp, wait, errcode;
if ((events_count = feature_int(FEAT_POLLS_PER_LOOP)) < 20)
events_count = 20;
events = MyMalloc(sizeof(events[0]) * events_count);
while (running) {
if ((events_count = feature_int(FEAT_POLLS_PER_LOOP)) < 20)
events_count = 20;
events = MyMalloc(sizeof(events[0]) * events_count);
while (running) {
- if ((i = feature_int(FEAT_POLLS_PER_LOOP)) >= 20 && i != events_count) {
- events = MyRealloc(events, sizeof(events[0]) * i);
- events_count = i;
+ if ((tmp = feature_int(FEAT_POLLS_PER_LOOP)) >= 20 && tmp != events_count) {
+ events = MyRealloc(events, sizeof(events[0]) * tmp);
+ events_count = tmp;
}
wait = timer_next(gen) ? (timer_next(gen) - CurrentTime) * 1000 : -1;
Debug((DEBUG_ENGINE, "epoll: delay: %d (%d) %d", timer_next(gen),
CurrentTime, wait));
}
wait = timer_next(gen) ? (timer_next(gen) - CurrentTime) * 1000 : -1;
Debug((DEBUG_ENGINE, "epoll: delay: %d (%d) %d", timer_next(gen),
CurrentTime, wait));
- nevs = epoll_wait(epoll_fd, events, events_count, wait);
+ events_used = epoll_wait(epoll_fd, events, events_count, wait);
if (errno != EINTR) {
log_write(LS_SOCKET, L_ERROR, 0, "epoll() error: %m");
if (!errors++)
if (errno != EINTR) {
log_write(LS_SOCKET, L_ERROR, 0, "epoll() error: %m");
if (!errors++)
- for (i = 0; i < nevs; i++) {
- if (!(sock = events[i].data.ptr))
+ for (events_i = 0; events_i < events_used; ) {
+ evt = &events[events_i++];
+ if (!(sock = evt->data.ptr))
sock, s_fd(sock), state_to_name(s_state(sock)),
sock_flags(s_events(sock))));
sock, s_fd(sock), state_to_name(s_state(sock)),
sock_flags(s_events(sock))));
errcode = 0;
codesize = sizeof(errcode);
if (getsockopt(s_fd(sock), SOL_SOCKET, SO_ERROR, &errcode,
errcode = 0;
codesize = sizeof(errcode);
if (getsockopt(s_fd(sock), SOL_SOCKET, SO_ERROR, &errcode,
event_generate(ET_EOF, sock, 0);
} else switch (s_state(sock)) {
case SS_CONNECTING:
event_generate(ET_EOF, sock, 0);
} else switch (s_state(sock)) {
case SS_CONNECTING: