From ba4efecb6df9cdc5cfaba42b8af75ea4edcc7517 Mon Sep 17 00:00:00 2001 From: Richard Nyberg Date: Tue, 7 Nov 2006 20:04:15 +0000 Subject: Bring in fixes from libevent trunk. --- libevent/poll.c | 48 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 14 deletions(-) (limited to 'libevent/poll.c') diff --git a/libevent/poll.c b/libevent/poll.c index f05819e..7c1593f 100644 --- a/libevent/poll.c +++ b/libevent/poll.c @@ -234,29 +234,48 @@ poll_add(void *arg, struct event *ev) poll_check_ok(pop); if (pop->nfds + 1 >= pop->event_count) { + struct pollfd *tmp_event_set; + struct event **tmp_event_r_back; + struct event **tmp_event_w_back; + int tmp_event_count; + if (pop->event_count < 32) - pop->event_count = 32; + tmp_event_count = 32; else - pop->event_count *= 2; + tmp_event_count = pop->event_count * 2; /* We need more file descriptors */ - pop->event_set = realloc(pop->event_set, - pop->event_count * sizeof(struct pollfd)); - if (pop->event_set == NULL) { + tmp_event_set = realloc(pop->event_set, + tmp_event_count * sizeof(struct pollfd)); + if (tmp_event_set == NULL) { event_warn("realloc"); return (-1); } - pop->event_r_back = realloc(pop->event_r_back, - pop->event_count * sizeof(struct event *)); - pop->event_w_back = realloc(pop->event_w_back, - pop->event_count * sizeof(struct event *)); - if (pop->event_r_back == NULL || - pop->event_w_back == NULL) { + pop->event_set = tmp_event_set; + + tmp_event_r_back = realloc(pop->event_r_back, + tmp_event_count * sizeof(struct event *)); + if (tmp_event_r_back == NULL) { + /* event_set overallocated; that's okay. */ event_warn("realloc"); return (-1); } + pop->event_r_back = tmp_event_r_back; + + tmp_event_w_back = realloc(pop->event_w_back, + tmp_event_count * sizeof(struct event *)); + if (tmp_event_w_back == NULL) { + /* event_set and event_r_back overallocated; that's + * okay. */ + event_warn("realloc"); + return (-1); + } + pop->event_w_back = tmp_event_w_back; + + pop->event_count = tmp_event_count; } if (ev->ev_fd >= pop->fd_count) { + int *tmp_idxplus1_by_fd; int new_count; if (pop->fd_count < 32) new_count = 32; @@ -264,12 +283,13 @@ poll_add(void *arg, struct event *ev) new_count = pop->fd_count * 2; while (new_count <= ev->ev_fd) new_count *= 2; - pop->idxplus1_by_fd = - realloc(pop->idxplus1_by_fd, new_count*sizeof(int)); - if (pop->idxplus1_by_fd == NULL) { + tmp_idxplus1_by_fd = + realloc(pop->idxplus1_by_fd, new_count * sizeof(int)); + if (tmp_idxplus1_by_fd == NULL) { event_warn("realloc"); return (-1); } + pop->idxplus1_by_fd = tmp_idxplus1_by_fd; memset(pop->idxplus1_by_fd + pop->fd_count, 0, sizeof(int)*(new_count - pop->fd_count)); pop->fd_count = new_count; -- cgit 1.4.1