Revert FreeBSD compatibility layer

[lttng-tools.git] / src / common / compat / poll.h

diff --git a/src/common/compat/poll.h b/src/common/compat/poll.h
index a7766400d95adcc5a4b8ed9fb5bb4ce7d0bd21b3..1580a4fb211a24def1146d7ec5c721431c34e3b4 100644 (file)
--- a/src/common/compat/poll.h
+++ b/src/common/compat/poll.h
@@ -21,13 +21,7 @@
 #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.
@@ -58,7 +52,7 @@ static inline void __lttng_poll_free(void *events)
 #include <sys/epoll.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 */
@@ -101,7 +95,7 @@ struct compat_epoll_event {
 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
@@ -109,7 +103,7 @@ extern int compat_epoll_create(struct lttng_poll_event *events,
  */
 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.
@@ -117,21 +111,21 @@ extern int compat_epoll_wait(struct lttng_poll_event *events, int timeout);
 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
@@ -214,7 +208,7 @@ struct compat_poll_event {
  */
 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
@@ -222,7 +216,7 @@ extern int compat_poll_create(struct lttng_poll_event *events, int size);
  */
 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.
@@ -230,7 +224,7 @@ extern int compat_poll_wait(struct lttng_poll_event *events, int timeout);
 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
@@ -239,14 +233,14 @@ extern int compat_poll_add(struct lttng_poll_event *events,
  */
 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)