X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Fcompat-poll.c;h=0c59e98ce9917c4b22b5912d1e88e23fe4c777ae;hp=cc280c7640ce4d011904da27fac43712ce1df272;hb=4fb28dfc10106c4095ca3b1155d4da9a04467fd1;hpb=a9b0dbc2405118ef5c69b7834f7cb4617b883cd1 diff --git a/src/common/compat/compat-poll.c b/src/common/compat/compat-poll.c index cc280c764..0c59e98ce 100644 --- a/src/common/compat/compat-poll.c +++ b/src/common/compat/compat-poll.c @@ -1,18 +1,9 @@ /* - * Copyright (C) 2011 - David Goulet + * Copyright (C) 2011 David Goulet + * Copyright (C) 2019 Yannick Lamarre * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2 only, - * as published by the Free Software Foundation. + * SPDX-License-Identifier: GPL-2.0-only * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #define _LGPL_SOURCE @@ -20,6 +11,7 @@ #include #include #include +#include #include #include @@ -28,7 +20,14 @@ #include "poll.h" -unsigned int poll_max_size; + +/* + * Maximum number of fd we can monitor. + * + * For poll(2), the max fds must not exceed RLIMIT_NOFILE given by + * getrlimit(2). + */ +static unsigned int poll_max_size; /* * Resize the epoll events structure of the new size. @@ -101,6 +100,7 @@ error: /* * Create pollfd data structure. */ +LTTNG_HIDDEN int compat_poll_create(struct lttng_poll_event *events, int size) { struct compat_poll_event_array *current, *wait; @@ -111,8 +111,9 @@ int compat_poll_create(struct lttng_poll_event *events, int size) } if (!poll_max_size) { - ERR("poll_max_size not initialized yet"); - goto error; + if (lttng_poll_set_max_size()) { + goto error; + } } /* Don't bust the limit here */ @@ -152,6 +153,7 @@ error: /* * Add fd to pollfd data structure with requested events. */ +LTTNG_HIDDEN int compat_poll_add(struct lttng_poll_event *events, int fd, uint32_t req_events) { @@ -195,16 +197,55 @@ error: return -1; } +/* + * Modify an fd's events.. + */ +LTTNG_HIDDEN +int compat_poll_mod(struct lttng_poll_event *events, int fd, + uint32_t req_events) +{ + int i; + struct compat_poll_event_array *current; + + if (events == NULL || events->current.nb_fd == 0 || + events->current.events == NULL || fd < 0) { + ERR("Bad compat poll mod arguments"); + goto error; + } + + current = &events->current; + + for (i = 0; i < current->nb_fd; i++) { + if (current->events[i].fd == fd) { + current->events[i].events = req_events; + events->need_update = 1; + break; + } + } + + /* + * The epoll flavor doesn't flag modifying a non-included FD as an + * error. + */ + + return 0; + +error: + return -1; +} + /* * Remove a fd from the pollfd structure. */ +LTTNG_HIDDEN int compat_poll_del(struct lttng_poll_event *events, int fd) { - int new_size, i, count = 0, ret; + int i, count = 0, ret; + uint32_t new_size; struct compat_poll_event_array *current; - if (events == NULL || events->current.events == NULL || fd < 0) { - ERR("Wrong arguments for poll del"); + if (events == NULL || events->current.nb_fd == 0 || + events->current.events == NULL || fd < 0) { goto error; } @@ -219,13 +260,20 @@ int compat_poll_del(struct lttng_poll_event *events, int fd) count++; } } + + /* The fd was not in our set, return no error as with epoll. */ + if (current->nb_fd == count) { + goto end; + } + /* 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) { + if (new_size != current->alloc_size && new_size >= current->init_size + && current->nb_fd != 0) { ret = resize_poll_event(current, new_size); if (ret < 0) { goto error; @@ -234,6 +282,7 @@ int compat_poll_del(struct lttng_poll_event *events, int fd) events->need_update = 1; +end: return 0; error: @@ -243,15 +292,18 @@ error: /* * Wait on poll() with timeout. Blocking call. */ -int compat_poll_wait(struct lttng_poll_event *events, int timeout) +LTTNG_HIDDEN +int compat_poll_wait(struct lttng_poll_event *events, int timeout, + bool interruptible) { - int ret; + int ret, active_fd_count; + int idle_pfd_index = 0; + size_t i; if (events == NULL || events->current.events == NULL) { 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. */ @@ -270,18 +322,47 @@ int compat_poll_wait(struct lttng_poll_event *events, int timeout) do { ret = poll(events->wait.events, events->wait.nb_fd, timeout); - } while (ret == -1 && errno == EINTR); + } while (!interruptible && ret == -1 && errno == EINTR); if (ret < 0) { - /* At this point, every error is fatal */ - PERROR("poll wait"); + if (errno != EINTR) { + PERROR("poll wait"); + } goto error; } + active_fd_count = ret; + /* - * poll() should always iterate on all FDs since we handle the pollset in - * user space and after poll returns, we have to try every fd for a match. + * Swap all active pollfd structs to the beginning of the + * array to emulate compat-epoll behaviour. This algorithm takes + * advantage of poll's returned value and the burst nature of active + * events on the file descriptors. The while loop guarantees that + * idle_pfd will always point to an idle fd. */ - return events->wait.nb_fd; + if (active_fd_count == events->wait.nb_fd) { + goto end; + } + while (idle_pfd_index < active_fd_count && + events->wait.events[idle_pfd_index].revents != 0) { + idle_pfd_index++; + } + + for (i = idle_pfd_index + 1; idle_pfd_index < active_fd_count; + i++) { + struct pollfd swap_pfd; + struct pollfd *idle_pfd = &events->wait.events[idle_pfd_index]; + struct pollfd *current_pfd = &events->wait.events[i]; + + if (idle_pfd->revents != 0) { + swap_pfd = *current_pfd; + *current_pfd = *idle_pfd; + *idle_pfd = swap_pfd; + idle_pfd_index++; + } + } + +end: + return ret; error: return -1; @@ -290,6 +371,7 @@ error: /* * Setup poll set maximum size. */ +LTTNG_HIDDEN int compat_poll_set_max_size(void) { int ret, retval = 0;