/*
* Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; only version 2 of the License.
+ * 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.
*
* 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., 59 Temple
- * Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 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.
*/
#ifndef _LTT_POLL_H
#include <string.h>
#include <unistd.h>
-#include <common/lttng-share.h>
-
-/*
- * Value taken from the hard limit allowed by the kernel when using setrlimit
- * with RLIMIT_NOFILE on an Intel i7 CPU and Linux 3.0.3.
- */
-#define LTTNG_POLL_DEFAULT_SIZE 65535
+#include <common/common.h>
/*
* Maximum number of fd we can monitor.
*/
#ifdef HAVE_EPOLL
#include <sys/epoll.h>
+#include <stdio.h>
/* See man epoll(7) for this define path */
-#define LTTNG_EPOLL_PROC_PATH "/proc/sys/fs/epoll/max_user_watches"
+#define COMPAT_EPOLL_PROC_PATH "/proc/sys/fs/epoll/max_user_watches"
enum {
/* Polling variables compatibility for epoll */
extern int compat_epoll_create(struct lttng_poll_event *events,
int size, int flags);
#define lttng_poll_create(events, size, flags) \
- compat_epoll_create(events, size, flags);
+ compat_epoll_create(events, size, flags)
/*
* Wait on epoll set with the number of fd registered to the lttng_poll_event
*/
extern int compat_epoll_wait(struct lttng_poll_event *events, int timeout);
#define lttng_poll_wait(events, timeout) \
- compat_epoll_wait(events, timeout);
+ compat_epoll_wait(events, timeout)
/*
* Add a fd to the epoll set and resize the epoll_event structure if needed.
extern int compat_epoll_add(struct lttng_poll_event *events,
int fd, uint32_t req_events);
#define lttng_poll_add(events, fd, req_events) \
- compat_epoll_add(events, fd, req_events);
+ compat_epoll_add(events, fd, req_events)
/*
* Remove a fd from the epoll set.
*/
extern int compat_epoll_del(struct lttng_poll_event *events, int fd);
#define lttng_poll_del(events, fd) \
- compat_epoll_del(events, fd);
+ compat_epoll_del(events, fd)
/*
* Set up the poll set limits variable poll_max_size
*/
extern void compat_epoll_set_max_size(void);
-#define lttng_poll_set_max_size(void) \
- compat_epoll_set_max_size(void);
+#define lttng_poll_set_max_size() \
+ compat_epoll_set_max_size()
/*
* This function memset with zero the structure since it can be reused at each
*/
static inline void lttng_poll_clean(struct lttng_poll_event *events)
{
+ int ret;
+
if (events) {
- close(events->epfd);
+ ret = close(events->epfd);
+ if (ret) {
+ perror("close");
+ }
__lttng_poll_free((void *) events->events);
}
}
LPOLLRDBAND = POLLRDBAND,
LPOLLWRNORM = POLLWRNORM,
LPOLLWRBAND = POLLWRBAND,
+#if __linux__
LPOLLMSG = POLLMSG,
+ LPOLLRDHUP = POLLRDHUP,
+#elif (defined(__FreeBSD__) || defined(__CYGWIN__))
+ LPOLLMSG = 0,
+ LPOLLRDHUP = 0,
+#else
+#error "Please add support for your OS."
+#endif /* __linux__ */
LPOLLERR = POLLERR,
LPOLLHUP = POLLHUP | POLLNVAL,
- LPOLLRDHUP = POLLRDHUP,
/* Close on exec feature does not exist for poll(2) */
LTTNG_CLOEXEC = 0xdead,
};
*/
extern int compat_poll_create(struct lttng_poll_event *events, int size);
#define lttng_poll_create(events, size, flags) \
- compat_poll_create(events, size);
+ compat_poll_create(events, size)
/*
* Wait on poll(2) event with nb_fd registered to the lttng_poll_event data
*/
extern int compat_poll_wait(struct lttng_poll_event *events, int timeout);
#define lttng_poll_wait(events, timeout) \
- compat_poll_wait(events, timeout);
+ compat_poll_wait(events, timeout)
/*
* Add the fd to the pollfd structure. Resize if needed.
extern int compat_poll_add(struct lttng_poll_event *events,
int fd, uint32_t req_events);
#define lttng_poll_add(events, fd, req_events) \
- compat_poll_add(events, fd, req_events);
+ compat_poll_add(events, fd, req_events)
/*
* Remove the fd from the pollfd. Memory allocation is done to recreate a new
*/
extern int compat_poll_del(struct lttng_poll_event *events, int fd);
#define lttng_poll_del(events, fd) \
- compat_poll_del(events, fd);
+ compat_poll_del(events, fd)
/*
* Set up the poll set limits variable poll_max_size
*/
extern void compat_poll_set_max_size(void);
-#define lttng_poll_set_max_size(void) \
- compat_poll_set_max_size(void);
+#define lttng_poll_set_max_size() \
+ compat_poll_set_max_size()
/*
* No need to reset a pollfd structure for poll(2)