X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Fnotification.c;h=cc42e6153c452bb209d887a68e14812286e4fc6c;hp=f076bbd0e5f5373740061b13f47ef4efdfcd2ad9;hb=a3ecaea889e67f87307cc3be53e51fb472a67c3b;hpb=f0784451e9e671a1acd6eac0dc0c750a7d83b4eb

diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c
index f076bbd0e..cc42e6153 100644
--- a/tests/regression/tools/notification/notification.c
+++ b/tests/regression/tools/notification/notification.c
@@ -21,9 +21,9 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <errno.h>
 #include <poll.h>
 
+#include <common/compat/errno.h>
 #include <lttng/action/action.h>
 #include <lttng/action/notify.h>
 #include <lttng/condition/buffer-usage.h>
@@ -87,6 +87,7 @@ void wait_on_file(const char *path, bool file_exist)
 	}
 }
 
+static
 int write_pipe(const char *path, uint8_t data)
 {
 	int ret = 0;
@@ -118,6 +119,7 @@ end:
 	return ret;
 }
 
+static
 int stop_consumer(const char **argv)
 {
 	int ret = 0, i;
@@ -128,6 +130,7 @@ int stop_consumer(const char **argv)
 	return ret;
 }
 
+static
 int resume_consumer(const char **argv)
 {
 	int ret = 0, i;
@@ -138,7 +141,8 @@ int resume_consumer(const char **argv)
 	return ret;
 }
 
-int suspend_application()
+static
+int suspend_application(void)
 {
 	int ret;
 	struct stat buf;
@@ -166,7 +170,8 @@ error:
 
 }
 
-int resume_application()
+static
+int resume_application(void)
 {
 	int ret;
 	struct stat buf;
@@ -196,6 +201,7 @@ error:
 }
 
 
+static
 void test_triggers_buffer_usage_condition(const char *session_name,
 		const char *channel_name,
 		enum lttng_domain_type domain_type,
@@ -315,7 +321,7 @@ void test_triggers_buffer_usage_condition(const char *session_name,
 			assert("Logic error for test vector generation");
 		}
 
-		loop_ret = asprintf(&test_tuple_string, "session name %s, channel name  %s, threshold ratio %s, threshold byte %s, domain type %s",
+		loop_ret = asprintf(&test_tuple_string, "session name %s, channel name %s, threshold ratio %s, threshold byte %s, domain type %s",
 				session_name_set ? "set" : "unset",
 				channel_name_set ? "set" : "unset",
 				threshold_ratio_set ? "set" : "unset",
@@ -389,6 +395,7 @@ void wait_data_pending(const char *session_name)
 	} while (ret != 0);
 }
 
+static
 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;
@@ -406,7 +413,7 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 	struct lttng_condition *dummy_condition = NULL;
 
 	double low_ratio = 0.0;
-	double high_ratio = 0.99;
+	double high_ratio = 0.90;
 
 	/* Set-up */
 	action = lttng_action_notify_create();
@@ -594,7 +601,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,
@@ -618,7 +627,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,
@@ -631,7 +642,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");
@@ -643,7 +656,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");
@@ -655,7 +670,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");