[lttng-dev] [PATCH lttng-tools] Backported to glibc 2.8

[Jesper Derehag]

bump!

----------------------------------------
> From: jderehag at hotmail.com
> To: lttng-dev at lists.lttng.org
> CC: jderehag at hotmail.com
> Subject: [PATCH lttng-tools] Backported to glibc 2.8
> Date: Thu, 27 Mar 2014 14:38:52 +0100
>
> From: Jesper Derehag <jderehag at hotmail.com>
>
> This patch enables lttng-tools to run on top of glibc 2.8.
> Overall it fixes 2 things:
> 1. No support for epoll_create1(..) and EPOLL_CLOEXEC.
> 2. No support for htobe/betoh
>
> For 1, we revert back to epoll_create() and then sets CLOEXEC
> through fcntl instead.
> For 2, we define htobe/betoh as part of the compat/endian.h
> and make sure that any users of those functions actually
> include compat/endian.h instead of implicit include of
> system endian.h
>
> Signed-off-by: Jesper Derehag <jderehag at hotmail.com>
> ---
> Discussion:
> One thing I am a bit hesitant about is whether I should place
> the compat_glibc_epoll_create() wrappers in the header
> or if they should be kept private inside compat-epoll.c?
> For now, I put them in the header since most of the
> inline #ifdefs seemed to be placed there and thereby
> keeping compat-epoll.c a bit cleaner. But then again,
> the compat_epoll_create() is a wrapper in itself, so
> I am basically exposing a wrapper for a wrapper which
> is kind of strange.
>
> src/bin/lttng-relayd/cmd-2-2.c | 2 +
> src/bin/lttng-relayd/cmd-2-4.c | 2 +
> src/bin/lttng-relayd/live.c | 1 +
> src/bin/lttng-relayd/main.c | 1 +
> src/bin/lttng-sessiond/jul-thread.c | 2 +
> src/bin/lttng-sessiond/jul.c | 2 +
> src/common/compat/compat-epoll.c | 2 +-
> src/common/compat/endian.h | 92 +++++++++++++++++++++++++-
> src/common/compat/poll.h | 29 ++++++++
> src/common/consumer-timer.c | 1 +
> src/common/consumer.c | 1 +
> src/common/index/index.c | 1 +
> src/common/kernel-consumer/kernel-consumer.c | 1 +
> src/common/relayd/relayd.c | 1 +
> src/common/ust-consumer/ust-consumer.c | 1 +
> 15 files changed, 137 insertions(+), 2 deletions(-)
>
> diff --git a/src/bin/lttng-relayd/cmd-2-2.c b/src/bin/lttng-relayd/cmd-2-2.c
> index b7299a5..978a11e 100644
> --- a/src/bin/lttng-relayd/cmd-2-2.c
> +++ b/src/bin/lttng-relayd/cmd-2-2.c
> @@ -23,6 +23,8 @@
> #include <common/common.h>
> #include <common/sessiond-comm/relayd.h>
>
> +#include <common/compat/endian.h>
> +
> #include "cmd-generic.h"
> #include "cmd-2-1.h"
> #include "utils.h"
> diff --git a/src/bin/lttng-relayd/cmd-2-4.c b/src/bin/lttng-relayd/cmd-2-4.c
> index 3196383..6d927a0 100644
> --- a/src/bin/lttng-relayd/cmd-2-4.c
> +++ b/src/bin/lttng-relayd/cmd-2-4.c
> @@ -23,6 +23,8 @@
> #include <common/common.h>
> #include <common/sessiond-comm/relayd.h>
>
> +#include <common/compat/endian.h>
> +
> #include "cmd-generic.h"
> #include "lttng-relayd.h"
>
> diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
> index c60f7e4..d8517d2 100644
> --- a/src/bin/lttng-relayd/live.c
> +++ b/src/bin/lttng-relayd/live.c
> @@ -43,6 +43,7 @@
> #include <common/common.h>
> #include <common/compat/poll.h>
> #include <common/compat/socket.h>
> +#include <common/compat/endian.h>
> #include <common/defaults.h>
> #include <common/futex.h>
> #include <common/index/index.h>
> diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
> index a93151a..93b08fc 100644
> --- a/src/bin/lttng-relayd/main.c
> +++ b/src/bin/lttng-relayd/main.c
> @@ -44,6 +44,7 @@
> #include <common/common.h>
> #include <common/compat/poll.h>
> #include <common/compat/socket.h>
> +#include <common/compat/endian.h>
> #include <common/defaults.h>
> #include <common/daemonize.h>
> #include <common/futex.h>
> diff --git a/src/bin/lttng-sessiond/jul-thread.c b/src/bin/lttng-sessiond/jul-thread.c
> index d8748f2..9992623 100644
> --- a/src/bin/lttng-sessiond/jul-thread.c
> +++ b/src/bin/lttng-sessiond/jul-thread.c
> @@ -23,6 +23,8 @@
> #include <common/uri.h>
> #include <common/utils.h>
>
> +#include <common/compat/endian.h>
> +
> #include "fd-limit.h"
> #include "jul-thread.h"
> #include "lttng-sessiond.h"
> diff --git a/src/bin/lttng-sessiond/jul.c b/src/bin/lttng-sessiond/jul.c
> index 7bb0d75..da4cf67 100644
> --- a/src/bin/lttng-sessiond/jul.c
> +++ b/src/bin/lttng-sessiond/jul.c
> @@ -22,6 +22,8 @@
> #include <common/common.h>
> #include <common/sessiond-comm/jul.h>
>
> +#include <common/compat/endian.h>
> +
> #include "jul.h"
> #include "ust-app.h"
> #include "utils.h"
> diff --git a/src/common/compat/compat-epoll.c b/src/common/compat/compat-epoll.c
> index ecd09a0..368fae1 100644
> --- a/src/common/compat/compat-epoll.c
> +++ b/src/common/compat/compat-epoll.c
> @@ -81,7 +81,7 @@ int compat_epoll_create(struct lttng_poll_event *events, int size, int flags)
> size = poll_max_size;
> }
>
> - ret = epoll_create1(flags);
> + ret = compat_glibc_epoll_create(size, flags);
> if (ret < 0) {
> /* At this point, every error is fatal */
> PERROR("epoll_create1");
> diff --git a/src/common/compat/endian.h b/src/common/compat/endian.h
> index 2850866..3b18ca3 100644
> --- a/src/common/compat/endian.h
> +++ b/src/common/compat/endian.h
> @@ -15,11 +15,101 @@
> * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> */
>
> -#ifdef _COMPAT_ENDIAN_H
> +#ifndef _COMPAT_ENDIAN_H
> #define _COMPAT_ENDIAN_H
>
> #ifdef __linux__
> #include <endian.h>
> +
> +/* htobe/betoh are not defined for glibc <2.9, so add them
> + * explicitly if they are missing */
> +#ifdef __USE_BSD
> +/* Conversion interfaces. */
> +# include <byteswap.h>
> +
> +# if __BYTE_ORDER == __LITTLE_ENDIAN
> +# ifndef htobe16
> +# define htobe16(x) __bswap_16(x)
> +# endif
> +# ifndef htole16
> +# define htole16(x) (x)
> +# endif
> +# ifndef be16toh
> +# define be16toh(x) __bswap_16(x)
> +# endif
> +# ifndef le16toh
> +# define le16toh(x) (x)
> +# endif
> +
> +# ifndef htobe32
> +# define htobe32(x) __bswap_32(x)
> +# endif
> +# ifndef htole32
> +# define htole32(x) (x)
> +# endif
> +# ifndef be32toh
> +# define be32toh(x) __bswap_32(x)
> +# endif
> +# ifndef le32toh
> +# define le32toh(x) (x)
> +# endif
> +
> +# ifndef htobe64
> +# define htobe64(x) __bswap_64(x)
> +# endif
> +# ifndef htole64
> +# define htole64(x) (x)
> +# endif
> +# ifndef be64toh
> +# define be64toh(x) __bswap_64(x)
> +# endif
> +# ifndef le64toh
> +# define le64toh(x) (x)
> +# endif
> +
> +# else /* __BYTE_ORDER == __LITTLE_ENDIAN */
> +# ifndef htobe16
> +# define htobe16(x) (x)
> +# endif
> +# ifndef htole16
> +# define htole16(x) __bswap_16(x)
> +# endif
> +# ifndef be16toh
> +# define be16toh(x) (x)
> +# endif
> +# ifndef le16toh
> +# define le16toh(x) __bswap_16(x)
> +# endif
> +
> +# ifndef htobe32
> +# define htobe32(x) (x)
> +# endif
> +# ifndef htole32
> +# define htole32(x) __bswap_32(x)
> +# endif
> +# ifndef be32toh
> +# define be32toh(x) (x)
> +# endif
> +# ifndef le32toh
> +# define le32toh(x) __bswap_32(x)
> +# endif
> +
> +# ifndef htobe64
> +# define htobe64(x) (x)
> +# endif
> +# ifndef htole64
> +# define htole64(x) __bswap_64(x)
> +# endif
> +# ifndef be64toh
> +# define be64toh(x) (x)
> +# endif
> +# ifndef le64toh
> +# define le64toh(x) __bswap_64(x)
> +# endif
> +
> +# endif /* __BYTE_ORDER == __LITTLE_ENDIAN */
> +#endif /* __USE_BSD */
> +
> #elif defined(__FreeBSD__)
> #include <machine/endian.h>
> #else
> diff --git a/src/common/compat/poll.h b/src/common/compat/poll.h
> index b019b42..90fe813 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 <sys/epoll.h>
> #include <stdio.h>
> +#include <features.h>
> +#include <common/compat/fcntl.h>
>
> /* See man epoll(7) for this define path */
> #define COMPAT_EPOLL_PROC_PATH "/proc/sys/fs/epoll/max_user_watches"
> @@ -71,7 +73,15 @@ enum {
> LPOLLNVAL = EPOLLHUP,
> LPOLLRDHUP = EPOLLRDHUP,
> /* Close on exec feature of epoll */
> +#if __GLIBC_PREREQ(2, 9)
> 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 {
> @@ -115,6 +125,25 @@ extern int compat_epoll_create(struct lttng_poll_event *events,
> #define lttng_poll_create(events, size, flags) \
> compat_epoll_create(events, size, flags)
>
> +#if __GLIBC_PREREQ(2, 9)
> +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 loose 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).
> diff --git a/src/common/consumer-timer.c b/src/common/consumer-timer.c
> index dc6f2f7..c659bf6 100644
> --- a/src/common/consumer-timer.c
> +++ b/src/common/consumer-timer.c
> @@ -23,6 +23,7 @@
>
> #include <bin/lttng-consumerd/health-consumerd.h>
> #include <common/common.h>
> +#include <common/compat/endian.h>
> #include <common/kernel-ctl/kernel-ctl.h>
> #include <common/kernel-consumer/kernel-consumer.h>
> #include <common/consumer-stream.h>
> diff --git a/src/common/consumer.c b/src/common/consumer.c
> index ede214c..c20a058 100644
> --- a/src/common/consumer.c
> +++ b/src/common/consumer.c
> @@ -34,6 +34,7 @@
> #include <common/common.h>
> #include <common/utils.h>
> #include <common/compat/poll.h>
> +#include <common/compat/endian.h>
> #include <common/index/index.h>
> #include <common/kernel-ctl/kernel-ctl.h>
> #include <common/sessiond-comm/relayd.h>
> diff --git a/src/common/index/index.c b/src/common/index/index.c
> index abc0985..a462a63 100644
> --- a/src/common/index/index.c
> +++ b/src/common/index/index.c
> @@ -24,6 +24,7 @@
>
> #include <common/common.h>
> #include <common/defaults.h>
> +#include <common/compat/endian.h>
> #include <common/utils.h>
>
> #include "index.h"
> diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
> index d15329f..57dc2ba 100644
> --- a/src/common/kernel-consumer/kernel-consumer.c
> +++ b/src/common/kernel-consumer/kernel-consumer.c
> @@ -35,6 +35,7 @@
> #include <common/sessiond-comm/sessiond-comm.h>
> #include <common/sessiond-comm/relayd.h>
> #include <common/compat/fcntl.h>
> +#include <common/compat/endian.h>
> #include <common/pipe.h>
> #include <common/relayd/relayd.h>
> #include <common/utils.h>
> diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
> index 3de19c2..38ebdbd 100644
> --- a/src/common/relayd/relayd.c
> +++ b/src/common/relayd/relayd.c
> @@ -25,6 +25,7 @@
>
> #include <common/common.h>
> #include <common/defaults.h>
> +#include <common/compat/endian.h>
> #include <common/sessiond-comm/relayd.h>
> #include <common/index/ctf-index.h>
>
> diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
> index 0955e66..2e46635 100644
> --- a/src/common/ust-consumer/ust-consumer.c
> +++ b/src/common/ust-consumer/ust-consumer.c
> @@ -37,6 +37,7 @@
> #include <common/sessiond-comm/sessiond-comm.h>
> #include <common/relayd/relayd.h>
> #include <common/compat/fcntl.h>
> +#include <common/compat/endian.h>
> #include <common/consumer-metadata-cache.h>
> #include <common/consumer-stream.h>
> #include <common/consumer-timer.h>
> --
> 1.7.9.5
>