X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Fnotification.c;h=89e3d9ef26beb848b4292d93596ebe7193cf4b2e;hb=4a5ce57c0329b9e4593c007363e436c49e390978;hp=b6ef0df4f1dc6c7ef9f751ad4a2a54b7d15e4745;hpb=874499e2b07b8b4cbafe656f1176a66edd48b716;p=lttng-tools.git

diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c
index b6ef0df4f..89e3d9ef2 100644
--- a/tests/regression/tools/notification/notification.c
+++ b/tests/regression/tools/notification/notification.c
@@ -606,7 +606,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 	lttng_start_tracing(session_name);
 
 	/* Wait for high notification */
-	nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	do {
+		nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	} while (nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INTERRUPTED);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK
 			&& notification
 			&& lttng_condition_get_type(lttng_notification_get_condition(notification)) == LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH,
@@ -630,7 +632,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 	nc_status = lttng_notification_channel_subscribe(notification_channel, low_condition);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK, "subscribe with pending notification");
 
-	nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	do {
+		nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	} while (nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INTERRUPTED);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK
 			&& notification
 			&& lttng_condition_get_type(lttng_notification_get_condition(notification)) == LTTNG_CONDITION_TYPE_BUFFER_USAGE_LOW,
@@ -643,7 +647,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 	resume_application();
 	lttng_start_tracing(session_name);
 
-	nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	do {
+		nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	} while (nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INTERRUPTED);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification &&
 			lttng_condition_get_type(lttng_notification_get_condition(notification)) == LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH,
 			"High notification received after intermediary communication");
@@ -655,7 +661,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 	resume_consumer(argv);
 	wait_data_pending(session_name);
 
-	nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	do {
+		nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	} while (nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INTERRUPTED);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification &&
 			lttng_condition_get_type(lttng_notification_get_condition(notification)) == LTTNG_CONDITION_TYPE_BUFFER_USAGE_LOW,
 			"Low notification received after re-subscription");
@@ -667,7 +675,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 	/* Stop consumer to force a high notification */
 	lttng_start_tracing(session_name);
 
-	nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	do {
+		nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	} while (nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INTERRUPTED);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification &&
 			lttng_condition_get_type(lttng_notification_get_condition(notification)) == LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH,
 			"High notification");