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

diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c
index 7af9258f9..f076bbd0e 100644
--- a/tests/regression/tools/notification/notification.c
+++ b/tests/regression/tools/notification/notification.c
@@ -5,23 +5,8 @@
  *
  * Copyright (C) 2017 Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
  */
 
 #include <assert.h>
@@ -74,16 +59,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;
+		}
 	}
 }
 
@@ -120,8 +120,9 @@ end:
 
 int stop_consumer(const char **argv)
 {
-	int ret = 0;
-	for (int i = named_pipe_args_start; i < nb_args; i++) {
+	int ret = 0, i;
+
+	for (i = named_pipe_args_start; i < nb_args; i++) {
 		ret = write_pipe(argv[i], 49);
 	}
 	return ret;
@@ -129,8 +130,9 @@ int stop_consumer(const char **argv)
 
 int resume_consumer(const char **argv)
 {
-	int ret = 0;
-	for (int i = named_pipe_args_start; i < nb_args; i++) {
+	int ret = 0, i;
+
+	for (i = named_pipe_args_start; i < nb_args; i++) {
 		ret = write_pipe(argv[i], 0);
 	}
 	return ret;
@@ -199,6 +201,7 @@ void test_triggers_buffer_usage_condition(const char *session_name,
 		enum lttng_domain_type domain_type,
 		enum lttng_condition_type condition_type)
 {
+	unsigned int test_vector_size = 5, i;
 	enum lttng_condition_status condition_status;
 	struct lttng_action *action;
 
@@ -213,8 +216,8 @@ void test_triggers_buffer_usage_condition(const char *session_name,
 	ok(lttng_register_trigger(NULL) == -LTTNG_ERR_INVALID, "Registering a NULL trigger fails as expected");
 
 	/* Test: register a trigger */
-	unsigned int test_vector_size = 5;
-	for (unsigned int  i = 0; i < pow(2,test_vector_size); i++) {
+
+	for (i = 0; i < pow(2,test_vector_size); i++) {
 		int loop_ret = 0;
 		char *test_tuple_string = NULL;
 		unsigned int mask_position = 0;
@@ -360,7 +363,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);
 		}
@@ -567,10 +570,10 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INVALID, "Subscribing to an invalid condition");
 
 	nc_status = lttng_notification_channel_unsubscribe(notification_channel, dummy_invalid_condition);
-	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INVALID, "Unsubscribing to an invalid condition");
+	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INVALID, "Unsubscribing from an invalid condition");
 
 	nc_status = lttng_notification_channel_unsubscribe(notification_channel, dummy_condition);
-	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_UNKNOWN_CONDITION, "Unsubscribing to an valid unknown condition");
+	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_UNKNOWN_CONDITION, "Unsubscribing from a valid unknown condition");
 
 	/* Subscribe a valid low condition */
 	nc_status = lttng_notification_channel_subscribe(notification_channel, low_condition);