Add lttng-kernel header

This header contains copied structure from the new LTTng kernel tree
use by the tracer and the consumer. We are not exporting them to the
public anymore thus the removal from lttng.h header file.

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

diff --git a/include/lttng-kernel.h b/include/lttng-kernel.h
new file mode 100644 (file)
index 0000000..b8eb456
--- /dev/null
+++ b/include/lttng-kernel.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2011 - Julien Desfossez <julien.desfossez@polymtl.ca>
+ *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *                      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; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * 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.
+ */
+
+#ifndef _LTTNG_KERNEL_H
+#define _LTTNG_KERNEL_H
+
+#include <stdint.h>
+
+typedef uint64_t u64;
+
+/*
+ * LTTng DebugFS ABI structures.
+ */
+enum lttng_instrum_type {
+       INSTRUM_TRACEPOINTS,
+};
+
+struct lttng_channel {
+       int overwrite;         /* 1: overwrite, 0: discard */
+       u64 subbuf_size;
+       u64 num_subbuf;
+       unsigned int switch_timer_interval;
+       unsigned int read_timer_interval;
+};
+
+struct lttng_event {
+       enum lttng_instrum_type itype;
+       char name[];
+};
+
+#endif /* _LTTNG_KERNEL_H */

diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h
index 957484f0900daf1084368d2370f2174f8b4b95cb..f4b368f1f5833c67573ffe9cbcbb566d17e1f11c 100644 (file)
--- a/include/lttng/lttng.h
+++ b/include/lttng/lttng.h
@@ -60,27 +60,6 @@ struct lttng_trace {
        enum lttng_trace_type type;
 };
 
-/* TODO: don't export these into system-installed headers. */
-/*
- * LTTng DebugFS ABI structures.
- */
-enum lttng_instrum_type {
-       INSTRUM_TRACEPOINTS,
-};
-
-struct lttng_channel {
-       int overwrite;         /* 1: overwrite, 0: discard */
-       u64 subbuf_size;
-       u64 num_subbuf;
-       unsigned int switch_timer_interval;
-       unsigned int read_timer_interval;
-};
-
-struct lttng_event {
-       enum lttng_instrum_type itype;
-       char name[];
-};
-
 extern int lttng_create_session(char *name, uuid_t *session_id);
 extern int lttng_destroy_session(uuid_t *uuid);
 extern int lttng_connect_sessiond(void);

diff --git a/libkernelctl/libkernelctl.h b/libkernelctl/libkernelctl.h
index 048e0b0e0fffd41f43642c98a4943ab02eefe28d..2c03e1088c31cb32184afa843fa7eec17d5ed3f2 100644 (file)
--- a/libkernelctl/libkernelctl.h
+++ b/libkernelctl/libkernelctl.h
@@ -20,7 +20,7 @@
 #ifndef _LTT_LIBKERNELCTL_H
 #define _LTT_LIBKERNELCTL_H
 
-#include <lttng/lttng.h>
+#include "lttng-kernel.h"
 
 int kernctl_create_channel(int fd, struct lttng_channel *chops);
 int kernctl_create_event(int fd, struct lttng_event *ev);