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 b107c9c3c5c18d9471fdc7b458afc8f1a7f653fb..e97e9489a0d7afe8625e24104926cb600e4ae6d1 100644 (file)
--- a/ltt-sessiond/context.h
+++ b/ltt-sessiond/context.h
@@ -1,36 +1,38 @@
 /*
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; only version 2 of the License.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
 #ifndef _LTT_CONTEXT_H
 #define _LTT_CONTEXT_H
 
-#include <limits.h>
-#include <urcu/list.h>
-
 #include <lttng/lttng.h>
-#include <lttng/lttng-sessiond-comm.h>
+#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST
+#include <ust/lttng-ust-abi.h>
+#else
+#include "lttng-ust-abi.h"
+#endif
+
 
-#include "lttng-kernel.h"
-#include "kernel-ctl.h"
-#include "trace.h"
+#include "trace-kernel.h"
+#include "trace-ust.h"
 
-int add_kernel_context(struct ltt_kernel_session *ksession,
-               struct lttng_kernel_context *kctx, char *event_name,
-               char *channel_name);
+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 */