X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Flttng%2Fkernel_event_basic.c;h=0af797c054fc0dadc9f6ad50fde5283e45a12c60;hp=a6f4b81a87cb95f6d2e013378e44c051c129a532;hb=0e4cbe7e2c4c6a8343e710a3b050af8c33f95e21;hpb=c60ddab68a253f696908ed3766207b8443b85982

diff --git a/tests/lttng/kernel_event_basic.c b/tests/lttng/kernel_event_basic.c
index a6f4b81a8..0af797c05 100644
--- 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 sys_enter;
-	struct lttng_event sys_exit;
-
-    int ret = 0;
+	struct lttng_event sched_process_exit;
+	struct lttng_event sched_process_free;
+	char *session_name = "kernel_event_basic";
+	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(sys_enter.name, "sys_enter");
-	sys_enter.type = LTTNG_EVENT_TRACEPOINT;
+	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(sys_exit.name, "sys_exit");
-	sys_exit.type = LTTNG_EVENT_TRACEPOINT;
+	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,77 +84,77 @@ 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_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(session_name, &dom)) == NULL) {
-		printf("error creating handle: %s\n", lttng_get_readable_code(ret));
+		printf("error creating handle: %s\n", lttng_strerror(ret));
 		goto handle_fail;
 	}
 	PRINT_OK();
 
 	printf("Enabling %s kernel channel: ", channel.name);
 	if ((ret = lttng_enable_channel(handle, &channel)) < 0) {
-		printf("error enable channel: %s\n", lttng_get_readable_code(ret));
+		printf("error enable channel: %s\n", lttng_strerror(ret));
 		goto enable_fail;
 	}
 
 	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_get_readable_code(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: ", sys_enter.name);
-	if ((ret = lttng_enable_event(handle, &sys_enter, channel.name)) < 0) {
-		printf("error enabling event: %s\n", lttng_get_readable_code(ret));
+	printf("Enabling %s kernel event: ", sched_process_exit.name);
+	if ((ret = lttng_enable_event(handle, &sched_process_exit, channel.name)) < 0) {
+		printf("error enabling event: %s\n", lttng_strerror(ret));
 		goto enable_fail;
 	}
 	PRINT_OK();
 
-	printf("Enabling %s kernel event: ", sys_exit.name);
-	if ((ret = lttng_enable_event(handle, &sys_exit, channel.name)) < 0) {
-		printf("error enabling event: %s\n", lttng_get_readable_code(ret));
+	printf("Enabling %s kernel event: ", sched_process_free.name);
+	if ((ret = lttng_enable_event(handle, &sched_process_free, channel.name)) < 0) {
+		printf("error enabling event: %s\n", lttng_strerror(ret));
 		goto enable_fail;
 	}
 	PRINT_OK();
 
 	printf("Disabling %s kernel event: ", sched_switch.name);
 	if ((ret = lttng_disable_event(handle, sched_switch.name, channel.name)) < 0) {
-		printf("error enabling event: %s\n", lttng_get_readable_code(ret));
+		printf("error enabling event: %s\n", lttng_strerror(ret));
 		goto enable_fail;
 	}
 	PRINT_OK();
 
-	printf("Disabling %s kernel event: ", sys_exit.name);
-	if ((ret = lttng_disable_event(handle, sys_exit.name, channel.name)) < 0) {
-		printf("error enabling event: %s\n", lttng_get_readable_code(ret));
+	printf("Disabling %s kernel event: ", sched_process_free.name);
+	if ((ret = lttng_disable_event(handle, sched_process_free.name, channel.name)) < 0) {
+		printf("error enabling event: %s\n", lttng_strerror(ret));
 		goto enable_fail;
 	}
 	PRINT_OK();
 
 	printf("Renabling %s kernel event: ", sched_switch.name);
 	if ((ret = lttng_enable_event(handle, &sched_switch, channel.name)) < 0) {
-		printf("error enabling event: %s\n", lttng_get_readable_code(ret));
+		printf("error enabling event: %s\n", lttng_strerror(ret));
 		goto enable_fail;
 	}
 	PRINT_OK();
 
-	printf("Renabling %s kernel event: ", sys_exit.name);
-	if ((ret = lttng_enable_event(handle, &sys_exit, channel.name)) < 0) {
-		printf("error enabling event: %s\n", lttng_get_readable_code(ret));
+	printf("Renabling %s kernel event: ", sched_process_free.name);
+	if ((ret = lttng_enable_event(handle, &sched_process_free, 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();
@@ -153,15 +162,15 @@ int main(int argc, char **argv)
 	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();
 
@@ -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;
 }