X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Flttng%2Fkernel_all_events_basic.c;h=3b9fd60e7fa25b0f0bb6b35152fee0ae60aab25d;hb=d2641a837d460c275884523d67120379711dc38c;hp=438dfa00c37566fc97451622b6a9d876bdccb2e0;hpb=e3fa263d1d352d2f2dfc23aae2fc73c0347b7311;p=lttng-tools.git

diff --git a/tests/lttng/kernel_all_events_basic.c b/tests/lttng/kernel_all_events_basic.c
index 438dfa00c..3b9fd60e7 100644
--- a/tests/lttng/kernel_all_events_basic.c
+++ b/tests/lttng/kernel_all_events_basic.c
@@ -29,16 +29,24 @@
 
 #include "../utils.h"
 
+int opt_quiet = 0;
+
 int main(int argc, char **argv)
 {
-    struct lttng_handle *handle = NULL;
-    struct lttng_domain dom;
-    char *channel_name = "mychan";
-    int ret = 0;
-
-    dom.type = LTTNG_DOMAIN_KERNEL;
-
-	printf("\nTesting basic kernel tracing use case:\n");
+	struct lttng_handle *handle = NULL;
+	struct lttng_domain dom;
+	struct lttng_event event;
+	char *channel_name = "channel0";
+	char *session_name = "kernel_all_events_basic";
+	int ret = 0;
+
+	memset(&dom, 0, sizeof(dom));
+	memset(&event, 0, sizeof(event));
+	dom.type = LTTNG_DOMAIN_KERNEL;
+	event.type = LTTNG_EVENT_TRACEPOINT;
+	event.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
+
+	printf("\nTesting tracing all kernel events:\n");
 	printf("-----------\n");
 	/* Check if root */
 	if (getuid() != 0) {
@@ -52,45 +60,45 @@ int main(int argc, char **argv)
 	}
 
 	printf("Creating tracing session (%s): ", argv[1]);
-    if ((ret = lttng_create_session("test", argv[1])) < 0) {
-        printf("error creating the session : %s\n", lttng_get_readable_code(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: ");
-	if ((handle = lttng_create_handle("test", &dom)) == NULL) {
-		printf("error creating handle: %s\n", lttng_get_readable_code(ret));
+	if ((handle = lttng_create_handle(session_name, &dom)) == NULL) {
+		printf("error creating handle: %s\n", lttng_strerror(ret));
 		goto handle_fail;
 	}
 	PRINT_OK();
 
 	printf("Enabling all kernel events: ");
-    if ((ret = lttng_enable_event(handle, NULL, channel_name)) < 0) {
-        printf("error enabling event: %s\n", lttng_get_readable_code(ret));
+	if ((ret = lttng_enable_event(handle, &event, channel_name)) < 0) {
+		printf("error enabling event: %s\n", lttng_strerror(ret));
 		goto enable_fail;
-    }
+	}
 	PRINT_OK();
 
 	printf("Start tracing: ");
-    if ((ret = lttng_start_tracing(handle)) < 0) {
-        printf("error starting tracing: %s\n", lttng_get_readable_code(ret));
+	if ((ret = lttng_start_tracing(session_name)) < 0) {
+		printf("error starting tracing: %s\n", lttng_strerror(ret));
 		goto start_fail;
-    }
+	}
 	PRINT_OK();
 
-    sleep(2);
+	sleep(2);
 
 	printf("Stop tracing: ");
-	if ((ret = lttng_stop_tracing(handle)) < 0) {
-		printf("error stopping tracing: %s\n", lttng_get_readable_code(ret));
+	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) {
-		printf("error destroying session: %s\n", lttng_get_readable_code(ret));
+	if ((ret = lttng_destroy_session(session_name)) < 0) {
+		printf("error destroying session: %s\n", lttng_strerror(ret));
 	}
 	PRINT_OK();
 
@@ -104,8 +112,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;
 }