X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Fnotification.c;h=07a8bb464826cea53821276af8db158e2813cc25;hb=aa0a9e96a728e6a4794f08bbb4df684e3274a3d9;hp=6c52bed01d864f8f40e574cd266dd0e5648584f8;hpb=60c78fd59a0aab218e567a3c8164516bcb0b6650;p=lttng-tools.git

diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c
index 6c52bed01..07a8bb464 100644
--- a/tests/regression/tools/notification/notification.c
+++ b/tests/regression/tools/notification/notification.c
@@ -50,6 +50,7 @@
 #include <lttng/notification/channel.h>
 #include <lttng/notification/notification.h>
 #include <lttng/trigger/trigger.h>
+#include <lttng/lttng.h>
 
 #include <tap/tap.h>
 
@@ -73,16 +74,31 @@ void wait_on_file(const char *path, bool file_exist)
 		ret = stat(path, &buf);
 		if (ret == -1 && errno == ENOENT) {
 			if (file_exist) {
-				(void) poll(NULL, 0, 10);	/* 10 ms delay */
-				continue;			/* retry */
+				/*
+				 * The file does not exist. wait a bit and
+				 * continue looping until it does.
+				 */
+				(void) poll(NULL, 0, 10);
+				continue;
 			}
-			break; /* File does not exist */
+
+			/*
+			 * File does not exist and the exit condition we want.
+			 * Break from the loop and return.
+			 */
+			break;
 		}
 		if (ret) {
 			perror("stat");
 			exit(EXIT_FAILURE);
 		}
-		break;	/* found */
+		/*
+		 * stat() returned 0, so the file exists. break now only if
+		 * that's the exit condition we want.
+		 */
+		if (file_exist) {
+			break;
+		}
 	}
 }
 
@@ -359,7 +375,7 @@ loop_end:
 			 * registered trigger fail.
 			 */
 			loop_ret = lttng_unregister_trigger(trigger);
-			ok(loop_ret == -LTTNG_ERR_TRIGGER_NOT_FOUND, "Unregister of a non-registerd  trigger fails as expected: %s", test_tuple_string);
+			ok(loop_ret == -LTTNG_ERR_TRIGGER_NOT_FOUND, "Unregister of a non-registered trigger fails as expected: %s", test_tuple_string);
 		} else {
 			ok(loop_ret == -LTTNG_ERR_INVALID_TRIGGER, "Trigger is invalid as expected and cannot be registered: %s", test_tuple_string);
 		}
@@ -374,6 +390,17 @@ end:
 	lttng_action_destroy(action);
 }
 
+static
+void wait_data_pending(const char *session_name)
+{
+	int ret;
+
+	do {
+		ret = lttng_data_pending(session_name);
+		assert(ret >= 0);
+	} while (ret != 0);
+}
+
 void test_notification_channel(const char *session_name, const char *channel_name, const enum lttng_domain_type domain_type, const char **argv)
 {
 	int ret = 0;
@@ -575,8 +602,8 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_ALREADY_SUBSCRIBED, "Subscribe to a condition for which subscription was already done");
 
 	/* Wait for notification to happen */
-	lttng_start_tracing(session_name);
 	stop_consumer(argv);
+	lttng_start_tracing(session_name);
 
 	/* Wait for high notification */
 	nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
@@ -588,8 +615,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 	notification = NULL;
 
 	suspend_application();
+	lttng_stop_tracing_no_wait(session_name);
 	resume_consumer(argv);
-	lttng_stop_tracing(session_name);
+	wait_data_pending(session_name);
 
 	/*
 	 * Test that communication still work even if there is notification
@@ -611,9 +639,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 	notification = NULL;
 
 	/* Stop consumer to force a high notification */
+	stop_consumer(argv);
 	resume_application();
 	lttng_start_tracing(session_name);
-	stop_consumer(argv);
 
 	nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification &&
@@ -623,9 +651,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 	notification = NULL;
 
 	suspend_application();
-	/* Resume consumer to allow event consumption */
+	lttng_stop_tracing_no_wait(session_name);
 	resume_consumer(argv);
-	lttng_stop_tracing(session_name);
+	wait_data_pending(session_name);
 
 	nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification &&
@@ -634,10 +662,10 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 	lttng_notification_destroy(notification);
 	notification = NULL;
 
+	stop_consumer(argv);
 	resume_application();
 	/* Stop consumer to force a high notification */
 	lttng_start_tracing(session_name);
-	stop_consumer(argv);
 
 	nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification &&
@@ -647,8 +675,10 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 	notification = NULL;
 
 	/* Resume consumer to allow event consumption */
+	suspend_application();
+	lttng_stop_tracing_no_wait(session_name);
 	resume_consumer(argv);
-	lttng_stop_tracing(session_name);
+	wait_data_pending(session_name);
 
 	nc_status = lttng_notification_channel_unsubscribe(notification_channel, low_condition);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK, "Unsubscribe low condition with pending notification");