Tests: Move script synchronization functions to utils library

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/tests/utils/testapp/gen-ust-events/gen-ust-events.c b/tests/utils/testapp/gen-ust-events/gen-ust-events.c
index c5dd31a355e1294229529a4ff20c3a3026bf8347..1ce34423b330ab14cccf50597b2fa1d0e469148c 100644 (file)
--- a/tests/utils/testapp/gen-ust-events/gen-ust-events.c
+++ b/tests/utils/testapp/gen-ust-events/gen-ust-events.c
@@ -37,48 +37,6 @@
 #define TRACEPOINT_DEFINE
 #include "tp.h"
 
-void create_file(const char *path)
-{
-       static bool file_created = false;
-       int ret;
-
-       if (!path || file_created) {
-               return;
-       }
-
-       ret = creat(path, S_IRWXU);
-       if (ret < 0) {
-               fprintf(stderr, "Failed to create file %s\n", path);
-               return;
-       }
-
-       (void) close(ret);
-       file_created = true;
-}
-
-static
-void wait_on_file(const char *path)
-{
-       if (!path) {
-               return;
-       }
-       for (;;) {
-               int ret;
-               struct stat buf;
-
-               ret = stat(path, &buf);
-               if (ret == -1 && errno == ENOENT) {
-                       (void) poll(NULL, 0, 10);       /* 10 ms delay */
-                       continue;                       /* retry */
-               }
-               if (ret) {
-                       perror("stat");
-                       exit(EXIT_FAILURE);
-               }
-               break;  /* found */
-       }
-}
-
 int main(int argc, char **argv)
 {
        unsigned int i, netint;
@@ -86,7 +44,7 @@ int main(int argc, char **argv)
        char text[10] = "test";
        double dbl = 2.0;
        float flt = 2222.0;
-       int nr_iter = 100, ret = 0;
+       int nr_iter = 100, ret = 0, first_event_file_created = 0;
        useconds_t nr_usec = 0;
        char *after_first_event_file_path = NULL;
        char *before_last_event_file_path = NULL;
@@ -122,7 +80,12 @@ int main(int argc, char **argv)
                         * Wait on synchronization before writing last
                         * event.
                         */
-                       wait_on_file(before_last_event_file_path);
+                       if (before_last_event_file_path) {
+                               ret = wait_on_file(before_last_event_file_path);
+                               if (ret != 0) {
+                                       goto end;
+                               }
+                       }
                }
                netint = htonl(i);
                tracepoint(tp, tptest, i, netint, values, text,
@@ -132,7 +95,16 @@ int main(int argc, char **argv)
                 * First loop we create the file if asked to indicate
                 * that at least one tracepoint has been hit.
                 */
-               create_file(after_first_event_file_path);
+               if (after_first_event_file_path && first_event_file_created == 0) {
+                       ret = create_file(after_first_event_file_path);
+
+                       if (ret != 0) {
+                               goto end;
+                       } else {
+                               first_event_file_created = 1;
+                       }
+               }
+
                if (nr_usec) {
                        if (usleep_safe(nr_usec)) {
                                ret = -1;

diff --git a/tests/utils/utils.c b/tests/utils/utils.c
index 0b9655247e81ba30604b88891e352ed553e960a5..c31417efbbc2190c6055ab786853e5de3496c933 100644 (file)
--- a/tests/utils/utils.c
+++ b/tests/utils/utils.c
@@ -15,13 +15,21 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <stdint.h>
+#include <assert.h>
 #include <common/compat/time.h>
 #include <common/time.h>
-#include <assert.h>
-#include <unistd.h>
-#include <stdio.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "utils.h"
 
 static inline
 int64_t elapsed_time_ns(struct timespec *t1, struct timespec *t2)
@@ -66,3 +74,61 @@ int usleep_safe(useconds_t usec)
 end:
        return ret;
 }
+
+int create_file(const char *path)
+{
+       int ret;
+
+       if (!path) {
+               return -1;
+       }
+
+       ret = creat(path, S_IRWXU);
+       if (ret < 0) {
+               perror("creat");
+               return -1;
+       }
+
+       ret = close(ret);
+       if (ret < 0) {
+               perror("close");
+               return -1;
+       }
+
+       return 0;
+}
+
+int wait_on_file(const char *path)
+{
+       int ret;
+       struct stat buf;
+
+       if (!path) {
+               return -1;
+       }
+
+       for (;;) {
+               ret = stat(path, &buf);
+               if (ret == -1 && errno == ENOENT) {
+                       ret = poll(NULL, 0, 10);        /* 10 ms delay */
+                       /* Should return 0 everytime */
+                       if (ret) {
+                               if (ret < 0) {
+                                       perror("perror");
+                               } else {
+                                       fprintf(stderr,
+                                               "poll return value is larger than zero\n");
+                               }
+                               return -1;
+                       }
+                       continue;                       /* retry */
+               }
+               if (ret) {
+                       perror("stat");
+                       return -1;
+               }
+               break;  /* found */
+       }
+
+       return 0;
+}

diff --git a/tests/utils/utils.h b/tests/utils/utils.h
index e5a5310d9b58754313d0bfd43b36479d241fdf60..0d841bfd0b739b0e56d03c6af10f59a162a93071 100644 (file)
--- a/tests/utils/utils.h
+++ b/tests/utils/utils.h
@@ -19,5 +19,7 @@
 #define TEST_UTILS_H
 
 int usleep_safe(useconds_t usec);
+int create_file(const char *path);
+int wait_on_file(const char *path);
 
 #endif /* TEST_UTILS_H */