Preliminary work for full UST support

[lttng-tools.git] / ltt-sessiond / context.h

diff --git a/ltt-sessiond/context.h b/ltt-sessiond/context.h
index c8cd627761f13cdc3a98a06fe714cd83325decd4..e97e9489a0d7afe8625e24104926cb600e4ae6d1 100644 (file)
--- a/ltt-sessiond/context.h
+++ b/ltt-sessiond/context.h
@@ -18,12 +18,21 @@
 #ifndef _LTT_CONTEXT_H
 #define _LTT_CONTEXT_H
 
-#include <lttng-kernel.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.h"
 
-int add_kernel_context(struct ltt_kernel_session *ksession,
-               struct lttng_kernel_context *kctx, char *event_name,
-               char *channel_name);
+#include "trace-kernel.h"
+#include "trace-ust.h"
+
+int context_kernel_add(struct ltt_kernel_session *ksession,
+               struct lttng_event_context *ctx, char *event_name, char *channel_name);
+int context_ust_add(struct ltt_ust_session *ustsession,
+               struct lttng_event_context *ctx, char *event_name,
+               char *channel_name, int domain);
 
 #endif /* _LTT_CONTEXT_H */