18710679a8ac57fda5dbd26cf16bb180dce9e286 includes libcompat into libcommon.
This also make the compat_(e)poll_* symbols visible through liblttng-ctl.
Same for fcntl compat.
Mark them as hidden.
These symbols are not visible on the 2.10/2.11 branches.
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
$(top_builddir)/src/common/hashtable/libhashtable.la \
$(top_builddir)/src/common/libcommon.la \
$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
$(top_builddir)/src/common/hashtable/libhashtable.la \
$(top_builddir)/src/common/libcommon.la \
- $(top_builddir)/src/common/compat/libcompat.la \
$(top_builddir)/src/common/index/libindex.la \
$(top_builddir)/src/common/health/libhealth.la \
$(top_builddir)/src/common/config/libconfig.la \
$(top_builddir)/src/common/index/libindex.la \
$(top_builddir)/src/common/health/libhealth.la \
$(top_builddir)/src/common/config/libconfig.la \
$(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \
$(top_builddir)/src/common/hashtable/libhashtable.la \
$(top_builddir)/src/common/libcommon.la \
$(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \
$(top_builddir)/src/common/hashtable/libhashtable.la \
$(top_builddir)/src/common/libcommon.la \
- $(top_builddir)/src/common/compat/libcompat.la \
$(top_builddir)/src/common/relayd/librelayd.la \
$(top_builddir)/src/common/testpoint/libtestpoint.la \
$(top_builddir)/src/common/health/libhealth.la \
$(top_builddir)/src/common/relayd/librelayd.la \
$(top_builddir)/src/common/testpoint/libtestpoint.la \
$(top_builddir)/src/common/health/libhealth.la \
/*
* Create epoll set and allocate returned events structure.
*/
/*
* Create epoll set and allocate returned events structure.
*/
int compat_epoll_create(struct lttng_poll_event *events, int size, int flags)
{
int ret;
int compat_epoll_create(struct lttng_poll_event *events, int size, int flags)
{
int ret;
/*
* Add a fd to the epoll set with requesting events.
*/
/*
* Add a fd to the epoll set with requesting events.
*/
int compat_epoll_add(struct lttng_poll_event *events, int fd, uint32_t req_events)
{
int ret;
int compat_epoll_add(struct lttng_poll_event *events, int fd, uint32_t req_events)
{
int ret;
/*
* Remove a fd from the epoll set.
*/
/*
* Remove a fd from the epoll set.
*/
int compat_epoll_del(struct lttng_poll_event *events, int fd)
{
int ret;
int compat_epoll_del(struct lttng_poll_event *events, int fd)
{
int ret;
/*
* Set an fd's events.
*/
/*
* Set an fd's events.
*/
int compat_epoll_mod(struct lttng_poll_event *events, int fd, uint32_t req_events)
{
int ret;
int compat_epoll_mod(struct lttng_poll_event *events, int fd, uint32_t req_events)
{
int ret;
/*
* Wait on epoll set. This is a blocking call of timeout value.
*/
/*
* Wait on epoll set. This is a blocking call of timeout value.
*/
int compat_epoll_wait(struct lttng_poll_event *events, int timeout)
{
int ret;
int compat_epoll_wait(struct lttng_poll_event *events, int timeout)
{
int ret;
/*
* Setup poll set maximum size.
*/
/*
* Setup poll set maximum size.
*/
int compat_epoll_set_max_size(void)
{
int ret, fd, retval = 0;
int compat_epoll_set_max_size(void)
{
int ret, fd, retval = 0;
int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
unsigned int flags)
{
int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
unsigned int flags)
{
/*
* Create pollfd data structure.
*/
/*
* Create pollfd data structure.
*/
int compat_poll_create(struct lttng_poll_event *events, int size)
{
struct compat_poll_event_array *current, *wait;
int compat_poll_create(struct lttng_poll_event *events, int size)
{
struct compat_poll_event_array *current, *wait;
/*
* Modify an fd's events..
*/
/*
* Modify an fd's events..
*/
int compat_poll_mod(struct lttng_poll_event *events, int fd,
uint32_t req_events)
{
int compat_poll_mod(struct lttng_poll_event *events, int fd,
uint32_t req_events)
{
/*
* Remove a fd from the pollfd structure.
*/
/*
* Remove a fd from the pollfd structure.
*/
int compat_poll_del(struct lttng_poll_event *events, int fd)
{
int new_size, i, count = 0, ret;
int compat_poll_del(struct lttng_poll_event *events, int fd)
{
int new_size, i, count = 0, ret;
/*
* Wait on poll() with timeout. Blocking call.
*/
/*
* Wait on poll() with timeout. Blocking call.
*/
int compat_poll_wait(struct lttng_poll_event *events, int timeout)
{
int ret;
int compat_poll_wait(struct lttng_poll_event *events, int timeout)
{
int ret;
/*
* Setup poll set maximum size.
*/
/*
* Setup poll set maximum size.
*/
int compat_poll_set_max_size(void)
{
int ret, retval = 0;
int compat_poll_set_max_size(void)
{
int ret, retval = 0;
#include <fcntl.h>
#include <errno.h>
#include <sys/types.h>
#include <fcntl.h>
#include <errno.h>
#include <sys/types.h>
+#include <common/macros.h>
#if (defined(__FreeBSD__) || defined(__CYGWIN__))
typedef long long off64_t;
#if (defined(__FreeBSD__) || defined(__CYGWIN__))
typedef long long off64_t;
-extern int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
+LTTNG_HIDDEN
+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)
unsigned int flags);
#define lttng_sync_file_range(fd, offset, nbytes, flags) \
compat_sync_file_range(fd, offset, nbytes, flags)
/*
* Create the epoll set. No memory allocation is done here.
*/
/*
* 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)
int size, int flags);
#define lttng_poll_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
* data structure (events).
*/
* 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.
*/
#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)
int fd, uint32_t req_events);
#define lttng_poll_add(events, fd, req_events) \
compat_epoll_add(events, fd, req_events)
/*
* Remove a fd from the epoll set.
*/
/*
* 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.
*/
#define lttng_poll_del(events, fd) \
compat_epoll_del(events, fd)
/*
* Modify an fd's events in the epoll set.
*/
-extern int compat_epoll_mod(struct lttng_poll_event *events,
+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)
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
*/
/*
* Set up the poll set limits variable poll_max_size
*/
-extern int 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()
#define lttng_poll_set_max_size() \
compat_epoll_set_max_size()
/*
* Create a pollfd structure of size 'size'.
*/
/*
* 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)
#define lttng_poll_create(events, size, flags) \
compat_poll_create(events, size)
* Wait on poll(2) event with nb_fd registered to the lttng_poll_event data
* structure.
*/
* 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.
*/
#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)
int fd, uint32_t req_events);
#define lttng_poll_add(events, fd, req_events) \
compat_poll_add(events, fd, req_events)
* pollfd, data is copied from the old pollfd to the new and, finally, the old
* one is freed().
*/
* 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.
*/
#define lttng_poll_del(events, fd) \
compat_poll_del(events, fd)
/*
* Modify an fd's events in the epoll set.
*/
-extern int compat_poll_mod(struct lttng_poll_event *events,
+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)
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
*/
/*
* Set up the poll set limits variable poll_max_size
*/
-extern int 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()
#define lttng_poll_set_max_size() \
compat_poll_set_max_size()
$(top_builddir)/src/bin/lttng-sessiond/thread-utils.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/process-utils.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/thread.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/thread-utils.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/process-utils.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/thread.$(OBJEXT) \
- $(top_builddir)/src/common/libcommon.la \
$(top_builddir)/src/common/testpoint/libtestpoint.la \
$(top_builddir)/src/common/testpoint/libtestpoint.la \
- $(top_builddir)/src/common/compat/libcompat.la \
$(top_builddir)/src/common/health/libhealth.la \
$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
$(top_builddir)/src/common/health/libhealth.la \
$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
$(KMOD_LIBS) \
$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
$(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \
$(KMOD_LIBS) \
$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
$(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \
- $(top_builddir)/src/common/compat/libcompat.la \
$(top_builddir)/src/common/testpoint/libtestpoint.la \
$(top_builddir)/src/common/health/libhealth.la \
$(top_builddir)/src/common/config/libconfig.la \
$(top_builddir)/src/common/testpoint/libtestpoint.la \
$(top_builddir)/src/common/health/libhealth.la \
$(top_builddir)/src/common/config/libconfig.la \
$(KMOD_LIBS) \
$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
$(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \
$(KMOD_LIBS) \
$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
$(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \
- $(top_builddir)/src/common/compat/libcompat.la \
$(top_builddir)/src/common/testpoint/libtestpoint.la \
$(top_builddir)/src/common/health/libhealth.la \
$(top_builddir)/src/common/config/libconfig.la \
$(top_builddir)/src/common/testpoint/libtestpoint.la \
$(top_builddir)/src/common/health/libhealth.la \
$(top_builddir)/src/common/config/libconfig.la \