X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Ftestapp%2Fgen-ust-nevents%2Fgen-ust-nevents.c;h=ec71023de4d872632d59aef98d1f14037bc854bc;hp=52e5f3cb952fb0e69a596b7d9d0e36a974125306;hb=4bb5f0b0dcbd4c7bd09342be42f3b062a78c27ed;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33

diff --git a/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.c b/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.c
index 52e5f3cb9..ec71023de 100644
--- a/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.c
+++ b/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.c
@@ -7,6 +7,7 @@
 
 #define _LGPL_SOURCE
 #include <arpa/inet.h>
+#include <getopt.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -21,28 +22,72 @@
 #define TRACEPOINT_DEFINE
 #include "tp.h"
 
+static struct option long_options[] =
+{
+	/* These options set a flag. */
+	{"iter", required_argument, 0, 'i'},
+	{"wait", required_argument, 0, 'w'},
+	{"create-in-main", required_argument, 0, 'm'},
+	{"wait-before-first-event", required_argument, 0, 'b'},
+	{0, 0, 0, 0}
+};
+
 int main(int argc, char **argv)
 {
-	int i, netint, ret = 0;
+	int i, netint, ret = 0, option_index, option;
 	long values[] = { 1, 2, 3 };
 	char text[10] = "test";
 	double dbl = 2.0;
 	float flt = 2222.0;
 	unsigned int nr_iter = 100;
 	useconds_t nr_usec = 0;
+	char *wait_before_first_event_file_path = NULL;
+	char *create_in_main_file_path = NULL;
+
+	while ((option = getopt_long(argc, argv, "i:w:b:m:",
+			long_options, &option_index)) != -1) {
+		switch (option) {
+		case 'b':
+			wait_before_first_event_file_path = strdup(optarg);
+			break;
+		case 'm':
+			create_in_main_file_path = strdup(optarg);
+			break;
+		case 'i':
+			nr_iter = atoi(optarg);
+			break;
+		case 'w':
+			nr_usec = atoi(optarg);
+			break;
+		case '?':
+			/* getopt_long already printed an error message. */
+		default:
+			ret = -1;
+			goto end;
+		}
+	}
 
 	if (set_signal_handler()) {
 		ret = -1;
 		goto end;
 	}
 
-	if (argc >= 2) {
-		nr_iter = atoi(argv[1]);
+	/*
+	 * The two following sync points allow for tests to do work after the
+	 * app has started BUT before it generates any events.
+	 */
+	if (create_in_main_file_path) {
+		ret = create_file(create_in_main_file_path);
+		if (ret != 0) {
+			goto end;
+		}
 	}
 
-	if (argc == 3) {
-		/* By default, don't wait unless user specifies. */
-		nr_usec = atoi(argv[2]);
+	if (wait_before_first_event_file_path) {
+		ret = wait_on_file(wait_before_first_event_file_path);
+		if (ret != 0) {
+			goto end;
+		}
 	}
 
 	for (i = 0; i < nr_iter; i++) {
@@ -69,5 +114,7 @@ int main(int argc, char **argv)
 	}
 
 end:
-        exit(!ret ? EXIT_SUCCESS : EXIT_FAILURE);
+	free(create_in_main_file_path);
+	free(wait_before_first_event_file_path);
+	exit(!ret ? EXIT_SUCCESS : EXIT_FAILURE);
 }