Update version to 2.0.0 stable

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

diff --git a/tests/lttng/kernel_event_basic.c b/tests/lttng/kernel_event_basic.c
index 255557148ca8ff627e5677a7237dce23a353444e..0af797c054fc0dadc9f6ad50fde5283e45a12c60 100644 (file)
--- a/tests/lttng/kernel_event_basic.c
+++ b/tests/lttng/kernel_event_basic.c
@@ -29,20 +29,26 @@
 
 #include "../utils.h"
 
+int lttng_opt_quiet;
+
 int main(int argc, char **argv)
 {
-    struct lttng_handle *handle = NULL;
-    struct lttng_domain dom;
+       struct lttng_handle *handle = NULL;
+       struct lttng_domain dom;
        struct lttng_channel channel;
        struct lttng_event sched_switch;
        struct lttng_event sched_process_exit;
        struct lttng_event sched_process_free;
+       char *session_name = "kernel_event_basic";
+       int ret = 0;
 
-    int ret = 0;
-
-       char *session_name = "kernel_event";
+       memset(&dom, 0, sizeof(dom));
+       memset(&channel, 0, sizeof(channel));
+       memset(&sched_switch, 0, sizeof(sched_switch));
+       memset(&sched_process_exit, 0, sizeof(sched_process_exit));
+       memset(&sched_process_free, 0, sizeof(sched_process_free));
 
-    dom.type = LTTNG_DOMAIN_KERNEL;
+       dom.type = LTTNG_DOMAIN_KERNEL;
 
        strcpy(channel.name, "mychan");
        channel.attr.overwrite = 0;
@@ -54,12 +60,15 @@ int main(int argc, char **argv)
 
        strcpy(sched_switch.name, "sched_switch");
        sched_switch.type = LTTNG_EVENT_TRACEPOINT;
+       sched_switch.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 
        strcpy(sched_process_exit.name, "sched_process_exit");
        sched_process_exit.type = LTTNG_EVENT_TRACEPOINT;
+       sched_process_exit.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 
        strcpy(sched_process_free.name, "sched_process_free");
        sched_process_free.type = LTTNG_EVENT_TRACEPOINT;
+       sched_process_free.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 
        printf("\nTesting tracing kernel events:\n");
        printf("-----------\n");
@@ -75,10 +84,10 @@ int main(int argc, char **argv)
        }
 
        printf("Creating tracing session (%s): ", argv[1]);
-    if ((ret = lttng_create_session(session_name, argv[1])) < 0) {
-        printf("error creating the session : %s\n", lttng_strerror(ret));
+       if ((ret = lttng_create_session(session_name, argv[1])) < 0) {
+               printf("error creating the session : %s\n", lttng_strerror(ret));
                goto create_fail;
-    }
+       }
        PRINT_OK();
 
        printf("Creating session handle: ");
@@ -95,10 +104,10 @@ int main(int argc, char **argv)
        }
 
        printf("Enabling %s kernel event: ", sched_switch.name);
-    if ((ret = lttng_enable_event(handle, &sched_switch, channel.name)) < 0) {
-        printf("error enabling event: %s\n", lttng_strerror(ret));
+       if ((ret = lttng_enable_event(handle, &sched_switch, channel.name)) < 0) {
+               printf("error enabling event: %s\n", lttng_strerror(ret));
                goto enable_fail;
-    }
+       }
        PRINT_OK();
 
        printf("Enabling %s kernel event: ", sched_process_exit.name);
@@ -144,7 +153,7 @@ int main(int argc, char **argv)
        PRINT_OK();
 
        printf("Start tracing: ");
-       if ((ret = lttng_start_tracing(handle)) < 0) {
+       if ((ret = lttng_start_tracing(session_name)) < 0) {
                printf("error starting tracing: %s\n", lttng_strerror(ret));
                goto start_fail;
        }
@@ -153,14 +162,14 @@ int main(int argc, char **argv)
        sleep(2);
 
        printf("Stop tracing: ");
-       if ((ret = lttng_stop_tracing(handle)) < 0) {
+       if ((ret = lttng_stop_tracing(session_name)) < 0) {
                printf("error stopping tracing: %s\n", lttng_strerror(ret));
                goto stop_fail;
        }
        PRINT_OK();
 
        printf("Destroy tracing session: ");
-       if ((ret = lttng_destroy_session(handle)) < 0) {
+       if ((ret = lttng_destroy_session(session_name)) < 0) {
                printf("error destroying session: %s\n", lttng_strerror(ret));
        }
        PRINT_OK();
@@ -175,8 +184,8 @@ handle_fail:
 stop_fail:
 start_fail:
 enable_fail:
-       lttng_destroy_session(handle);
+       lttng_destroy_session(session_name);
        lttng_destroy_handle(handle);
 
-    return 1;
+       return 1;
 }