/*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- * Copyright (C) 2019 - Yannick Lamarre <ylamarre@efficios.com>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2019 Yannick Lamarre <ylamarre@efficios.com>
*
- * 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
#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.
/*
* Create pollfd data structure.
*/
+LTTNG_HIDDEN
int compat_poll_create(struct lttng_poll_event *events, int size)
{
struct compat_poll_event_array *current, *wait;
/*
* 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)
{
/*
* Modify an fd's events..
*/
+LTTNG_HIDDEN
int compat_poll_mod(struct lttng_poll_event *events, int fd,
uint32_t req_events)
{
/*
* Remove a fd from the pollfd structure.
*/
+LTTNG_HIDDEN
int compat_poll_del(struct lttng_poll_event *events, int fd)
{
int i, count = 0, ret;
/*
* 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, active_fd_count;
int idle_pfd_index = 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. */
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;
}
struct pollfd *idle_pfd = &events->wait.events[idle_pfd_index];
struct pollfd *current_pfd = &events->wait.events[i];
- if (ipfd->revents != 0) {
+ if (idle_pfd->revents != 0) {
swap_pfd = *current_pfd;
*current_pfd = *idle_pfd;
*idle_pfd = swap_pfd;
/*
* Setup poll set maximum size.
*/
+LTTNG_HIDDEN
int compat_poll_set_max_size(void)
{
int ret, retval = 0;