X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Ftest_kernel_data_trace.c;h=05fac0949c8ccaf6c127af8efeb4575bc0978deb;hp=93fa64cac4a315873ecebeaa442429a8ca36b7c6;hb=daf282ab93462198c6acd16b4aa624635df1bea5;hpb=897b8e238be8ce71c0d484c31155fc8390cda6f0

diff --git a/tests/test_kernel_data_trace.c b/tests/test_kernel_data_trace.c
index 93fa64cac..05fac0949 100644
--- a/tests/test_kernel_data_trace.c
+++ b/tests/test_kernel_data_trace.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <time.h>
 
-#include "ltt-sessiond/trace.h"
+#include "lttng-sessiond/trace-kernel.h"
 #include "utils.h"
 
 /* This path will NEVER be created in this test */
@@ -62,21 +62,22 @@ static char *get_random_string(void)
 static void create_one_kernel_session(void)
 {
 	printf("Create kernel session: ");
-	kern = trace_create_kernel_session();
+	kern = trace_kernel_create_session(PATH1);
 	assert(kern != NULL);
 	PRINT_OK();
 
 	printf("Validating kernel session: ");
 	assert(kern->fd == 0);
 	assert(kern->metadata_stream_fd == 0);
-	assert(kern->kconsumer_fds_sent == 0);
+	assert(kern->consumer_fds_sent == 0);
 	assert(kern->channel_count == 0);
 	assert(kern->stream_count_global == 0);
 	assert(kern->metadata == NULL);
+	assert(kern->consumer_fd == 0);
 	PRINT_OK();
 
 	/* Init list in order to avoid sefaults from cds_list_del */
-	trace_destroy_kernel_session(kern);
+	trace_kernel_destroy_session(kern);
 }
 
 static void create_kernel_metadata(void)
@@ -84,7 +85,7 @@ static void create_kernel_metadata(void)
 	assert(kern != NULL);
 
 	printf("Create kernel metadata: ");
-	kern->metadata = trace_create_kernel_metadata(PATH1);
+	kern->metadata = trace_kernel_create_metadata(PATH1);
 	assert(kern->metadata != NULL);
 	PRINT_OK();
 
@@ -95,9 +96,9 @@ static void create_kernel_metadata(void)
 	assert(kern->metadata->conf->attr.overwrite
 			== DEFAULT_CHANNEL_OVERWRITE);
 	assert(kern->metadata->conf->attr.subbuf_size
-			== DEFAULT_CHANNEL_SUBBUF_SIZE);
+			== DEFAULT_METADATA_SUBBUF_SIZE);
 	assert(kern->metadata->conf->attr.num_subbuf
-			== DEFAULT_CHANNEL_SUBBUF_NUM);
+			== DEFAULT_METADATA_SUBBUF_NUM);
 	assert(kern->metadata->conf->attr.switch_timer_interval
 			== DEFAULT_CHANNEL_SWITCH_TIMER);
 	assert(kern->metadata->conf->attr.read_timer_interval
@@ -106,7 +107,7 @@ static void create_kernel_metadata(void)
 			== DEFAULT_KERNEL_CHANNEL_OUTPUT);
 	PRINT_OK();
 
-	trace_destroy_kernel_metadata(kern->metadata);
+	trace_kernel_destroy_metadata(kern->metadata);
 }
 
 static void create_kernel_channel(void)
@@ -115,7 +116,7 @@ static void create_kernel_channel(void)
 	struct lttng_channel attr;
 
 	printf("Creating kernel channel: ");
-	chan = trace_create_kernel_channel(&attr, PATH1);
+	chan = trace_kernel_create_channel(&attr, PATH1);
 	assert(chan != NULL);
 	PRINT_OK();
 
@@ -130,7 +131,7 @@ static void create_kernel_channel(void)
 
 	/* Init list in order to avoid sefaults from cds_list_del */
 	CDS_INIT_LIST_HEAD(&chan->list);
-	trace_destroy_kernel_channel(chan);
+	trace_kernel_destroy_channel(chan);
 }
 
 static void create_kernel_event(void)
@@ -142,7 +143,7 @@ static void create_kernel_event(void)
 	ev.type = LTTNG_EVENT_TRACEPOINT;
 
 	printf("Creating kernel event: ");
-	event = trace_create_kernel_event(&ev);
+	event = trace_kernel_create_event(&ev);
 	assert(event != NULL);
 	PRINT_OK();
 
@@ -156,7 +157,7 @@ static void create_kernel_event(void)
 
 	/* Init list in order to avoid sefaults from cds_list_del */
 	CDS_INIT_LIST_HEAD(&event->list);
-	trace_destroy_kernel_event(event);
+	trace_kernel_destroy_event(event);
 }
 
 static void create_kernel_stream(void)
@@ -164,7 +165,7 @@ static void create_kernel_stream(void)
 	struct ltt_kernel_stream *stream;
 
 	printf("Creating kernel stream: ");
-	stream = trace_create_kernel_stream();
+	stream = trace_kernel_create_stream();
 	assert(stream != NULL);
 	PRINT_OK();
 
@@ -176,7 +177,7 @@ static void create_kernel_stream(void)
 
 	/* Init list in order to avoid sefaults from cds_list_del */
 	CDS_INIT_LIST_HEAD(&stream->list);
-	trace_destroy_kernel_stream(stream);
+	trace_kernel_destroy_stream(stream);
 }
 
 int main(int argc, char **argv)