X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Fpoll.h;h=5379c806aa8e1e3947f98c7b058ca32ad7113cbc;hb=refs%2Fheads%2Fbabeltrace_trace_merging;hp=b019b42c09ff12f81dfc92a12c6872e318f678ea;hpb=c5854b1c8a413ec3803df8a9f15369c3ec876977;p=lttng-tools.git diff --git a/src/common/compat/poll.h b/src/common/compat/poll.h index b019b42c0..5379c806a 100644 --- a/src/common/compat/poll.h +++ b/src/common/compat/poll.h @@ -52,6 +52,8 @@ static inline void __lttng_poll_free(void *events) #ifdef HAVE_EPOLL #include #include +#include +#include /* See man epoll(7) for this define path */ #define COMPAT_EPOLL_PROC_PATH "/proc/sys/fs/epoll/max_user_watches" @@ -71,7 +73,17 @@ enum { LPOLLNVAL = EPOLLHUP, LPOLLRDHUP = EPOLLRDHUP, /* Close on exec feature of epoll */ +#if defined(HAVE_EPOLL_CREATE1) && defined(EPOLL_CLOEXEC) LTTNG_CLOEXEC = EPOLL_CLOEXEC, +#else + /* + * EPOLL_CLOEXEC was added in glibc 2.8 (usually used in conjunction with + * epoll_create1(..)), but since neither EPOLL_CLOEXEC exists nor + * epoll_create1(..), we set it to FD_CLOEXEC so that we can pass it + * directly to fcntl(..) instead. + */ + LTTNG_CLOEXEC = FD_CLOEXEC, +#endif }; struct compat_epoll_event { @@ -110,23 +122,47 @@ static inline int __lttng_epoll_get_prev_fd(struct lttng_poll_event *events, /* * Create the epoll set. No memory allocation is done here. */ -extern int compat_epoll_create(struct lttng_poll_event *events, +LTTNG_HIDDEN +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) +#if defined(HAVE_EPOLL_CREATE1) && defined(EPOLL_CLOEXEC) +static inline int compat_glibc_epoll_create(int size __attribute__((unused)), + int flags) +{ + return epoll_create1(flags); +} +#else +static inline int compat_glibc_epoll_create(int size, int flags) +{ + /* + * epoll_create1 was added in glibc 2.9, but unfortunatly reverting to + * epoll_create(..) also means that we lose the possibility to + * directly set the EPOLL_CLOEXEC, so try and do it anyway but through + * fcntl(..). + */ + int efd = epoll_create(size); + assert(fcntl(efd, F_SETFD, flags) != -1); + return efd; +} +#endif + /* * Wait on epoll set with the number of fd registered to the lttng_poll_event * data structure (events). */ -extern int compat_epoll_wait(struct lttng_poll_event *events, int timeout); +LTTNG_HIDDEN +int compat_epoll_wait(struct lttng_poll_event *events, int timeout); #define lttng_poll_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, +LTTNG_HIDDEN +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) @@ -134,14 +170,25 @@ extern int compat_epoll_add(struct lttng_poll_event *events, /* * Remove a fd from the epoll set. */ -extern int compat_epoll_del(struct lttng_poll_event *events, int fd); +LTTNG_HIDDEN +int compat_epoll_del(struct lttng_poll_event *events, int fd); #define lttng_poll_del(events, fd) \ compat_epoll_del(events, fd) +/* + * Modify an fd's events in the epoll set. + */ +LTTNG_HIDDEN +int compat_epoll_mod(struct lttng_poll_event *events, + int fd, uint32_t req_events); +#define lttng_poll_mod(events, fd, req_events) \ + compat_epoll_add(events, fd, req_events) + /* * Set up the poll set limits variable poll_max_size */ -extern void compat_epoll_set_max_size(void); +LTTNG_HIDDEN +int compat_epoll_set_max_size(void); #define lttng_poll_set_max_size() \ compat_epoll_set_max_size() @@ -184,7 +231,7 @@ static inline void lttng_poll_clean(struct lttng_poll_event *events) if (events->epfd >= 0) { ret = close(events->epfd); if (ret) { - perror("close"); + PERROR("close"); } } @@ -221,7 +268,7 @@ enum { #if __linux__ LPOLLMSG = POLLMSG, LPOLLRDHUP = POLLRDHUP, -#elif (defined(__FreeBSD__) || defined(__CYGWIN__)) +#elif (defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__) || defined(__APPLE__)) LPOLLMSG = 0, LPOLLRDHUP = 0, #else @@ -252,8 +299,7 @@ struct compat_poll_event { * execution before a poll wait is done. */ struct compat_poll_event_array current; - /* Indicate if wait.events needs to be realloc. */ - int need_realloc:1; + /* Indicate if wait.events need to be updated from current. */ int need_update:1; }; @@ -286,7 +332,8 @@ static inline int __lttng_poll_get_prev_fd(struct lttng_poll_event *events, /* * Create a pollfd structure of size 'size'. */ -extern int compat_poll_create(struct lttng_poll_event *events, int size); +LTTNG_HIDDEN +int compat_poll_create(struct lttng_poll_event *events, int size); #define lttng_poll_create(events, size, flags) \ compat_poll_create(events, size) @@ -294,14 +341,16 @@ extern int compat_poll_create(struct lttng_poll_event *events, int size); * Wait on poll(2) event with nb_fd registered to the lttng_poll_event data * structure. */ -extern int compat_poll_wait(struct lttng_poll_event *events, int timeout); +LTTNG_HIDDEN +int compat_poll_wait(struct lttng_poll_event *events, int timeout); #define lttng_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, +LTTNG_HIDDEN +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) @@ -311,14 +360,25 @@ extern int compat_poll_add(struct lttng_poll_event *events, * pollfd, data is copied from the old pollfd to the new and, finally, the old * one is freed(). */ -extern int compat_poll_del(struct lttng_poll_event *events, int fd); +LTTNG_HIDDEN +int compat_poll_del(struct lttng_poll_event *events, int fd); #define lttng_poll_del(events, fd) \ compat_poll_del(events, fd) +/* + * Modify an fd's events in the epoll set. + */ +LTTNG_HIDDEN +int compat_poll_mod(struct lttng_poll_event *events, + int fd, uint32_t req_events); +#define lttng_poll_mod(events, fd, req_events) \ + compat_poll_add(events, fd, req_events) + /* * Set up the poll set limits variable poll_max_size */ -extern void compat_poll_set_max_size(void); +LTTNG_HIDDEN +int compat_poll_set_max_size(void); #define lttng_poll_set_max_size() \ compat_poll_set_max_size()