X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Ftrace.h;h=8fdef2a37721443de94c1fabe92669073cff49d1;hp=444126ba01e4322c7727a3341f85fd13467e8e90;hb=f3ed775ef4842019b396f06095b053c3a70bc3c8;hpb=d686b40f66ea5df5ac0b9405991bbc33348b0a88

diff --git a/ltt-sessiond/trace.h b/ltt-sessiond/trace.h
index 444126ba0..8fdef2a37 100644
--- a/ltt-sessiond/trace.h
+++ b/ltt-sessiond/trace.h
@@ -21,14 +21,10 @@
 
 #include <limits.h>
 #include <urcu/list.h>
-#include "lttng-kernel.h"
 
-/* Default kernel channel attributes */
-#define DEFAULT_KERNEL_OVERWRITE            0
-#define DEFAULT_KERNEL_SUBBUF_SIZE          4096    /* bytes */
-#define DEFAULT_KERNEL_SUBBUF_NUM           8       /* Must always be a power of 2 */
-#define DEFAULT_KERNEL_SWITCH_TIMER         0       /* usec */
-#define DEFAULT_KERNEL_READ_TIMER           200     /* usec */
+#include <lttng/lttng.h>
+
+#include "lttng-kernel.h"
 
 /* Kernel event list */
 struct ltt_kernel_event_list {
@@ -57,7 +53,7 @@ struct ltt_kernel_channel {
 	int fd;
 	char *pathname;
 	unsigned int stream_count;
-	struct lttng_kernel_channel *channel;
+	struct lttng_channel *channel;
 	struct ltt_kernel_event_list events_list;
 	struct ltt_kernel_stream_list stream_list;
 	struct cds_list_head list;
@@ -67,7 +63,7 @@ struct ltt_kernel_channel {
 struct ltt_kernel_metadata {
 	int fd;
 	char *pathname;
-	struct lttng_kernel_channel *conf;
+	struct lttng_channel *conf;
 };
 
 /* Channel stream */
@@ -82,6 +78,7 @@ struct ltt_kernel_stream {
 struct ltt_kernel_session {
 	int fd;
 	int metadata_stream_fd;
+	int kconsumer_fds_sent;
 	unsigned int channel_count;
 	unsigned int stream_count_global;
 	struct ltt_kernel_metadata *metadata;
@@ -107,9 +104,8 @@ struct ltt_ust_marker {
  * Create functions malloc() the data structure.
  */
 struct ltt_kernel_session *trace_create_kernel_session(void);
-struct ltt_kernel_channel *trace_create_kernel_channel(void);
-struct ltt_kernel_event *trace_create_kernel_event(char *name,
-		enum lttng_kernel_instrumentation type);
+struct ltt_kernel_channel *trace_create_kernel_channel(struct lttng_channel *chan);
+struct ltt_kernel_event *trace_create_kernel_event(struct lttng_event *ev);
 struct ltt_kernel_metadata *trace_create_kernel_metadata(void);
 struct ltt_kernel_stream *trace_create_kernel_stream(void);