Update version to 2.0.0 stable

[lttng-tools.git] / tests / test_kernel_data_trace.c

diff --git a/tests/test_kernel_data_trace.c b/tests/test_kernel_data_trace.c
index 7a1f076c6e354fa21f34d505342c29f0c9d99a12..6d7f291beefbf56217ce36bbed30fdc6ec195f54 100644 (file)
--- a/tests/test_kernel_data_trace.c
+++ b/tests/test_kernel_data_trace.c
@@ -25,15 +25,19 @@
 #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;
+int lttng_opt_quiet = 1;
+int lttng_opt_verbose;
 
 static const char alphanum[] =
        "0123456789"
@@ -41,43 +45,44 @@ 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->fd == -1);
+       assert(kern->metadata_stream_fd == -1);
+       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);
+       assert(kern->consumer_fd == -1);
        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,20 +90,20 @@ 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();
 
        printf("Validating kernel session metadata: ");
-       assert(kern->metadata->fd == 0);
+       assert(kern->metadata->fd == -1);
        assert(strlen(kern->metadata->pathname));
        assert(kern->metadata->conf != NULL);
        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
@@ -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,13 +120,15 @@ 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();
 
        printf("Validating kernel channel: ");
-       assert(chan->fd == 0);
+       assert(chan->fd == -1);
        assert(chan->enabled == 1);
        assert(strcmp(PATH1, chan->pathname) == 0);
        assert(chan->stream_count == 0);
@@ -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,16 +146,18 @@ 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();
 
        printf("Validating kernel event: ");
-       assert(event->fd == 0);
+       assert(event->fd == -1);
        assert(event->enabled == 1);
        assert(event->ctx == NULL);
        assert(event->event->instrumentation == LTTNG_KERNEL_TRACEPOINT);
@@ -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,19 +174,19 @@ 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();
 
        printf("Validating kernel stream: ");
-       assert(stream->fd == 0);
+       assert(stream->fd == -1);
        assert(stream->pathname == NULL);
        assert(stream->state == 0);
        PRINT_OK();
 
        /* 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)