Preliminary work for full UST support

[lttng-tools.git] / ltt-sessiond / ust-ctl.h

diff --git a/ltt-sessiond/ust-ctl.h b/ltt-sessiond/ust-ctl.h
index 0ceccff454628cf87bcf6c0d0dc7ea971d2d78d4..1fe29c8772e4b195ea4fb9c09af9b4168d1ece85 100644 (file)
--- a/ltt-sessiond/ust-ctl.h
+++ b/ltt-sessiond/ust-ctl.h
@@ -1,33 +1,41 @@
 /*
+ * ust-ctl.h
+ *
+ * Meta header used to include all relevant file from the lttng ust ABI.
+ *
  * 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_UST_CTL_H
 #define _LTT_UST_CTL_H
 
 #include <config.h>
-#include <lttng/lttng.h>
-
-#include "trace-ust.h"
 
+/*
+ * FIXME: temporary workaround: we use a lttng-tools local version of
+ * lttng-ust-abi.h if UST is not found. Eventually, we should use our
+ * own internal structures within lttng-tools instead of relying on the
+ * UST ABI.
+ */
 #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
 
 #endif /* _LTT_UST_CTL_H */