X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils%2Ftestapp%2Fgen-ust-nevents%2Fgen-ust-nevents.cpp;h=ec71023de4d872632d59aef98d1f14037bc854bc;hb=HEAD;hp=a2aae040f9b01cefb419332afdc0175f10c1546d;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f;p=lttng-tools.git diff --git a/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.cpp b/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.cpp index a2aae040f..b7c3974ee 100644 --- a/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.cpp +++ b/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.cpp @@ -6,6 +6,9 @@ */ #define _LGPL_SOURCE +#include "signal-helper.hpp" +#include "utils.h" + #include #include #include @@ -16,20 +19,17 @@ #include #include #include -#include "utils.h" -#include "signal-helper.hpp" #define TRACEPOINT_DEFINE #include "tp.h" -static struct option long_options[] = -{ +static struct option long_options[] = { /* These options set a flag. */ - {"iter", required_argument, 0, 'i'}, - {"wait", required_argument, 0, 'w'}, - {"create-in-main", required_argument, 0, 'm'}, - {"wait-before-first-event", required_argument, 0, 'b'}, - {0, 0, 0, 0} + { "iter", required_argument, nullptr, 'i' }, + { "wait", required_argument, nullptr, 'w' }, + { "create-in-main", required_argument, nullptr, 'm' }, + { "wait-before-first-event", required_argument, nullptr, 'b' }, + { nullptr, 0, nullptr, 0 } }; int main(int argc, char **argv) @@ -41,11 +41,10 @@ int main(int argc, char **argv) float flt = 2222.0; unsigned int nr_iter = 100; useconds_t nr_usec = 0; - char *wait_before_first_event_file_path = NULL; - char *create_in_main_file_path = NULL; + char *wait_before_first_event_file_path = nullptr; + char *create_in_main_file_path = nullptr; - while ((option = getopt_long(argc, argv, "i:w:b:m:", - long_options, &option_index)) != -1) { + while ((option = getopt_long(argc, argv, "i:w:b:m:", long_options, &option_index)) != -1) { switch (option) { case 'b': wait_before_first_event_file_path = strdup(optarg); @@ -92,18 +91,13 @@ int main(int argc, char **argv) for (i = 0; i < nr_iter; i++) { netint = htonl(i); - tracepoint(tp, tptest1, i, netint, values, text, strlen(text), - dbl, flt); - tracepoint(tp, tptest2, i, netint, values, text, strlen(text), - dbl, flt); - tracepoint(tp, tptest3, i, netint, values, text, strlen(text), - dbl, flt); - tracepoint(tp, tptest4, i, netint, values, text, strlen(text), - dbl, flt); - tracepoint(tp, tptest5, i, netint, values, text, strlen(text), - dbl, flt); + tracepoint(tp, tptest1, i, netint, values, text, strlen(text), dbl, flt); + tracepoint(tp, tptest2, i, netint, values, text, strlen(text), dbl, flt); + tracepoint(tp, tptest3, i, netint, values, text, strlen(text), dbl, flt); + tracepoint(tp, tptest4, i, netint, values, text, strlen(text), dbl, flt); + tracepoint(tp, tptest5, i, netint, values, text, strlen(text), dbl, flt); if (nr_usec) { - if (usleep_safe(nr_usec)) { + if (usleep_safe(nr_usec)) { ret = -1; goto end; }