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=17fd8626ca5e03b14852a5c1466313aa5fc5924b;hp=9e5a1d1f287871f32af22e3f9f943feba471236b;hb=95983a02c557a99506716fc2c28f74be37def2b3;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..17fd8626c 100644
--- a/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.c
+++ b/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.c
@@ -25,13 +25,15 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include "utils.h"
+#include "signal-helper.h"
 
 #define TRACEPOINT_DEFINE
 #include "tp.h"
 
 int main(int argc, char **argv)
 {
-	int i, netint;
+	int i, netint, ret = 0;
 	long values[] = { 1, 2, 3 };
 	char text[10] = "test";
 	double dbl = 2.0;
@@ -39,6 +41,11 @@ int main(int argc, char **argv)
 	unsigned int nr_iter = 100;
 	useconds_t nr_usec = 0;
 
+	if (set_signal_handler()) {
+		ret = -1;
+		goto end;
+	}
+
 	if (argc >= 2) {
 		nr_iter = atoi(argv[1]);
 	}
@@ -60,8 +67,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);
 }