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=3293687314aea3e213f470361d5a137bd0b5eace;hp=9e5a1d1f287871f32af22e3f9f943feba471236b;hb=refs%2Fheads%2Fsow-2019-0002-rev1;hpb=70dac0d716db5de1ede7448ab4092741d20bf248

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 9e5a1d1f2..329368731 100644
--- a/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.c
+++ b/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.c
@@ -1,22 +1,13 @@
 /*
- * Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2012 David Goulet <dgoulet@efficios.com>
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation; version 2.1 of the License.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #define _LGPL_SOURCE
 #include <arpa/inet.h>
+#include <getopt.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,13 +16,23 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include "utils.h"
+#include "signal-helper.h"
 
 #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'},
+	{0, 0, 0, 0}
+};
+
 int main(int argc, char **argv)
 {
-	int i, netint;
+	int i, netint, ret = 0, option_index, option;
 	long values[] = { 1, 2, 3 };
 	char text[10] = "test";
 	double dbl = 2.0;
@@ -39,15 +40,30 @@ int main(int argc, char **argv)
 	unsigned int nr_iter = 100;
 	useconds_t nr_usec = 0;
 
-	if (argc >= 2) {
-		nr_iter = atoi(argv[1]);
+	while ((option = getopt_long(argc, argv, "i:w:",
+			long_options, &option_index)) != -1) {
+		switch (option) {
+		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 (set_signal_handler()) {
+		ret = -1;
+		goto end;
 	}
 
+
 	for (i = 0; i < nr_iter; i++) {
 		netint = htonl(i);
 		tracepoint(tp, tptest1, i, netint, values, text, strlen(text),
@@ -60,8 +76,17 @@ int main(int argc, char **argv)
 				dbl, flt);
 		tracepoint(tp, tptest5, i, netint, values, text, strlen(text),
 				dbl, flt);
-		usleep(nr_usec);
+		if (nr_usec) {
+		        if (usleep_safe(nr_usec)) {
+				ret = -1;
+				goto end;
+			}
+		}
+		if (should_quit) {
+			break;
+		}
 	}
 
-	return 0;
+end:
+        exit(!ret ? EXIT_SUCCESS : EXIT_FAILURE);
 }