X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-consumerd%2Flttng-consumerd.c;h=d0d83988c7beceb6d3196d523260b55feb0a30a9;hb=5acdb082c9b7d75df2e4bfa18f4e9dd3f119ee39;hp=ceb1da453a915edcde988f6781aa8c41d3234de8;hpb=8f7a281b62b77af66d5f24a3aade40bcd021d3ec;p=lttng-tools.git diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c index ceb1da453..d0d83988c 100644 --- a/src/bin/lttng-consumerd/lttng-consumerd.c +++ b/src/bin/lttng-consumerd/lttng-consumerd.c @@ -53,8 +53,6 @@ #include "lttng-consumerd.h" #include "health-consumerd.h" -/* TODO : support UST (all direct kernel-ctl accesses). */ - /* threads (channel handling, poll, metadata, sessiond) */ static pthread_t channel_thread, data_thread, metadata_thread, @@ -124,7 +122,7 @@ static int set_signal_handler(void) sigset_t sigset; if ((ret = sigemptyset(&sigset)) < 0) { - perror("sigemptyset"); + PERROR("sigemptyset"); return ret; } @@ -132,17 +130,17 @@ static int set_signal_handler(void) sa.sa_mask = sigset; sa.sa_flags = 0; if ((ret = sigaction(SIGTERM, &sa, NULL)) < 0) { - perror("sigaction"); + PERROR("sigaction"); return ret; } if ((ret = sigaction(SIGINT, &sa, NULL)) < 0) { - perror("sigaction"); + PERROR("sigaction"); return ret; } if ((ret = sigaction(SIGPIPE, &sa, NULL)) < 0) { - perror("sigaction"); + PERROR("sigaction"); return ret; } @@ -208,14 +206,16 @@ static int parse_args(int argc, char **argv) while (1) { int option_index = 0; - c = getopt_long(argc, argv, "dhqvVku" "c:e:g:", long_options, &option_index); + c = getopt_long(argc, argv, "dhqvVku" "c:e:g:", + long_options, &option_index); if (c == -1) { break; } switch (c) { case 0: - fprintf(stderr, "option %s", long_options[option_index].name); + fprintf(stderr, "option %s", + long_options[option_index].name); if (optarg) { fprintf(stderr, " with arg %s\n", optarg); ret = -1;