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;
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;
goto error;
}
+ if (!poll_max_size) {
+ ERR("poll_max_size not initialized yet");
+ goto error;
+ }
+
/* Don't bust the limit here */
if (size > poll_max_size) {
size = poll_max_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;
}
current->events = zmalloc(size * sizeof(struct pollfd));
if (current->events == NULL) {
- perror("zmalloc struct current pollfd");
+ PERROR("zmalloc struct current pollfd");
goto error;
}
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;
/* 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) {
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;
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;
}
ret = poll(events->wait.events, events->wait.nb_fd, timeout);
if (ret < 0) {
/* At this point, every error is fatal */
- perror("poll wait");
+ PERROR("poll wait");
goto 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;
}