#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,
sigset_t sigset;
if ((ret = sigemptyset(&sigset)) < 0) {
- perror("sigemptyset");
+ PERROR("sigemptyset");
return ret;
}
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;
}
/*
* daemon argument parsing
*/
-static void parse_args(int argc, char **argv)
+static int parse_args(int argc, char **argv)
{
- int c;
+ int c, ret = 0;
static struct option long_options[] = {
{ "consumerd-cmd-sock", 1, 0, 'c' },
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;
+ goto end;
}
break;
case 'c':
#endif
default:
usage(stderr);
- exit(EXIT_FAILURE);
+ ret = -1;
+ goto end;
}
}
+end:
+ return ret;
}
/*