X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Ftestapp%2Fgen-ust-events%2Fgen-ust-events.c;h=e2f6126782c6684daf01e02de45cce92f6c83445;hp=1ce34423b330ab14cccf50597b2fa1d0e469148c;hb=503315ec95686c3b17251d70c632383167320ccc;hpb=b2047add047d9965a2fd27d4a61d83170bbfed99

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 1ce34423b..e2f612678 100644
--- a/tests/utils/testapp/gen-ust-events/gen-ust-events.c
+++ b/tests/utils/testapp/gen-ust-events/gen-ust-events.c
@@ -16,6 +16,7 @@
  */
 
 #define _LGPL_SOURCE
+#include <getopt.h>
 #include <assert.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
@@ -37,9 +38,22 @@
 #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'},
+	{"sync-after-first-event", required_argument, 0, 'a'},
+	{"sync-before-last-event", required_argument, 0, 'b'},
+	{"sync-before-last-event-touch", required_argument, 0, 'c'},
+	{0, 0, 0, 0}
+};
+
 int main(int argc, char **argv)
 {
 	unsigned int i, netint;
+	int option_index;
+	char option_char;
 	long values[] = { 1, 2, 3 };
 	char text[10] = "test";
 	double dbl = 2.0;
@@ -48,30 +62,48 @@ int main(int argc, char **argv)
 	useconds_t nr_usec = 0;
 	char *after_first_event_file_path = NULL;
 	char *before_last_event_file_path = NULL;
+	/*
+	 * Touch a file to indicate that all events except one were
+	 * generated.
+	 */
+	char *before_last_event_file_path_touch = NULL;
 
-	if (set_signal_handler()) {
-		ret = -1;
-		goto end;
-	}
-
-	if (argc >= 2) {
-		/*
-		 * If nr_iter is negative, do an infinite tracing loop.
-		 */
-		nr_iter = atoi(argv[1]);
+	while((option_char = getopt_long(argc, argv, "i:w:a:b:c:d:", long_options, &option_index)) != -1) {
+		switch (option_char) {
+		case 'a':
+			after_first_event_file_path = strdup(optarg);
+			break;
+		case 'b':
+			before_last_event_file_path = strdup(optarg);
+			break;
+		case 'c':
+			before_last_event_file_path_touch = 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. */
+			break;
+		default:
+			ret = -1;
+			goto end;
+		}
 	}
 
-	if (argc >= 3) {
-		/* By default, don't wait unless user specifies. */
-		nr_usec = atoi(argv[2]);
+	if (optind != argc) {
+		fprintf(stderr, "Error: takes long options only.");
+		ret = -1;
+		goto end;
 	}
 
-	if (argc >= 4) {
-		after_first_event_file_path = argv[3];
-	}
 
-	if (argc >= 5) {
-		before_last_event_file_path = argv[4];
+	if (set_signal_handler()) {
+		ret = -1;
+		goto end;
 	}
 
 	for (i = 0; nr_iter < 0 || i < nr_iter; i++) {
@@ -80,6 +112,12 @@ int main(int argc, char **argv)
 			 * Wait on synchronization before writing last
 			 * event.
 			 */
+			if (before_last_event_file_path_touch) {
+				ret = create_file(before_last_event_file_path_touch);
+				if (ret != 0) {
+					goto end;
+				}
+			}
 			if (before_last_event_file_path) {
 				ret = wait_on_file(before_last_event_file_path);
 				if (ret != 0) {
@@ -117,5 +155,8 @@ int main(int argc, char **argv)
 	}
 
 end:
+	free(after_first_event_file_path);
+	free(before_last_event_file_path);
+	free(before_last_event_file_path_touch);
 	exit(!ret ? EXIT_SUCCESS : EXIT_FAILURE);
 }