X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Flttng%2Fust_global_event_basic.c;h=05c1a443e00cdf51002f9068cd82397c41df6111;hp=ac0687daa11120e112ad5cc9d6e42014461e0453;hb=ca2eb7f43cf00d12f563905d741a6789c3d130ee;hpb=ed7f40833d26f9d757c455607118c6d8e866a956

diff --git a/tests/lttng/ust_global_event_basic.c b/tests/lttng/ust_global_event_basic.c
index ac0687daa..05c1a443e 100644
--- a/tests/lttng/ust_global_event_basic.c
+++ b/tests/lttng/ust_global_event_basic.c
@@ -29,19 +29,24 @@
 
 #include "../utils.h"
 
+int opt_quiet = 0;
+
 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 ev1, ev2, ev3;
-
-    int ret = 0;
-
 	char *session_name = "ust_global_event_basic";
+	int ret = 0;
 
-    dom.type = LTTNG_DOMAIN_UST;
+	memset(&dom, 0, sizeof(dom));
+	memset(&channel, 0, sizeof(channel));
+	memset(&ev1, 0, sizeof(ev1));
+	memset(&ev2, 0, sizeof(ev2));
+	memset(&ev3, 0, sizeof(ev3));
 
+	dom.type = LTTNG_DOMAIN_UST;
 	strcpy(channel.name, "mychan");
 	channel.attr.overwrite = 0;
 	channel.attr.subbuf_size = 4096;
@@ -52,18 +57,15 @@ int main(int argc, char **argv)
 
 	strcpy(ev1.name, "tp1");
 	ev1.type = LTTNG_EVENT_TRACEPOINT;
-	ev1.loglevel[0] = '\0';
-	ev1.loglevel_type = LTTNG_EVENT_LOGLEVEL;
+	ev1.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 
 	strcpy(ev2.name, "ev2");
 	ev2.type = LTTNG_EVENT_TRACEPOINT;
-	ev2.loglevel[0] = '\0';
-	ev2.loglevel_type = LTTNG_EVENT_LOGLEVEL;
+	ev2.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 
 	strcpy(ev3.name, "ev3");
 	ev3.type = LTTNG_EVENT_TRACEPOINT;
-	ev3.loglevel[0] = '\0';
-	ev3.loglevel_type = LTTNG_EVENT_LOGLEVEL;
+	ev3.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 
 	printf("\nTesting tracing UST events:\n");
 	printf("-----------\n");
@@ -74,10 +76,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 +97,10 @@ int main(int argc, char **argv)
 	PRINT_OK();
 
 	printf("Enabling %s UST event: ", ev1.name);
-    if ((ret = lttng_enable_event(handle, &ev1, channel.name)) < 0) {
-        printf("error enabling event: %s\n", lttng_strerror(ret));
+	if ((ret = lttng_enable_event(handle, &ev1, channel.name)) < 0) {
+		printf("error enabling event: %s\n", lttng_strerror(ret));
 		goto enable_fail;
-    }
+	}
 	PRINT_OK();
 
 	printf("Enabling %s UST event: ", ev2.name);
@@ -159,6 +161,22 @@ int main(int argc, char **argv)
 	}
 	PRINT_OK();
 
+	printf("Restart tracing: ");
+	if ((ret = lttng_start_tracing(session_name)) < 0) {
+		printf("error starting tracing: %s\n", lttng_strerror(ret));
+		goto start_fail;
+	}
+	PRINT_OK();
+
+	sleep(2);
+
+	printf("Stop tracing: ");
+	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(session_name)) < 0) {
 		printf("error destroying session: %s\n", lttng_strerror(ret));
@@ -178,5 +196,5 @@ enable_fail:
 	lttng_destroy_session(session_name);
 	lttng_destroy_handle(handle);
 
-    return 1;
+	return 1;
 }