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=7ed7cba61460c9cf576edbedc9f151c11c82f89a;hp=5f1e5bdd4e1dec155399fbb38c418ef82f54752d;hb=a4c305246c4b8021fa1681076326731349a1cd17;hpb=209b934f27820bff953d663af9bab268dc5e951c

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 5f1e5bdd4..7ed7cba61 100644
--- 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,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#define _LGPL_SOURCE
+#include <getopt.h>
 #include <assert.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
@@ -26,63 +28,119 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <stdbool.h>
+#include <signal.h>
+#include <poll.h>
+#include <errno.h>
+#include "utils.h"
+#include "signal-helper.h"
 
 #define TRACEPOINT_DEFINE
 #include "tp.h"
 
-void create_file(const char *path)
+static struct option long_options[] =
 {
-	int ret;
-
-	assert(path);
-
-	ret = creat(path, S_IRWXU);
-	if (ret < 0) {
-		fprintf(stderr, "Failed to create file %s\n", path);
-		return;
-	}
-
-	(void) close(ret);
-}
+	/* 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'},
+	{0, 0, 0, 0}
+};
 
 int main(int argc, char **argv)
 {
-	int i, netint;
+	unsigned int i, netint;
+	int option_index;
+	char option_char;
 	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, ret = 0, first_event_file_created = 0;
 	useconds_t nr_usec = 0;
-	char *tmp_file_path = NULL;
+	char *after_first_event_file_path = NULL;
+	char *before_last_event_file_path = NULL;
 
-	if (argc >= 2) {
-		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 '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) {
-		tmp_file_path = argv[3];
+
+	if (set_signal_handler()) {
+		ret = -1;
+		goto end;
 	}
 
-	for (i = 0; i < nr_iter; i++) {
+	for (i = 0; nr_iter < 0 || i < nr_iter; i++) {
+		if (nr_iter >= 0 && i == nr_iter - 1) {
+			/*
+			 * Wait on synchronization before writing last
+			 * event.
+			 */
+			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, strlen(text), dbl,
-				flt);
+		tracepoint(tp, tptest, i, netint, values, text,
+			strlen(text), dbl, flt);
 
 		/*
-		 * First loop we create the file if asked to indicate that at least one
-		 * tracepoint has been hit.
+		 * First loop we create the file if asked to indicate
+		 * that at least one tracepoint has been hit.
 		 */
-		if (i == 0 && tmp_file_path) {
-			create_file(tmp_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;
+				goto end;
+			}
+		}
+		if (should_quit) {
+			break;
 		}
-		usleep(nr_usec);
 	}
 
-	return 0;
+end:
+	free(after_first_event_file_path);
+	free(before_last_event_file_path);
+	exit(!ret ? EXIT_SUCCESS : EXIT_FAILURE);
 }