*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <fcntl.h>
#include <getopt.h>
#include <grp.h>
#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,
/* Argument variables */
int lttng_opt_quiet; /* not static in error.h */
int lttng_opt_verbose; /* not static in error.h */
+int lttng_opt_mi; /* not static in error.h */
+
static int opt_daemon;
static const char *progname;
static char command_sock_path[PATH_MAX]; /* Global command socket path */
const char *tracing_group_name = DEFAULT_TRACING_GROUP;
+int lttng_consumer_ready = NR_LTTNG_CONSUMER_READY;
+
enum lttng_consumer_type lttng_consumer_get_type(void)
{
if (!ctx) {
/*
* 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' },
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;
}
/*
}
/* Init */
- lttng_consumer_init();
+ if (lttng_consumer_init() < 0) {
+ goto error;
+ }
+
+ /* Init socket timeouts */
+ lttcomm_init();
+ lttcomm_inet_init();
if (!getuid()) {
/* Set limit for open files */
ctx->type = opt_type;
- /* Initialize communication library */
- lttcomm_init();
-
ret = utils_create_pipe(health_quit_pipe);
if (ret < 0) {
goto error_health_pipe;
goto health_error;
}
+ /*
+ * Wait for health thread to be initialized before letting the
+ * sessiond thread reply to the sessiond that we are ready.
+ */
+ while (uatomic_read(<tng_consumer_ready)) {
+ usleep(100000);
+ }
+ cmm_smp_mb(); /* Read ready before following operations */
+
/* Create thread to manage channels */
ret = pthread_create(&channel_thread, NULL, consumer_thread_channel_poll,
(void *) ctx);
error_health_pipe:
if (!ret) {
ret = EXIT_SUCCESS;
- lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_EXIT_SUCCESS);
goto end;
}
error:
ret = EXIT_FAILURE;
- if (ctx) {
- lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_EXIT_FAILURE);
- }
end:
lttng_consumer_destroy(ctx);