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=8f2acdbabbfbb28ab8a72b4bb5c4f03dfa8960d4;hp=11327d5f4b6866d7c324b50223181897ccf8e862;hb=56d48389d883f56a0ac017885dc6ad25dab5bc91;hpb=5fcaccbce7683a6af772d6f37d03fb01cf248a84 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 11327d5f4..8f2acdbab 100644 --- a/tests/utils/testapp/gen-ust-events/gen-ust-events.c +++ b/tests/utils/testapp/gen-ust-events/gen-ust-events.c @@ -15,8 +15,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#define _GNU_SOURCE #define _LGPL_SOURCE +#include #include #include #include @@ -32,91 +32,123 @@ #include #include #include +#include "utils.h" +#include "signal-helper.h" #define TRACEPOINT_DEFINE #include "tp.h" -void create_file(const char *path) +static struct option long_options[] = { - static bool file_created = false; - int ret; - - if (!path || file_created) { - return; - } - - ret = creat(path, S_IRWXU); - if (ret < 0) { - fprintf(stderr, "Failed to create file %s\n", path); - return; - } - - (void) close(ret); - file_created = true; -} - -static -void wait_on_file(const char *path) -{ - if (!path) { - return; - } - for (;;) { - int ret; - struct stat buf; - - ret = stat(path, &buf); - if (ret == -1 && errno == ENOENT) { - (void) poll(NULL, 0, 10); /* 10 ms delay */ - continue; /* retry */ - } - if (ret) { - perror("stat"); - exit(EXIT_FAILURE); - } - break; /* found */ - } -} + /* 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'}, + {"sync-before-exit", required_argument, 0, 'd'}, + {"sync-before-exit-touch", required_argument, 0, 'e'}, + {0, 0, 0, 0} +}; int main(int argc, char **argv) { unsigned int i, netint; + int option_index; + int option; long values[] = { 1, 2, 3 }; char text[10] = "test"; double dbl = 2.0; float flt = 2222.0; - int nr_iter = 100; + int nr_iter = 100, ret = 0, first_event_file_created = 0; 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; + /* Touch file when we are exiting */ + char *before_exit_file_path_touch = NULL; + /* Wait on file before exiting */ + char *before_exit_file_path = NULL; + + while ((option = getopt_long(argc, argv, "i:w:a:b:c:d:", + long_options, &option_index)) != -1) { + switch (option) { + 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 'd': + before_exit_file_path = strdup(optarg); + break; + case 'e': + before_exit_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 (optind != argc) { + fprintf(stderr, "Error: takes long options only.\n"); - if (argc >= 2) { /* - * If nr_iter is negative, do an infinite tracing loop. + * Aborting the test program for now because callers typically don't check + * the test program return value, and the transition from positional + * arguments to getopt causes hangs when caller scripts are not updated. + * An abort is easier to diagnose and fix. This is a temporary solution: + * we should eventually ensure that all scripts test and report the test + * app return values. */ - nr_iter = atoi(argv[1]); - } + abort(); - if (argc >= 3) { - /* By default, don't wait unless user specifies. */ - nr_usec = atoi(argv[2]); + 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++) { if (nr_iter >= 0 && i == nr_iter - 1) { + if (before_last_event_file_path_touch) { + ret = create_file(before_last_event_file_path_touch); + if (ret != 0) { + goto end; + } + } + /* * Wait on synchronization before writing last * event. */ - wait_on_file(before_last_event_file_path); + 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, @@ -126,9 +158,44 @@ int main(int argc, char **argv) * First loop we create the file if asked to indicate * that at least one tracepoint has been hit. */ - create_file(after_first_event_file_path); - usleep(nr_usec); + 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; + } } - return 0; + if (before_exit_file_path_touch) { + ret = create_file(before_exit_file_path_touch); + if (ret != 0) { + goto end; + } + } + if (before_exit_file_path) { + ret = wait_on_file(before_exit_file_path); + if (ret != 0) { + goto end; + } + } +end: + free(after_first_event_file_path); + free(before_last_event_file_path); + free(before_last_event_file_path_touch); + free(before_exit_file_path); + free(before_exit_file_path_touch); + exit(!ret ? EXIT_SUCCESS : EXIT_FAILURE); }