From 95b1d17cea42945a561e9e4375347835fdc80d09 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Wed, 16 Oct 2013 11:41:36 -0400 Subject: [PATCH] Fix: JUL domain support with --disable-lttng-ust Signed-off-by: David Goulet --- src/bin/lttng-sessiond/Makefile.am | 4 ++-- src/bin/lttng-sessiond/jul-thread.h | 3 ++- src/bin/lttng-sessiond/ust-app.h | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/bin/lttng-sessiond/Makefile.am b/src/bin/lttng-sessiond/Makefile.am index 60cf0feeb..ec0750c68 100644 --- a/src/bin/lttng-sessiond/Makefile.am +++ b/src/bin/lttng-sessiond/Makefile.am @@ -27,12 +27,12 @@ lttng_sessiond_SOURCES = utils.c utils.h \ buffer-registry.c buffer-registry.h \ testpoint.h ht-cleanup.c \ snapshot.c snapshot.h \ - jul.c jul.h jul-thread.c jul-thread.h + jul.c jul.h if HAVE_LIBLTTNG_UST_CTL lttng_sessiond_SOURCES += trace-ust.c ust-registry.c ust-app.c \ ust-consumer.c ust-consumer.h ust-thread.c \ - ust-metadata.c ust-clock.h + ust-metadata.c ust-clock.h jul-thread.c jul-thread.h endif # Add main.c at the end for compile order diff --git a/src/bin/lttng-sessiond/jul-thread.h b/src/bin/lttng-sessiond/jul-thread.h index 58bdad72c..2f81d889d 100644 --- a/src/bin/lttng-sessiond/jul-thread.h +++ b/src/bin/lttng-sessiond/jul-thread.h @@ -24,7 +24,8 @@ void *jul_thread_manage_registration(void *data); #else /* HAVE_LIBLTTNG_UST_CTL */ -void *jul_thread_manage_registration(void *data); +static inline +void *jul_thread_manage_registration(void *data) { return NULL; } diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h index 249d568d1..680ab6f2f 100644 --- a/src/bin/lttng-sessiond/ust-app.h +++ b/src/bin/lttng-sessiond/ust-app.h @@ -555,6 +555,11 @@ struct ust_app *ust_app_find_by_sock(int sock) { return NULL; } +static inline +struct ust_app *ust_app_find_by_pid(pid_t pid) +{ + return NULL; +} #endif /* HAVE_LIBLTTNG_UST_CTL */ -- 2.34.1