Fix: test flaky sleep and wait patterns

[lttng-tools.git] / tests / utils / testapp / gen-ust-events / gen-ust-events.c

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 5f1e5bdd4e1dec155399fbb38c418ef82f54752d..3be0f0f1130958769e8d9298a1945fd441af6742 100644 (file)
--- a/tests/utils/testapp/gen-ust-events/gen-ust-events.c
+++ b/tests/utils/testapp/gen-ust-events/gen-ust-events.c
@@ -15,6 +15,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
@@ -26,6 +27,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <stdbool.h>
 
 #define TRACEPOINT_DEFINE
 #include "tp.h"
@@ -47,29 +49,33 @@ void create_file(const char *path)
 
 int main(int argc, char **argv)
 {
-       int i, netint;
+       unsigned int i, netint;
        long values[] = { 1, 2, 3 };
        char text[10] = "test";
        double dbl = 2.0;
        float flt = 2222.0;
-       unsigned int nr_iter = 100;
+       int nr_iter = 100;
        useconds_t nr_usec = 0;
        char *tmp_file_path = NULL;
+       bool file_created = false;
 
        if (argc >= 2) {
+               /*
+                * If nr_iter is negative, do an infinite tracing loop.
+                */
                nr_iter = atoi(argv[1]);
        }
 
-       if (argc == 3) {
+       if (argc >= 3) {
                /* By default, don't wait unless user specifies. */
                nr_usec = atoi(argv[2]);
        }
 
-       if (argc == 4) {
+       if (argc >= 4) {
                tmp_file_path = argv[3];
        }
 
-       for (i = 0; i < nr_iter; i++) {
+       for (i = 0; nr_iter < 0 || i < nr_iter; i++) {
                netint = htonl(i);
                tracepoint(tp, tptest, i, netint, values, text, strlen(text), dbl,
                                flt);
@@ -78,8 +84,9 @@ int main(int argc, char **argv)
                 * First loop we create the file if asked to indicate that at least one
                 * tracepoint has been hit.
                 */
-               if (i == 0 && tmp_file_path) {
+               if (!file_created && tmp_file_path) {
                        create_file(tmp_file_path);
+                       file_created = true;
                }
                usleep(nr_usec);
        }