From: David Goulet Date: Thu, 3 Nov 2011 16:55:11 +0000 (-0400) Subject: Change UST header location and update in tree headers X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=9df8df5ea4a12be72f265c3c0d6911ac4e207bc0;p=lttng-tools.git Change UST header location and update in tree headers Signed-off-by: David Goulet --- diff --git a/include/lttng-sessiond-comm.h b/include/lttng-sessiond-comm.h index ae978c278..8843a1133 100644 --- a/include/lttng-sessiond-comm.h +++ b/include/lttng-sessiond-comm.h @@ -229,7 +229,7 @@ struct lttcomm_consumer_msg { #ifdef CONFIG_LTTNG_TOOLS_HAVE_UST -#include +#include /* * Data structure for the commands sent from sessiond to UST. diff --git a/liblttng-ustconsumer/lttng-ustconsumer.c b/liblttng-ustconsumer/lttng-ustconsumer.c index 951ef7881..3c81c32e7 100644 --- a/liblttng-ustconsumer/lttng-ustconsumer.c +++ b/liblttng-ustconsumer/lttng-ustconsumer.c @@ -29,9 +29,9 @@ #include #include -#include #include #include +#include #include extern struct lttng_consumer_global_data consumer_data; diff --git a/lttng-sessiond/channel.c b/lttng-sessiond/channel.c index fda679c78..14fdfdcae 100644 --- a/lttng-sessiond/channel.c +++ b/lttng-sessiond/channel.c @@ -21,13 +21,6 @@ #include #include #include -#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST -#include -#include -#else -#include "lttng-ust-ctl.h" -#include "lttng-ust-abi.h" -#endif #include "channel.h" #include "hashtable.h" diff --git a/lttng-sessiond/context.c b/lttng-sessiond/context.c index 41e33ec27..d93a2895d 100644 --- a/lttng-sessiond/context.c +++ b/lttng-sessiond/context.c @@ -25,14 +25,6 @@ #include #include -#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST -#include -#include -#else -#include "lttng-ust-ctl.h" -#include "lttng-ust-abi.h" -#endif - #include "context.h" #include "hashtable.h" #include "kernel-ctl.h" diff --git a/lttng-sessiond/context.h b/lttng-sessiond/context.h index e97e9489a..589b1e16e 100644 --- a/lttng-sessiond/context.h +++ b/lttng-sessiond/context.h @@ -19,15 +19,10 @@ #define _LTT_CONTEXT_H #include -#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST -#include -#else -#include "lttng-ust-abi.h" -#endif - #include "trace-kernel.h" #include "trace-ust.h" +#include "ust-ctl.h" int context_kernel_add(struct ltt_kernel_session *ksession, struct lttng_event_context *ctx, char *event_name, char *channel_name); diff --git a/lttng-sessiond/event.c b/lttng-sessiond/event.c index 1f90c1c73..31f7872b6 100644 --- a/lttng-sessiond/event.c +++ b/lttng-sessiond/event.c @@ -23,16 +23,11 @@ #include #include -#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST -#include -#else -#include "lttng-ust-ctl.h" -#endif - #include "channel.h" #include "event.h" #include "hashtable.h" #include "kernel-ctl.h" +#include "ust-ctl.h" /* * Setup a lttng_event used to enable *all* syscall tracing. diff --git a/lttng-sessiond/lttng-ust-abi.h b/lttng-sessiond/lttng-ust-abi.h index 5b025aeac..ced2929a2 100644 --- a/lttng-sessiond/lttng-ust-abi.h +++ b/lttng-sessiond/lttng-ust-abi.h @@ -2,7 +2,7 @@ #define _LTTNG_UST_ABI_H /* - * lttng-ust-abi.h + * lttng/ust-abi.h * * Copyright 2010-2011 (c) - Mathieu Desnoyers * @@ -139,9 +139,9 @@ struct lttng_ust_object_data { #define LTTNG_UST_ROOT_HANDLE 0 -struct obj; +struct lttng_ust_obj; -struct objd_ops { +struct lttng_ust_objd_ops { long (*cmd)(int objd, unsigned int cmd, unsigned long arg); int (*release)(int objd); }; @@ -149,10 +149,10 @@ struct objd_ops { /* Create root handle. Always ID 0. */ int lttng_abi_create_root_handle(void); -const struct objd_ops *objd_ops(int id); -int objd_unref(int id); +const struct lttng_ust_objd_ops *objd_ops(int id); +int lttng_ust_objd_unref(int id); void lttng_ust_abi_exit(void); -void ltt_events_exit(void); +void lttng_ust_events_exit(void); #endif /* _LTTNG_UST_ABI_H */ diff --git a/lttng-sessiond/lttng-ust-ctl.h b/lttng-sessiond/lttng-ust-ctl.h index de5eeafee..225237a6c 100644 --- a/lttng-sessiond/lttng-ust-ctl.h +++ b/lttng-sessiond/lttng-ust-ctl.h @@ -20,7 +20,7 @@ #ifndef _LTTNG_UST_CTL_H #define _LTTNG_UST_CTL_H -#include +#include "lttng-ust-abi.h" int ustctl_register_done(int sock); int ustctl_create_session(int sock); diff --git a/lttng-sessiond/ust-ctl.h b/lttng-sessiond/ust-ctl.h index 1fe29c877..e8c10a712 100644 --- a/lttng-sessiond/ust-ctl.h +++ b/lttng-sessiond/ust-ctl.h @@ -31,8 +31,8 @@ * UST ABI. */ #ifdef CONFIG_LTTNG_TOOLS_HAVE_UST -#include -#include +#include +#include #else #include "lttng-ust-ctl.h" #include "lttng-ust-abi.h"