X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-sessiond%2Fust-ctl.h;h=1fe29c8772e4b195ea4fb9c09af9b4168d1ece85;hb=d6309f5907981526e78078dfb87419fbd267f270;hp=a592abf2276d70cbfc7806a95873dfc53873e0dc;hpb=3bd1e0819b577ffcb44acd7c2f8e02ff09654b7b;p=lttng-tools.git

diff --git a/ltt-sessiond/ust-ctl.h b/ltt-sessiond/ust-ctl.h
index a592abf22..1fe29c877 100644
--- a/ltt-sessiond/ust-ctl.h
+++ b/ltt-sessiond/ust-ctl.h
@@ -1,76 +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 <lttng/lttng.h>
-
-#include "trace-ust.h"
+#include <config.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
-
-int ustctl_register_done(int sock);
-int ustctl_create_channel(int sock, struct ltt_ust_session *session,
-		struct lttng_channel *channel);
-int ustctl_create_session(int sock, struct ltt_ust_session *session);
-int ustctl_destroy_session(int sock, struct ltt_ust_session *session);
-int ustctl_disable_channel(int sock, struct ltt_ust_session *session,
-		struct ltt_ust_channel *chan);
-int ustctl_enable_channel(int sock, struct ltt_ust_session *session,
-		struct ltt_ust_channel *chan);
-
+#include <ust/lttng-ust-ctl.h>
+#include <ust/lttng-ust-abi.h>
 #else
-
-static inline
-int ustctl_register_done(int sock)
-{
-	return -ENOSYS;
-}
-static inline
-int ustctl_create_channel(int sock, struct ltt_ust_session *session,
-		struct lttng_channel *channel)
-{
-	return -ENOSYS;
-}
-static inline
-int ustctl_create_session(int sock, struct ltt_ust_session *session)
-{
-	return -ENOSYS;
-}
-static inline
-int ustctl_destroy_session(int sock, struct ltt_ust_session *session)
-{
-	return -ENOSYS;
-}
-static inline
-int ustctl_disable_channel(int sock, struct ltt_ust_session *session,
-		struct ltt_ust_channel *chan)
-{
-	return -ENOSYS;
-}
-static inline
-int ustctl_enable_channel(int sock, struct ltt_ust_session *session,
-		struct ltt_ust_channel *chan)
-{
-	return -ENOSYS;
-}
-
+#include "lttng-ust-ctl.h"
+#include "lttng-ust-abi.h"
 #endif
 
 #endif /* _LTT_UST_CTL_H */