Multiple fix for FreeBSD compat layer

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/src/common/compat/fcntl.h b/src/common/compat/fcntl.h
index 420546959d1da1f1b1bf08485c833591e130b150..575495fe55b3818a4aba8e5af3c41872aab91e74 100644 (file)
--- a/src/common/compat/fcntl.h
+++ b/src/common/compat/fcntl.h
@@ -19,19 +19,21 @@
 #define _COMPAT_FCNTL_H
 
 #include <fcntl.h>
+#include <sys/types.h>
 
+#ifdef __linux__
+
+extern int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
+               unsigned int flags);
 #define lttng_sync_file_range(fd, offset, nbytes, flags) \
        compat_sync_file_range(fd, offset, nbytes, flags)
 
-#ifdef __linux__
+#elif __FreeBSD__
 
-int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
-               unsigned int flags)
-{
-       return sync_file_range(fd, offset, nbytes, flags);
-}
+typedef long int off64_t;
+typedef off64_t loff_t;
 
-#elif __FreeBSD__
+#include <sys/errno.h>
 
 /*
  * Possible flags under Linux. Simply nullify them and avoid wrapper.
@@ -40,15 +42,6 @@ int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
 #define SYNC_FILE_RANGE_WAIT_BEFORE   0
 #define SYNC_FILE_RANGE_WRITE         0
 
-typedef long int off64_t;
-typedef off64_t loff_t;
-
-int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
-               unsigned int flags)
-{
-       return 0;
-}
-
 /*
  * Possible flags under Linux. Simply nullify them and avoid wrappers.
  */
@@ -57,8 +50,21 @@ int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
 #define SPLICE_F_MORE       0
 #define SPLICE_F_GIFT       0
 
-ssize_t splice(int fd_in, loff_t *off_in, int fd_out,
-               loff_t *off_out, size_t len, unsigned int flags)
+#define POSIX_FADV_DONTNEED 0
+
+static inline int lttng_sync_file_range(int fd, off64_t offset,
+               off64_t nbytes, unsigned int flags)
+{
+       return -ENOSYS;
+}
+
+static inline ssize_t splice(int fd_in, loff_t *off_in, int fd_out, loff_t *off_out,
+               size_t len, unsigned int flags)
+{
+       return -ENOSYS;
+}
+
+static inline int posix_fadvise(int fd, off_t offset, off_t len, int advice)
 {
        return -ENOSYS;
 }

diff --git a/src/common/compat/poll.h b/src/common/compat/poll.h
index 1580a4fb211a24def1146d7ec5c721431c34e3b4..ded35410d48dd3d7232608746e46f6d334dd7733 100644 (file)
--- a/src/common/compat/poll.h
+++ b/src/common/compat/poll.h
@@ -179,10 +179,15 @@ enum {
        LPOLLRDBAND = POLLRDBAND,
        LPOLLWRNORM = POLLWRNORM,
        LPOLLWRBAND = POLLWRBAND,
+#if __linux__
        LPOLLMSG = POLLMSG,
+       LPOLLRDHUP = POLLRDHUP,
+#elif __FreeBSD__
+       LPOLLMSG = 0,
+       LPOLLRDHUP = 0,
+#endif /* __linux__ */
        LPOLLERR = POLLERR,
        LPOLLHUP = POLLHUP | POLLNVAL,
-       LPOLLRDHUP = POLLRDHUP,
        /* Close on exec feature does not exist for poll(2) */
        LTTNG_CLOEXEC = 0xdead,
 };

diff --git a/src/common/compat/socket.h b/src/common/compat/socket.h
index dcb6cdede757b3f43238b8ffaffeaf11fa17f3ff..0eaf87a77248dc910b9d77fb1b3647696edbebea 100644 (file)
--- a/src/common/compat/socket.h
+++ b/src/common/compat/socket.h
@@ -30,9 +30,13 @@
 
 typedef struct ucred lttng_sock_cred;
 
-#define LTTNG_SOCK_SET_UID_CRED(c, u) LTTNG_REF(c)->uid = u;
-#define LTTNG_SOCK_SET_GID_CRED(c, g) LTTNG_REF(c)->gid = g;
-#define LTTNG_SOCK_SET_PID_CRED(c, p) LTTNG_REF(c)->pid = p;
+#define LTTNG_SOCK_SET_UID_CRED(c, u) LTTNG_REF(c)->uid = u
+#define LTTNG_SOCK_SET_GID_CRED(c, g) LTTNG_REF(c)->gid = g
+#define LTTNG_SOCK_SET_PID_CRED(c, p) LTTNG_REF(c)->pid = p
+
+#define LTTNG_SOCK_GET_UID_CRED(c) LTTNG_REF(c)->uid
+#define LTTNG_SOCK_GET_GID_CRED(c) LTTNG_REF(c)->gid
+#define LTTNG_SOCK_GET_PID_CRED(c) LTTNG_REF(c)->pid
 
 #elif __FreeBSD__
 
@@ -44,9 +48,13 @@ typedef struct ucred lttng_sock_cred;
 
 typedef struct cmsgcred lttng_sock_cred;
 
-#define LTTNG_SOCK_SET_UID_CRED(c, uid) LTTNG_REF(c)->cmcred_uid = uid;
-#define LTTNG_SOCK_SET_GID_CRED(c, gid) LTTNG_REF(c)->cmcred_gid = gid;
-#define LTTNG_SOCK_SET_PID_CRED(c, pid) LTTNG_REF(c)->cmcred_pid = pid;
+#define LTTNG_SOCK_SET_UID_CRED(c, uid) LTTNG_REF(c)->cmcred_uid = uid
+#define LTTNG_SOCK_SET_GID_CRED(c, gid) LTTNG_REF(c)->cmcred_gid = gid
+#define LTTNG_SOCK_SET_PID_CRED(c, pid) LTTNG_REF(c)->cmcred_pid = pid
+
+#define LTTNG_SOCK_GET_UID_CRED(c) LTTNG_REF(c)->cmcred_uid
+#define LTTNG_SOCK_GET_GID_CRED(c) LTTNG_REF(c)->cmcred_gid
+#define LTTNG_SOCK_GET_PID_CRED(c) LTTNG_REF(c)->cmcred_pid
 
 #else
 #error "Please add support for your OS into lttng/ust-endian.h."