X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Fcompat-poll.c;h=7d4d0e1334ef1dc2abba28f9e694d2ce8052d1ea;hp=4893768a098543815207c90283eb9591d97a3a4a;hb=c607fe035ea8821a8f4c6ab6f3467ec726e36a63;hpb=53efb85a242809ed5ed21e9ab40effa696ecbc6f diff --git a/src/common/compat/compat-poll.c b/src/common/compat/compat-poll.c index 4893768a0..7d4d0e133 100644 --- a/src/common/compat/compat-poll.c +++ b/src/common/compat/compat-poll.c @@ -15,7 +15,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE +#define _LGPL_SOURCE #include #include #include @@ -80,7 +80,7 @@ static int update_current_events(struct lttng_poll_event *events) wait = &events->wait; wait->nb_fd = current->nb_fd; - if (events->need_realloc) { + if (current->alloc_size != wait->alloc_size) { ret = resize_poll_event(wait, current->alloc_size); if (ret < 0) { goto error; @@ -89,9 +89,8 @@ static int update_current_events(struct lttng_poll_event *events) memcpy(wait->events, current->events, current->nb_fd * sizeof(*current->events)); - /* Update is done and realloc as well. */ + /* Update is done. */ events->need_update = 0; - events->need_realloc = 0; return 0; @@ -111,6 +110,12 @@ int compat_poll_create(struct lttng_poll_event *events, int size) goto error; } + if (!poll_max_size) { + if (lttng_poll_set_max_size()) { + goto error; + } + } + /* Don't bust the limit here */ if (size > poll_max_size) { size = poll_max_size; @@ -119,14 +124,13 @@ int compat_poll_create(struct lttng_poll_event *events, int size) /* Reset everything before begining the allocation. */ memset(events, 0, sizeof(struct lttng_poll_event)); - /* Ease our life a bit. */ current = &events->current; wait = &events->wait; /* This *must* be freed by using lttng_poll_free() */ wait->events = zmalloc(size * sizeof(struct pollfd)); if (wait->events == NULL) { - perror("zmalloc struct pollfd"); + PERROR("zmalloc struct pollfd"); goto error; } @@ -134,7 +138,7 @@ int compat_poll_create(struct lttng_poll_event *events, int size) current->events = zmalloc(size * sizeof(struct pollfd)); if (current->events == NULL) { - perror("zmalloc struct current pollfd"); + PERROR("zmalloc struct current pollfd"); goto error; } @@ -160,29 +164,23 @@ int compat_poll_add(struct lttng_poll_event *events, int fd, goto error; } - /* Ease our life a bit. */ current = &events->current; /* Check if fd we are trying to add is already there. */ for (i = 0; i < current->nb_fd; i++) { - /* Don't put back the fd we want to delete */ if (current->events[i].fd == fd) { errno = EEXIST; goto error; } } - /* Check for a needed resize of the array. */ - if (current->nb_fd > current->alloc_size) { - /* Expand it by a power of two of the current size. */ - new_size = max_t(int, - 1U << utils_get_count_order_u32(current->nb_fd), - current->alloc_size << 1UL); + /* Resize array if needed. */ + new_size = 1U << utils_get_count_order_u32(current->nb_fd + 1); + if (new_size != current->alloc_size && new_size >= current->init_size) { ret = resize_poll_event(current, new_size); if (ret < 0) { goto error; } - events->need_realloc = 1; } current->events[current->nb_fd].fd = fd; @@ -214,23 +212,6 @@ int compat_poll_del(struct lttng_poll_event *events, int fd) /* Ease our life a bit. */ current = &events->current; - /* Check if we need to shrink it down. */ - if ((current->nb_fd << 1UL) <= current->alloc_size && - current->nb_fd >= current->init_size) { - /* - * Shrink if nb_fd multiplied by two is <= than the actual size and we - * are above the initial size. - */ - new_size = max_t(int, - utils_get_count_order_u32(current->nb_fd) >> 1U, - current->alloc_size >> 1U); - ret = resize_poll_event(current, new_size); - if (ret < 0) { - goto error; - } - events->need_realloc = 1; - } - for (i = 0; i < current->nb_fd; i++) { /* Don't put back the fd we want to delete */ if (current->events[i].fd != fd) { @@ -239,8 +220,19 @@ int compat_poll_del(struct lttng_poll_event *events, int fd) count++; } } + /* No fd duplicate should be ever added into array. */ + assert(current->nb_fd - 1 == count); + current->nb_fd = count; + + /* Resize array if needed. */ + new_size = 1U << utils_get_count_order_u32(current->nb_fd); + if (new_size != current->alloc_size && new_size >= current->init_size) { + ret = resize_poll_event(current, new_size); + if (ret < 0) { + goto error; + } + } - current->nb_fd--; events->need_update = 1; return 0; @@ -260,10 +252,12 @@ int compat_poll_wait(struct lttng_poll_event *events, int timeout) ERR("poll wait arguments error"); goto error; } + assert(events->current.nb_fd >= 0); if (events->current.nb_fd == 0) { /* Return an invalid error to be consistent with epoll. */ errno = EINVAL; + events->wait.nb_fd = 0; goto error; } @@ -275,10 +269,12 @@ int compat_poll_wait(struct lttng_poll_event *events, int timeout) } } - ret = poll(events->wait.events, events->wait.nb_fd, timeout); + do { + ret = poll(events->wait.events, events->wait.nb_fd, timeout); + } while (ret == -1 && errno == EINTR); if (ret < 0) { /* At this point, every error is fatal */ - perror("poll wait"); + PERROR("poll wait"); goto error; } @@ -295,25 +291,23 @@ error: /* * Setup poll set maximum size. */ -void compat_poll_set_max_size(void) +int compat_poll_set_max_size(void) { - int ret; + int ret, retval = 0; struct rlimit lim; - /* Default value */ - poll_max_size = DEFAULT_POLL_SIZE; - ret = getrlimit(RLIMIT_NOFILE, &lim); if (ret < 0) { - perror("getrlimit poll RLIMIT_NOFILE"); - return; + PERROR("getrlimit poll RLIMIT_NOFILE"); + retval = -1; + goto end; } poll_max_size = lim.rlim_cur; +end: if (poll_max_size == 0) { - /* Extra precaution */ poll_max_size = DEFAULT_POLL_SIZE; } - DBG("poll set max size set to %u", poll_max_size); + return retval; }