Change UST header location and update in tree headers

Signed-off-by: David Goulet <david.goulet@polymtl.ca>

diff --git a/include/lttng-sessiond-comm.h b/include/lttng-sessiond-comm.h
index ae978c2780e04dde206537396c87c6d1566d8b04..8843a11331b3629f87ac19bb36ba9be79ae5f930 100644 (file)
--- 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 <ust/lttng-ust-abi.h>
+#include <lttng/ust-abi.h>
 
 /*
  * 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 951ef78812e3661980bc95b7a3b31674969146e5..3c81c32e7d6ca4db5590ca72fd2d8fd65136f8aa 100644 (file)
--- a/liblttng-ustconsumer/lttng-ustconsumer.c
+++ b/liblttng-ustconsumer/lttng-ustconsumer.c
@@ -29,9 +29,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <ust/lttng-ust-ctl.h>
 #include <lttng-sessiond-comm.h>
 #include <lttng/lttng-ustconsumer.h>
+#include <lttng/ust-ctl.h>
 #include <lttngerr.h>
 
 extern struct lttng_consumer_global_data consumer_data;

diff --git a/lttng-sessiond/channel.c b/lttng-sessiond/channel.c
index fda679c78f3ebacfbee3ff9d52b4aabb25228cdc..14fdfdcae0050038ab6ad26fd14fe991425eaa1e 100644 (file)
--- a/lttng-sessiond/channel.c
+++ b/lttng-sessiond/channel.c
@@ -21,13 +21,6 @@
 #include <lttng/lttng.h>
 #include <lttng-sessiond-comm.h>
 #include <lttngerr.h>
-#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST
-#include <ust/lttng-ust-ctl.h>
-#include <ust/lttng-ust-abi.h>
-#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 41e33ec27634a56489be547ecff0b6e3381048d5..d93a2895d2d3318a1cfb6291ec838c02020915b5 100644 (file)
--- a/lttng-sessiond/context.c
+++ b/lttng-sessiond/context.c
@@ -25,14 +25,6 @@
 #include <lttng-sessiond-comm.h>
 #include <lttngerr.h>
 
-#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST
-#include <ust/lttng-ust-ctl.h>
-#include <ust/lttng-ust-abi.h>
-#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 e97e9489a0d7afe8625e24104926cb600e4ae6d1..589b1e16eb0dded9240fee91ca9844b66e5ff812 100644 (file)
--- a/lttng-sessiond/context.h
+++ b/lttng-sessiond/context.h
@@ -19,15 +19,10 @@
 #define _LTT_CONTEXT_H
 
 #include <lttng/lttng.h>
-#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST
-#include <ust/lttng-ust-abi.h>
-#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 1f90c1c73069d97c520d2c8670ef12fe7dd68c64..31f7872b66bc39675b939b734eb2e13810880138 100644 (file)
--- a/lttng-sessiond/event.c
+++ b/lttng-sessiond/event.c
@@ -23,16 +23,11 @@
 #include <lttng-sessiond-comm.h>
 #include <lttngerr.h>
 
-#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST
-#include <ust/lttng-ust-ctl.h>
-#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 5b025aeac5b30e6e7a514b9cbe7ffc1f4d99f58f..ced2929a232b732906353070a351e1f6df6faed1 100644 (file)
--- 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 <mathieu.desnoyers@efficios.com>
  *
@@ -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 de5eeafeeb858abacc50e2767cdd40e9e910fe1e..225237a6c18d35b814845ec72a0eccc4b4863ed4 100644 (file)
--- 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 <ust/lttng-ust-abi.h>
+#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 1fe29c8772e4b195ea4fb9c09af9b4168d1ece85..e8c10a7121da6bebf5235ce284c4cdce60f8d3cc 100644 (file)
--- 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 <ust/lttng-ust-ctl.h>
-#include <ust/lttng-ust-abi.h>
+#include <lttng/ust-ctl.h>
+#include <lttng/ust-abi.h>
 #else
 #include "lttng-ust-ctl.h"
 #include "lttng-ust-abi.h"