X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Ftest_kernel_data_trace.c;h=0a534699c5444552669f7c0d9043a528d6579949;hb=1d76b9222464f9e10128ae867cd56a9317da5d65;hp=2892ab236888d9cdc5ca787eba942469336c76d8;hpb=b389abbe14d653f704fcf8f952539cc5ce775c53;p=lttng-tools.git

diff --git a/tests/test_kernel_data_trace.c b/tests/test_kernel_data_trace.c
index 2892ab236..0a534699c 100644
--- a/tests/test_kernel_data_trace.c
+++ b/tests/test_kernel_data_trace.c
@@ -25,12 +25,16 @@
 #include <unistd.h>
 #include <time.h>
 
-#include "ltt-sessiond/trace.h"
+#include <bin/lttng-sessiond/trace-kernel.h>
+#include <common/defaults.h>
+
 #include "utils.h"
 
 /* This path will NEVER be created in this test */
 #define PATH1 "/tmp/.test-junk-lttng"
 
+#define RANDOM_STRING_LEN	11
+
 /* For lttngerr.h */
 int opt_quiet = 1;
 int opt_verbose = 0;
@@ -41,35 +45,36 @@ static const char alphanum[] =
 	"abcdefghijklmnopqrstuvwxyz";
 
 static struct ltt_kernel_session *kern;
+static char random_string[RANDOM_STRING_LEN];
 
 /*
  * Return random string of 10 characters.
+ * Not thread-safe.
  */
 static char *get_random_string(void)
 {
 	int i;
-	char *str = malloc(11);
 
-	for (i = 0; i < 10; i++) {
-		str[i] = alphanum[rand() % (sizeof(alphanum) - 1)];
+	for (i = 0; i < RANDOM_STRING_LEN - 1; i++) {
+		random_string[i] = alphanum[rand() % (sizeof(alphanum) - 1)];
 	}
 
-	str[10] = '\0';
+	random_string[RANDOM_STRING_LEN - 1] = '\0';
 
-	return str;
+	return random_string;
 }
 
 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);
@@ -77,7 +82,7 @@ static void create_one_kernel_session(void)
 	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)
@@ -85,7 +90,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();
 
@@ -107,7 +112,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,8 +120,10 @@ static void create_kernel_channel(void)
 	struct ltt_kernel_channel *chan;
 	struct lttng_channel attr;
 
+	memset(&attr, 0, sizeof(attr));
+
 	printf("Creating kernel channel: ");
-	chan = trace_create_kernel_channel(&attr, PATH1);
+	chan = trace_kernel_create_channel(&attr, PATH1);
 	assert(chan != NULL);
 	PRINT_OK();
 
@@ -131,7 +138,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)
@@ -139,11 +146,13 @@ static void create_kernel_event(void)
 	struct ltt_kernel_event *event;
 	struct lttng_event ev;
 
-	strncpy(ev.name, get_random_string(), LTTNG_SYM_NAME_LEN);
+	memset(&ev, 0, sizeof(ev));
+	strncpy(ev.name, get_random_string(), LTTNG_KERNEL_SYM_NAME_LEN);
 	ev.type = LTTNG_EVENT_TRACEPOINT;
+	ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 
 	printf("Creating kernel event: ");
-	event = trace_create_kernel_event(&ev);
+	event = trace_kernel_create_event(&ev);
 	assert(event != NULL);
 	PRINT_OK();
 
@@ -157,7 +166,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)
@@ -165,7 +174,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();
 
@@ -177,7 +186,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)