From e41474be35fb9a706872316b06127d108b86b617 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sun, 23 Oct 2011 09:23:00 -0400 Subject: [PATCH] Install UST comm lib Signed-off-by: Mathieu Desnoyers --- include/Makefile.am | 2 +- include/{ => ust}/lttng-ust-comm.h | 2 +- liblttng-ust-comm/Makefile.am | 2 +- liblttng-ust-comm/lttng-ust-comm.c | 6 +++--- libustctl/ustctl.c | 2 +- tests/ust-basic-tracing/ust-basic-tracing.c | 2 +- tests/ust-multi-test/ust-multi-test.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) rename include/{ => ust}/lttng-ust-comm.h (99%) diff --git a/include/Makefile.am b/include/Makefile.am index d3869ab..4f37652 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -8,6 +8,7 @@ nobase_include_HEADERS = \ ust/lttng-ust-ctl.h \ ust/version.h \ ust/lttng-ust-abi.h \ + ust/lttng-ust-comm.h \ ust/ringbuffer-abi.h \ ust/lttng-tracer.h \ ust/usterr-signal-safe.h \ @@ -19,7 +20,6 @@ nobase_include_HEADERS = \ # note: usterr-signal-safe.h, core.h and share.h need namespace cleanup. noinst_HEADERS = \ - lttng-ust-comm.h \ usterr.h \ ust_snprintf.h \ ust/compat.h \ diff --git a/include/lttng-ust-comm.h b/include/ust/lttng-ust-comm.h similarity index 99% rename from include/lttng-ust-comm.h rename to include/ust/lttng-ust-comm.h index b571832..614890d 100644 --- a/include/lttng-ust-comm.h +++ b/include/ust/lttng-ust-comm.h @@ -50,7 +50,7 @@ #define DEFAULT_HOME_APPS_WAIT_SHM_PATH "/lttng-ust-apps-wait-%u" /* Queue size of listen(2) */ -#define MAX_LISTEN 10 +#define LTTNG_UST_COMM_MAX_LISTEN 10 /* Get the error code index from 0. USTCOMM_ERR starts at 1000. */ diff --git a/liblttng-ust-comm/Makefile.am b/liblttng-ust-comm/Makefile.am index 2ae997c..16dc3a6 100644 --- a/liblttng-ust-comm/Makefile.am +++ b/liblttng-ust-comm/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -noinst_LTLIBRARIES = liblttng-ust-comm.la +lib_LTLIBRARIES = liblttng-ust-comm.la liblttng_ust_comm_la_SOURCES = lttng-ust-comm.c diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c index bfba3b3..9658960 100644 --- a/liblttng-ust-comm/lttng-ust-comm.c +++ b/liblttng-ust-comm/lttng-ust-comm.c @@ -29,7 +29,7 @@ #include #include -#include +#include /* * Human readable error message. @@ -213,13 +213,13 @@ error: /* * ustcomm_listen_unix_sock * - * Make the socket listen using MAX_LISTEN. + * Make the socket listen using LTTNG_UST_COMM_MAX_LISTEN. */ int ustcomm_listen_unix_sock(int sock) { int ret; - ret = listen(sock, MAX_LISTEN); + ret = listen(sock, LTTNG_UST_COMM_MAX_LISTEN); if (ret < 0) { perror("listen"); } diff --git a/libustctl/ustctl.c b/libustctl/ustctl.c index ad0b05f..e0b7eda 100644 --- a/libustctl/ustctl.c +++ b/libustctl/ustctl.c @@ -21,7 +21,7 @@ #include #include #include -#include "lttng-ust-comm.h" +#include #include "../libringbuffer/backend.h" #include "../libringbuffer/frontend.h" diff --git a/tests/ust-basic-tracing/ust-basic-tracing.c b/tests/ust-basic-tracing/ust-basic-tracing.c index 42e8242..a0ed979 100644 --- a/tests/ust-basic-tracing/ust-basic-tracing.c +++ b/tests/ust-basic-tracing/ust-basic-tracing.c @@ -36,7 +36,7 @@ #include #include -#include "lttng-ust-comm.h" +#include #include "../../libringbuffer/backend.h" #include "../../libringbuffer/frontend.h" diff --git a/tests/ust-multi-test/ust-multi-test.c b/tests/ust-multi-test/ust-multi-test.c index 59f54a9..21cefa1 100644 --- a/tests/ust-multi-test/ust-multi-test.c +++ b/tests/ust-multi-test/ust-multi-test.c @@ -36,7 +36,7 @@ #include #include -#include "lttng-ust-comm.h" +#include #include <../../libringbuffer/backend.h> #include <../../libringbuffer/frontend.h> -- 2.34.1