Tests: Fix: `wait_on_file()` returns too early
[lttng-tools.git] / tests / regression / tools / notification / notification.c
index d8a88bf2135516c2c11dc655139712fd447944b9..f076bbd0e5f5373740061b13f47ef4efdfcd2ad9 100644 (file)
@@ -59,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;
+               }
        }
 }
 
@@ -105,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;
@@ -114,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;
@@ -184,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;
 
@@ -198,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;
@@ -345,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-register 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);
                }
This page took 0.033542 seconds and 4 git commands to generate.