X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=fa5a7db86c393640c15fe9e8b3bf5f652da98111;hp=0005714c55abf9bdd9a3347bcb96f99304b2ccca;hb=6e7241fe92e7b5db872d164c3e1a0f75ce5a1463;hpb=6cd525e813795a1d5e38feac8dedf2c73ffb1274 diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c index 0005714c5..fa5a7db86 100644 --- a/src/bin/lttng-relayd/main.c +++ b/src/bin/lttng-relayd/main.c @@ -1,6 +1,7 @@ /* * Copyright (C) 2012 - Julien Desfossez * David Goulet + * 2013 - Jérémie Galarneau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License, version 2 only, @@ -43,13 +44,16 @@ #include #include #include +#include #include +#include #include #include #include #include #include #include +#include #include "cmd.h" #include "ctf-trace.h" @@ -58,10 +62,25 @@ #include "lttng-relayd.h" #include "live.h" #include "health-relayd.h" +#include "testpoint.h" +#include "viewer-stream.h" +#include "session.h" +#include "stream.h" +#include "connection.h" /* command line options */ char *opt_output_path; -static int opt_daemon; +static int opt_daemon, opt_background; + +/* + * We need to wait for listener and live listener threads, as well as + * health check thread, before being ready to signal readiness. + */ +#define NR_LTTNG_RELAY_READY 3 +static int lttng_relay_ready = NR_LTTNG_RELAY_READY; +static int recv_child_signal; /* Set to 1 when a SIGUSR1 signal is received. */ +static pid_t child_ppid; /* Internal parent PID use with daemonize. */ + static struct lttng_uri *control_uri; static struct lttng_uri *data_uri; static struct lttng_uri *live_uri; @@ -69,18 +88,21 @@ static struct lttng_uri *live_uri; const char *progname; const char *tracing_group_name = DEFAULT_TRACING_GROUP; +static int tracing_group_name_override; + +const char * const config_section_name = "relayd"; /* * Quit pipe for all threads. This permits a single cancellation point * for all threads when receiving an event on the pipe. */ -static int thread_quit_pipe[2] = { -1, -1 }; +int thread_quit_pipe[2] = { -1, -1 }; /* * This pipe is used to inform the worker thread that a command is queued and * ready to be processed. */ -static int relay_cmd_pipe[2] = { -1, -1 }; +static int relay_conn_pipe[2] = { -1, -1 }; /* Shared between threads */ static int dispatch_thread_exit; @@ -91,7 +113,6 @@ static pthread_t worker_thread; static pthread_t health_thread; static uint64_t last_relay_stream_id; -static uint64_t last_relay_session_id; /* * Relay command queue. @@ -99,7 +120,7 @@ static uint64_t last_relay_session_id; * The relay_thread_listener and relay_thread_dispatcher communicate with this * queue. */ -static struct relay_cmd_queue relay_cmd_queue; +static struct relay_conn_queue relay_conn_queue; /* buffer allocated at startup, used to store the trace data */ static char *data_buffer; @@ -121,6 +142,22 @@ struct lttng_ht *indexes_ht; /* Relayd health monitoring */ struct health_app *health_relayd; +static struct option long_options[] = { + { "control-port", 1, 0, 'C', }, + { "data-port", 1, 0, 'D', }, + { "live-port", 1, 0, 'L', }, + { "daemonize", 0, 0, 'd', }, + { "background", 0, 0, 'b', }, + { "group", 1, 0, 'g', }, + { "help", 0, 0, 'h', }, + { "output", 1, 0, 'o', }, + { "verbose", 0, 0, 'v', }, + { "config", 1, 0, 'f' }, + { NULL, 0, 0, 0, }, +}; + +static const char *config_ignore_options[] = { "help", "config" }; + /* * usage function on stderr */ @@ -130,98 +167,228 @@ void usage(void) fprintf(stderr, "Usage: %s OPTIONS\n\nOptions:\n", progname); fprintf(stderr, " -h, --help Display this usage.\n"); fprintf(stderr, " -d, --daemonize Start as a daemon.\n"); + fprintf(stderr, " -b, --background Start as a daemon, keeping console open.\n"); fprintf(stderr, " -C, --control-port URL Control port listening.\n"); fprintf(stderr, " -D, --data-port URL Data port listening.\n"); + fprintf(stderr, " -L, --live-port URL Live view port listening.\n"); fprintf(stderr, " -o, --output PATH Output path for traces. Must use an absolute path.\n"); fprintf(stderr, " -v, --verbose Verbose mode. Activate DBG() macro.\n"); fprintf(stderr, " -g, --group NAME Specify the tracing group name. (default: tracing)\n"); + fprintf(stderr, " -f --config Load daemon configuration file\n"); } +/* + * Take an option from the getopt output and set it in the right variable to be + * used later. + * + * Return 0 on success else a negative value. + */ static -int parse_args(int argc, char **argv) +int set_option(int opt, const char *arg, const char *optname) { - int c; - int ret = 0; - char *default_address; - - static struct option long_options[] = { - { "control-port", 1, 0, 'C', }, - { "data-port", 1, 0, 'D', }, - { "daemonize", 0, 0, 'd', }, - { "group", 1, 0, 'g', }, - { "help", 0, 0, 'h', }, - { "output", 1, 0, 'o', }, - { "verbose", 0, 0, 'v', }, - { NULL, 0, 0, 0, }, - }; + int ret; + + switch (opt) { + case 0: + fprintf(stderr, "option %s", optname); + if (arg) { + fprintf(stderr, " with arg %s\n", arg); + } + break; + case 'C': + ret = uri_parse(arg, &control_uri); + if (ret < 0) { + ERR("Invalid control URI specified"); + goto end; + } + if (control_uri->port == 0) { + control_uri->port = DEFAULT_NETWORK_CONTROL_PORT; + } + break; + case 'D': + ret = uri_parse(arg, &data_uri); + if (ret < 0) { + ERR("Invalid data URI specified"); + goto end; + } + if (data_uri->port == 0) { + data_uri->port = DEFAULT_NETWORK_DATA_PORT; + } + break; + case 'L': + ret = uri_parse(arg, &live_uri); + if (ret < 0) { + ERR("Invalid live URI specified"); + goto end; + } + if (live_uri->port == 0) { + live_uri->port = DEFAULT_NETWORK_VIEWER_PORT; + } + break; + case 'd': + opt_daemon = 1; + break; + case 'b': + opt_background = 1; + break; + case 'g': + tracing_group_name = strdup(arg); + tracing_group_name_override = 1; + break; + case 'h': + usage(); + exit(EXIT_FAILURE); + case 'o': + ret = asprintf(&opt_output_path, "%s", arg); + if (ret < 0) { + ret = -errno; + PERROR("asprintf opt_output_path"); + goto end; + } + break; + case 'v': + /* Verbose level can increase using multiple -v */ + if (arg) { + lttng_opt_verbose = config_parse_value(arg); + } else { + /* Only 3 level of verbosity (-vvv). */ + if (lttng_opt_verbose < 3) { + lttng_opt_verbose += 1; + } + } + break; + default: + /* Unknown option or other error. + * Error is printed by getopt, just return */ + ret = -1; + goto end; + } + + /* All good. */ + ret = 0; + +end: + return ret; +} + +/* + * config_entry_handler_cb used to handle options read from a config file. + * See config_entry_handler_cb comment in common/config/config.h for the + * return value conventions. + */ +static +int config_entry_handler(const struct config_entry *entry, void *unused) +{ + int ret = 0, i; + + if (!entry || !entry->name || !entry->value) { + ret = -EINVAL; + goto end; + } + + /* Check if the option is to be ignored */ + for (i = 0; i < sizeof(config_ignore_options) / sizeof(char *); i++) { + if (!strcmp(entry->name, config_ignore_options[i])) { + goto end; + } + } + + for (i = 0; i < (sizeof(long_options) / sizeof(struct option)) - 1; i++) { + /* Ignore if entry name is not fully matched. */ + if (strcmp(entry->name, long_options[i].name)) { + continue; + } + + /* + * If the option takes no argument on the command line, we have to + * check if the value is "true". We support non-zero numeric values, + * true, on and yes. + */ + if (!long_options[i].has_arg) { + ret = config_parse_value(entry->value); + if (ret <= 0) { + if (ret) { + WARN("Invalid configuration value \"%s\" for option %s", + entry->value, entry->name); + } + /* False, skip boolean config option. */ + goto end; + } + } + + ret = set_option(long_options[i].val, entry->value, entry->name); + goto end; + } + + WARN("Unrecognized option \"%s\" in daemon configuration file.", + entry->name); + +end: + return ret; +} + +static +int set_options(int argc, char **argv) +{ + int c, ret = 0, option_index = 0; + int orig_optopt = optopt, orig_optind = optind; + char *default_address, *optstring; + const char *config_path = NULL; + + optstring = utils_generate_optstring(long_options, + sizeof(long_options) / sizeof(struct option)); + if (!optstring) { + ret = -ENOMEM; + goto exit; + } + + /* Check for the --config option */ + + while ((c = getopt_long(argc, argv, optstring, long_options, + &option_index)) != -1) { + if (c == '?') { + ret = -EINVAL; + goto exit; + } else if (c != 'f') { + continue; + } + + config_path = utils_expand_path(optarg); + if (!config_path) { + ERR("Failed to resolve path: %s", optarg); + } + } + ret = config_get_section_entries(config_path, config_section_name, + config_entry_handler, NULL); + if (ret) { + if (ret > 0) { + ERR("Invalid configuration option at line %i", ret); + ret = -1; + } + goto exit; + } + + /* Reset getopt's global state */ + optopt = orig_optopt; + optind = orig_optind; while (1) { - int option_index = 0; - c = getopt_long(argc, argv, "dhv" "C:D:o:g:", - long_options, &option_index); + c = getopt_long(argc, argv, optstring, long_options, &option_index); if (c == -1) { break; } - switch (c) { - case 0: - fprintf(stderr, "option %s", long_options[option_index].name); - if (optarg) { - fprintf(stderr, " with arg %s\n", optarg); - } - break; - case 'C': - ret = uri_parse(optarg, &control_uri); - if (ret < 0) { - ERR("Invalid control URI specified"); - goto exit; - } - if (control_uri->port == 0) { - control_uri->port = DEFAULT_NETWORK_CONTROL_PORT; - } - break; - case 'D': - ret = uri_parse(optarg, &data_uri); - if (ret < 0) { - ERR("Invalid data URI specified"); - goto exit; - } - if (data_uri->port == 0) { - data_uri->port = DEFAULT_NETWORK_DATA_PORT; - } - break; - case 'd': - opt_daemon = 1; - break; - case 'g': - tracing_group_name = optarg; - break; - case 'h': - usage(); - exit(EXIT_FAILURE); - case 'o': - ret = asprintf(&opt_output_path, "%s", optarg); - if (ret < 0) { - PERROR("asprintf opt_output_path"); - goto exit; - } - break; - case 'v': - /* Verbose level can increase using multiple -v */ - lttng_opt_verbose += 1; - break; - default: - /* Unknown option or other error. - * Error is printed by getopt, just return */ - ret = -1; + ret = set_option(c, optarg, long_options[option_index].name); + if (ret < 0) { goto exit; } } /* assign default values */ if (control_uri == NULL) { - ret = asprintf(&default_address, "tcp://0.0.0.0:%d", - DEFAULT_NETWORK_CONTROL_PORT); + ret = asprintf(&default_address, + "tcp://" DEFAULT_NETWORK_CONTROL_BIND_ADDRESS ":%d", + DEFAULT_NETWORK_CONTROL_PORT); if (ret < 0) { PERROR("asprintf default data address"); goto exit; @@ -235,8 +402,9 @@ int parse_args(int argc, char **argv) } } if (data_uri == NULL) { - ret = asprintf(&default_address, "tcp://0.0.0.0:%d", - DEFAULT_NETWORK_DATA_PORT); + ret = asprintf(&default_address, + "tcp://" DEFAULT_NETWORK_DATA_BIND_ADDRESS ":%d", + DEFAULT_NETWORK_DATA_PORT); if (ret < 0) { PERROR("asprintf default data address"); goto exit; @@ -250,8 +418,9 @@ int parse_args(int argc, char **argv) } } if (live_uri == NULL) { - ret = asprintf(&default_address, "tcp://0.0.0.0:%d", - DEFAULT_NETWORK_VIEWER_PORT); + ret = asprintf(&default_address, + "tcp://" DEFAULT_NETWORK_VIEWER_BIND_ADDRESS ":%d", + DEFAULT_NETWORK_VIEWER_PORT); if (ret < 0) { PERROR("asprintf default viewer control address"); goto exit; @@ -266,6 +435,7 @@ int parse_args(int argc, char **argv) } exit: + free(optstring); return ret; } @@ -285,6 +455,11 @@ void cleanup(void) uri_free(control_uri); uri_free(data_uri); + /* Live URI is freed in the live thread. */ + + if (tracing_group_name_override) { + free((void *) tracing_group_name); + } } /* @@ -332,7 +507,7 @@ void stop_threads(void) /* Dispatch thread */ CMM_STORE_SHARED(dispatch_thread_exit, 1); - futex_nto1_wake(&relay_cmd_queue.futex); + futex_nto1_wake(&relay_conn_queue.futex); } /* @@ -356,6 +531,9 @@ void sighandler(int sig) DBG("SIGTERM caught"); stop_threads(); break; + case SIGUSR1: + CMM_STORE_SHARED(recv_child_signal, 1); + break; default: break; } @@ -395,11 +573,26 @@ int set_signal_handler(void) return ret; } - DBG("Signal handler set for SIGTERM, SIGPIPE and SIGINT"); + if ((ret = sigaction(SIGUSR1, &sa, NULL)) < 0) { + PERROR("sigaction"); + return ret; + } + + DBG("Signal handler set for SIGTERM, SIGUSR1, SIGPIPE and SIGINT"); return ret; } +void lttng_relay_notify_ready(void) +{ + /* Notify the parent of the fork() process that we are ready. */ + if (opt_daemon || opt_background) { + if (uatomic_sub_return(<tng_relay_ready, 1) == 0) { + kill(child_ppid, SIGUSR1); + } + } +} + /* * Init thread quit pipe. * @@ -434,7 +627,7 @@ int create_thread_poll_set(struct lttng_poll_event *events, int size) } /* Add quit pipe */ - ret = lttng_poll_add(events, thread_quit_pipe[0], LPOLLIN); + ret = lttng_poll_add(events, thread_quit_pipe[0], LPOLLIN | LPOLLERR); if (ret < 0) { goto error; } @@ -507,7 +700,6 @@ error: static int close_stream_check(struct relay_stream *stream) { - if (stream->close_flag && stream->prev_seq == stream->last_net_seq_num) { /* * We are about to close the stream so set the data pending flag to 1 @@ -521,6 +713,40 @@ int close_stream_check(struct relay_stream *stream) return 0; } +static void try_close_stream(struct relay_session *session, + struct relay_stream *stream) +{ + int ret; + struct ctf_trace *ctf_trace; + + assert(session); + assert(stream); + + if (!close_stream_check(stream)) { + /* Can't close it, not ready for that. */ + goto end; + } + + ctf_trace = ctf_trace_find_by_path(session->ctf_traces_ht, + stream->path_name); + assert(ctf_trace); + + pthread_mutex_lock(&session->viewer_ready_lock); + ctf_trace->invalid_flag = 1; + pthread_mutex_unlock(&session->viewer_ready_lock); + + ret = stream_close(session, stream); + if (ret || session->snapshot) { + /* Already close thus the ctf trace is being or has been destroyed. */ + goto end; + } + + ctf_trace_try_destroy(session, ctf_trace); + +end: + return; +} + /* * This thread manages the listening for new connections on the network */ @@ -528,7 +754,6 @@ static void *relay_thread_listener(void *data) { int i, ret, pollfd, err = -1; - int val = 1; uint32_t revents, nb_fd; struct lttng_poll_event events; struct lttcomm_sock *control_sock, *data_sock; @@ -569,6 +794,12 @@ void *relay_thread_listener(void *data) goto error_poll_add; } + lttng_relay_notify_ready(); + + if (testpoint(relayd_thread_listener)) { + goto error_testpoint; + } + while (1) { health_code_update(); @@ -610,58 +841,55 @@ restart: goto error; } else if (revents & LPOLLIN) { /* - * Get allocated in this thread, - * enqueued to a global queue, dequeued - * and freed in the worker thread. + * Get allocated in this thread, enqueued to a global queue, + * dequeued and freed in the worker thread. */ - struct relay_command *relay_cmd; + int val = 1; + struct relay_connection *new_conn; struct lttcomm_sock *newsock; - relay_cmd = zmalloc(sizeof(struct relay_command)); - if (relay_cmd == NULL) { - PERROR("relay command zmalloc"); + new_conn = connection_create(); + if (!new_conn) { goto error; } if (pollfd == data_sock->fd) { + new_conn->type = RELAY_DATA; newsock = data_sock->ops->accept(data_sock); - if (!newsock) { - PERROR("accepting data sock"); - free(relay_cmd); - goto error; - } - relay_cmd->type = RELAY_DATA; - DBG("Relay data connection accepted, socket %d", newsock->fd); + DBG("Relay data connection accepted, socket %d", + newsock->fd); } else { assert(pollfd == control_sock->fd); + new_conn->type = RELAY_CONTROL; newsock = control_sock->ops->accept(control_sock); - if (!newsock) { - PERROR("accepting control sock"); - free(relay_cmd); - goto error; - } - relay_cmd->type = RELAY_CONTROL; - DBG("Relay control connection accepted, socket %d", newsock->fd); + DBG("Relay control connection accepted, socket %d", + newsock->fd); + } + if (!newsock) { + PERROR("accepting sock"); + connection_free(new_conn); + goto error; } - ret = setsockopt(newsock->fd, SOL_SOCKET, SO_REUSEADDR, - &val, sizeof(int)); + + ret = setsockopt(newsock->fd, SOL_SOCKET, SO_REUSEADDR, &val, + sizeof(val)); if (ret < 0) { PERROR("setsockopt inet"); lttcomm_destroy_sock(newsock); - free(relay_cmd); + connection_free(new_conn); goto error; } - relay_cmd->sock = newsock; - /* - * Lock free enqueue the request. - */ - cds_wfq_enqueue(&relay_cmd_queue.queue, &relay_cmd->node); + new_conn->sock = newsock; + + /* Enqueue request for the dispatcher thread. */ + cds_wfcq_enqueue(&relay_conn_queue.head, &relay_conn_queue.tail, + &new_conn->qnode); /* - * Wake the dispatch queue futex. Implicit memory - * barrier with the exchange in cds_wfq_enqueue. + * Wake the dispatch queue futex. Implicit memory barrier with + * the exchange in cds_wfcq_enqueue. */ - futex_nto1_wake(&relay_cmd_queue.futex); + futex_nto1_wake(&relay_conn_queue.futex); } } } @@ -669,6 +897,7 @@ restart: exit: error: error_poll_add: +error_testpoint: lttng_poll_clean(&events); error_create_poll: if (data_sock->fd >= 0) { @@ -705,52 +934,56 @@ void *relay_thread_dispatcher(void *data) { int err = -1; ssize_t ret; - struct cds_wfq_node *node; - struct relay_command *relay_cmd = NULL; + struct cds_wfcq_node *node; + struct relay_connection *new_conn = NULL; DBG("[thread] Relay dispatcher started"); health_register(health_relayd, HEALTH_RELAYD_TYPE_DISPATCHER); + if (testpoint(relayd_thread_dispatcher)) { + goto error_testpoint; + } + health_code_update(); while (!CMM_LOAD_SHARED(dispatch_thread_exit)) { health_code_update(); /* Atomically prepare the queue futex */ - futex_nto1_prepare(&relay_cmd_queue.futex); + futex_nto1_prepare(&relay_conn_queue.futex); do { health_code_update(); /* Dequeue commands */ - node = cds_wfq_dequeue_blocking(&relay_cmd_queue.queue); + node = cds_wfcq_dequeue_blocking(&relay_conn_queue.head, + &relay_conn_queue.tail); if (node == NULL) { DBG("Woken up but nothing in the relay command queue"); /* Continue thread execution */ break; } + new_conn = caa_container_of(node, struct relay_connection, qnode); - relay_cmd = caa_container_of(node, struct relay_command, node); - DBG("Dispatching request waiting on sock %d", relay_cmd->sock->fd); + DBG("Dispatching request waiting on sock %d", new_conn->sock->fd); /* - * Inform worker thread of the new request. This - * call is blocking so we can be assured that the data will be read - * at some point in time or wait to the end of the world :) + * Inform worker thread of the new request. This call is blocking + * so we can be assured that the data will be read at some point in + * time or wait to the end of the world :) */ - ret = lttng_write(relay_cmd_pipe[1], relay_cmd, - sizeof(struct relay_command)); - free(relay_cmd); - if (ret < sizeof(struct relay_command)) { - PERROR("write cmd pipe"); + ret = lttng_write(relay_conn_pipe[1], &new_conn, sizeof(new_conn)); + if (ret < 0) { + PERROR("write connection pipe"); + connection_destroy(new_conn); goto error; } } while (node != NULL); /* Futex wait on queue. Blocking call on futex() */ health_poll_entry(); - futex_nto1_wait(&relay_cmd_queue.futex); + futex_nto1_wait(&relay_conn_queue.futex); health_poll_exit(); } @@ -758,6 +991,7 @@ void *relay_thread_dispatcher(void *data) err = 0; error: +error_testpoint: if (err) { health_error(); ERR("Health error occurred in %s", __func__); @@ -768,142 +1002,50 @@ error: return NULL; } -/* - * Get stream from stream id. - * Need to be called with RCU read-side lock held. - */ -struct relay_stream *relay_stream_find_by_id(uint64_t stream_id) -{ - struct lttng_ht_node_ulong *node; - struct lttng_ht_iter iter; - struct relay_stream *ret; - - lttng_ht_lookup(relay_streams_ht, - (void *)((unsigned long) stream_id), - &iter); - node = lttng_ht_iter_get_node_ulong(&iter); - if (node == NULL) { - DBG("Relay stream %" PRIu64 " not found", stream_id); - ret = NULL; - goto end; - } - - ret = caa_container_of(node, struct relay_stream, stream_n); - -end: - return ret; -} - -static -void deferred_free_stream(struct rcu_head *head) -{ - struct relay_stream *stream = - caa_container_of(head, struct relay_stream, rcu_node); - - ctf_trace_try_destroy(stream->ctf_trace); - - free(stream->path_name); - free(stream->channel_name); - free(stream); -} - -static -void deferred_free_session(struct rcu_head *head) -{ - struct relay_session *session = - caa_container_of(head, struct relay_session, rcu_node); - free(session); -} - -/* - * Close a given stream. The stream is freed using a call RCU. - * - * RCU read side lock MUST be acquired. If NO close_stream_check() was called - * BEFORE the stream lock MUST be acquired. - */ -static void destroy_stream(struct relay_stream *stream) +static void try_close_streams(struct relay_session *session) { - int delret; - struct relay_viewer_stream *vstream; + struct ctf_trace *ctf_trace; struct lttng_ht_iter iter; - assert(stream); + assert(session); - delret = close(stream->fd); - if (delret < 0) { - PERROR("close stream"); - } + pthread_mutex_lock(&session->viewer_ready_lock); + rcu_read_lock(); + cds_lfht_for_each_entry(session->ctf_traces_ht->ht, &iter.iter, ctf_trace, + node.node) { + struct relay_stream *stream; - if (stream->index_fd >= 0) { - delret = close(stream->index_fd); - if (delret < 0) { - PERROR("close stream index_fd"); + /* Close streams. */ + cds_list_for_each_entry(stream, &ctf_trace->stream_list, trace_list) { + stream_close(session, stream); } - } - vstream = live_find_viewer_stream_by_id(stream->stream_handle); - if (vstream) { - /* - * Set the last good value into the viewer stream. This is done - * right before the stream gets deleted from the hash table. The - * lookup failure on the live thread side of a stream indicates - * that the viewer stream index received value should be used. - */ - vstream->total_index_received = stream->total_index_received; + ctf_trace->invalid_flag = 1; + ctf_trace_try_destroy(session, ctf_trace); } - - /* Cleanup index of that stream. */ - relay_index_destroy_by_stream_id(stream->stream_handle); - - iter.iter.node = &stream->stream_n.node; - delret = lttng_ht_del(relay_streams_ht, &iter); - assert(!delret); - iter.iter.node = &stream->ctf_trace_node.node; - delret = lttng_ht_del(stream->ctf_traces_ht, &iter); - assert(!delret); - call_rcu(&stream->rcu_node, deferred_free_stream); - DBG("Closed tracefile %d from close stream", stream->fd); + rcu_read_unlock(); + pthread_mutex_unlock(&session->viewer_ready_lock); } /* - * relay_delete_session: Free all memory associated with a session and - * close all the FDs + * Try to destroy a session within a connection. */ -static -void relay_delete_session(struct relay_command *cmd, +static void destroy_session(struct relay_session *session, struct lttng_ht *sessions_ht) { - struct lttng_ht_iter iter; - struct lttng_ht_node_ulong *node; - struct relay_stream *stream; - int ret; - - if (!cmd->session) { - return; - } + assert(session); + assert(sessions_ht); - DBG("Relay deleting session %" PRIu64, cmd->session->id); + /* Indicate that this session can be destroyed from now on. */ + session->close_flag = 1; - rcu_read_lock(); - cds_lfht_for_each_entry(relay_streams_ht->ht, &iter.iter, node, node) { - node = lttng_ht_iter_get_node_ulong(&iter); - if (!node) { - continue; - } - stream = caa_container_of(node, struct relay_stream, stream_n); - if (stream->session == cmd->session) { - destroy_stream(stream); - cmd->session->stream_count--; - assert(cmd->session->stream_count >= 0); - } - } + try_close_streams(session); - /* Make this session not visible anymore. */ - iter.iter.node = &cmd->session->session_n.node; - ret = lttng_ht_del(sessions_ht, &iter); - assert(!ret); - call_rcu(&cmd->session->rcu_node, deferred_free_session); - rcu_read_unlock(); + /* + * This will try to delete and destroy the session if no viewer is attached + * to it meaning the refcount is down to zero. + */ + session_try_destroy(sessions_ht, session); } /* @@ -935,45 +1077,40 @@ static void copy_index_control_data(struct relay_index *index, */ static int relay_create_session(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_command *cmd, - struct lttng_ht *sessions_ht) + struct relay_connection *conn) { int ret = 0, send_ret; struct relay_session *session; struct lttcomm_relayd_status_session reply; assert(recv_hdr); - assert(cmd); + assert(conn); memset(&reply, 0, sizeof(reply)); - session = zmalloc(sizeof(struct relay_session)); - if (session == NULL) { - PERROR("relay session zmalloc"); + session = session_create(); + if (!session) { ret = -1; goto error; } - - session->id = ++last_relay_session_id; - session->sock = cmd->sock; - session->minor = cmd->minor; - session->major = cmd->major; - cmd->session = session; + session->minor = conn->minor; + session->major = conn->major; + conn->session_id = session->id; + conn->session = session; reply.session_id = htobe64(session->id); - switch (cmd->minor) { - case 4: /* LTTng sessiond 2.4 */ - default: - ret = cmd_create_session_2_4(cmd, session); - break; + switch (conn->minor) { + case 1: + case 2: + case 3: + break; + case 4: /* LTTng sessiond 2.4 */ + default: + ret = cmd_create_session_2_4(conn, session); } - lttng_ht_node_init_ulong(&session->session_n, - (unsigned long) session->id); - lttng_ht_add_unique_ulong(sessions_ht, - &session->session_n); - + lttng_ht_add_unique_u64(conn->sessions_ht, &session->session_n); DBG("Created session %" PRIu64, session->id); error: @@ -983,7 +1120,7 @@ error: reply.ret_code = htobe32(LTTNG_OK); } - send_ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(reply), 0); + send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); if (send_ret < 0) { ERR("Relayd sending session id"); ret = send_ret; @@ -992,19 +1129,53 @@ error: return ret; } +/* + * When we have received all the streams and the metadata for a channel, + * we make them visible to the viewer threads. + */ +static +void set_viewer_ready_flag(struct relay_connection *conn) +{ + struct relay_stream *stream, *tmp_stream; + + pthread_mutex_lock(&conn->session->viewer_ready_lock); + cds_list_for_each_entry_safe(stream, tmp_stream, &conn->recv_head, + recv_list) { + stream->viewer_ready = 1; + cds_list_del(&stream->recv_list); + } + pthread_mutex_unlock(&conn->session->viewer_ready_lock); + return; +} + +/* + * Add a recv handle node to the connection recv list with the given stream + * handle. A new node is allocated thus must be freed when the node is deleted + * from the list. + */ +static void queue_stream(struct relay_stream *stream, + struct relay_connection *conn) +{ + assert(conn); + assert(stream); + + cds_list_add(&stream->recv_list, &conn->recv_head); +} + /* * relay_add_stream: allocate a new stream for a session */ static int relay_add_stream(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_command *cmd, struct lttng_ht *sessions_ht) + struct relay_connection *conn) { - struct relay_session *session = cmd->session; + int ret, send_ret; + struct relay_session *session = conn->session; struct relay_stream *stream = NULL; struct lttcomm_relayd_status_stream reply; - int ret, send_ret; + struct ctf_trace *trace; - if (!session || cmd->version_check_done == 0) { + if (!session || conn->version_check_done == 0) { ERR("Trying to add a stream before version check"); ret = -1; goto end_no_session; @@ -1017,13 +1188,13 @@ int relay_add_stream(struct lttcomm_relayd_hdr *recv_hdr, goto end_no_session; } - switch (cmd->minor) { + switch (conn->minor) { case 1: /* LTTng sessiond 2.1 */ - ret = cmd_recv_stream_2_1(cmd, stream); + ret = cmd_recv_stream_2_1(conn, stream); break; case 2: /* LTTng sessiond 2.2 */ default: - ret = cmd_recv_stream_2_2(cmd, stream); + ret = cmd_recv_stream_2_2(conn, stream); break; } if (ret < 0) { @@ -1033,10 +1204,11 @@ int relay_add_stream(struct lttcomm_relayd_hdr *recv_hdr, rcu_read_lock(); stream->stream_handle = ++last_relay_stream_id; stream->prev_seq = -1ULL; - stream->session = session; + stream->session_id = session->id; stream->index_fd = -1; stream->read_index_fd = -1; - stream->ctf_trace = NULL; + stream->ctf_stream_id = -1ULL; + lttng_ht_node_init_u64(&stream->node, stream->stream_handle); pthread_mutex_init(&stream->lock, NULL); ret = utils_mkdir_recursive(stream->path_name, S_IRWXU | S_IRWXG); @@ -1062,41 +1234,44 @@ int relay_add_stream(struct lttcomm_relayd_hdr *recv_hdr, DBG("Tracefile %s/%s created", stream->path_name, stream->channel_name); } - if (!strncmp(stream->channel_name, DEFAULT_METADATA_NAME, NAME_MAX)) { - stream->metadata_flag = 1; - /* - * When we receive a new metadata stream, we create a new - * ctf_trace and we assign this ctf_trace to all streams with - * the same path. - * - * If later on we receive a new stream for the same ctf_trace, - * we copy the information from the first hit in the HT to the - * new stream. - */ - stream->ctf_trace = ctf_trace_create(); - if (!stream->ctf_trace) { + trace = ctf_trace_find_by_path(session->ctf_traces_ht, stream->path_name); + if (!trace) { + trace = ctf_trace_create(stream->path_name); + if (!trace) { ret = -1; goto end; } - stream->ctf_trace->refcount++; - stream->ctf_trace->metadata_stream = stream; + ctf_trace_add(session->ctf_traces_ht, trace); + } + ctf_trace_get_ref(trace); + + if (!strncmp(stream->channel_name, DEFAULT_METADATA_NAME, NAME_MAX)) { + stream->metadata_flag = 1; + /* Assign quick reference to the metadata stream in the trace. */ + trace->metadata_stream = stream; } - ctf_trace_assign(cmd->ctf_traces_ht, stream); - stream->ctf_traces_ht = cmd->ctf_traces_ht; - lttng_ht_node_init_ulong(&stream->stream_n, - (unsigned long) stream->stream_handle); - lttng_ht_add_unique_ulong(relay_streams_ht, - &stream->stream_n); + /* + * Add the stream in the recv list of the connection. Once the end stream + * message is received, this list is emptied and streams are set with the + * viewer ready flag. + */ + queue_stream(stream, conn); + + /* + * Both in the ctf_trace object and the global stream ht since the data + * side of the relayd does not have the concept of session. + */ + lttng_ht_add_unique_u64(relay_streams_ht, &stream->node); + cds_list_add_tail(&stream->trace_list, &trace->stream_list); - lttng_ht_node_init_str(&stream->ctf_trace_node, stream->path_name); - lttng_ht_add_str(cmd->ctf_traces_ht, &stream->ctf_trace_node); session->stream_count++; DBG("Relay new stream added %s with ID %" PRIu64, stream->channel_name, stream->stream_handle); end: + memset(&reply, 0, sizeof(reply)); reply.handle = htobe64(stream->stream_handle); /* send the session id to the client or a negative return code on error */ if (ret < 0) { @@ -1107,7 +1282,7 @@ end: reply.ret_code = htobe32(LTTNG_OK); } - send_ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, + send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(struct lttcomm_relayd_status_stream), 0); if (send_ret < 0) { ERR("Relay sending stream id"); @@ -1130,28 +1305,28 @@ err_free_stream: */ static int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_command *cmd) + struct relay_connection *conn) { int ret, send_ret; - struct relay_session *session = cmd->session; + struct relay_session *session = conn->session; struct lttcomm_relayd_close_stream stream_info; struct lttcomm_relayd_generic_reply reply; struct relay_stream *stream; DBG("Close stream received"); - if (!session || cmd->version_check_done == 0) { + if (!session || conn->version_check_done == 0) { ERR("Trying to close a stream before version check"); ret = -1; goto end_no_session; } - ret = cmd->sock->ops->recvmsg(cmd->sock, &stream_info, + ret = conn->sock->ops->recvmsg(conn->sock, &stream_info, sizeof(struct lttcomm_relayd_close_stream), 0); if (ret < sizeof(struct lttcomm_relayd_close_stream)) { if (ret == 0) { /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + DBG("Socket %d did an orderly shutdown", conn->sock->fd); } else { ERR("Relay didn't receive valid add_stream struct size : %d", ret); } @@ -1160,7 +1335,8 @@ int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr, } rcu_read_lock(); - stream = relay_stream_find_by_id(be64toh(stream_info.stream_id)); + stream = stream_find_by_id(relay_streams_ht, + be64toh(stream_info.stream_id)); if (!stream) { ret = -1; goto end_unlock; @@ -1171,19 +1347,19 @@ int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr, session->stream_count--; assert(session->stream_count >= 0); - if (close_stream_check(stream)) { - destroy_stream(stream); - } + /* Check if we can close it or else the data will do it. */ + try_close_stream(session, stream); end_unlock: rcu_read_unlock(); + memset(&reply, 0, sizeof(reply)); if (ret < 0) { reply.ret_code = htobe32(LTTNG_ERR_UNK); } else { reply.ret_code = htobe32(LTTNG_OK); } - send_ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, + send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(struct lttcomm_relayd_generic_reply), 0); if (send_ret < 0) { ERR("Relay sending stream id"); @@ -1198,13 +1374,14 @@ end_no_session: * relay_unknown_command: send -1 if received unknown command */ static -void relay_unknown_command(struct relay_command *cmd) +void relay_unknown_command(struct relay_connection *conn) { struct lttcomm_relayd_generic_reply reply; int ret; + memset(&reply, 0, sizeof(reply)); reply.ret_code = htobe32(LTTNG_ERR_UNK); - ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, + ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(struct lttcomm_relayd_generic_reply), 0); if (ret < 0) { ERR("Relay sending unknown command"); @@ -1217,19 +1394,20 @@ void relay_unknown_command(struct relay_command *cmd) */ static int relay_start(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_command *cmd) + struct relay_connection *conn) { int ret = htobe32(LTTNG_OK); struct lttcomm_relayd_generic_reply reply; - struct relay_session *session = cmd->session; + struct relay_session *session = conn->session; if (!session) { DBG("Trying to start the streaming without a session established"); ret = htobe32(LTTNG_ERR_UNK); } + memset(&reply, 0, sizeof(reply)); reply.ret_code = ret; - ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, + ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(struct lttcomm_relayd_generic_reply), 0); if (ret < 0) { ERR("Relay sending start ack"); @@ -1273,14 +1451,15 @@ end: */ static int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_command *cmd) + struct relay_connection *conn) { int ret = htobe32(LTTNG_OK); ssize_t size_ret; - struct relay_session *session = cmd->session; + struct relay_session *session = conn->session; struct lttcomm_relayd_metadata_payload *metadata_struct; struct relay_stream *metadata_stream; uint64_t data_size, payload_size; + struct ctf_trace *ctf_trace; if (!session) { ERR("Metadata sent before version check"); @@ -1312,11 +1491,11 @@ int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr, } memset(data_buffer, 0, data_size); DBG2("Relay receiving metadata, waiting for %" PRIu64 " bytes", data_size); - ret = cmd->sock->ops->recvmsg(cmd->sock, data_buffer, data_size, 0); + ret = conn->sock->ops->recvmsg(conn->sock, data_buffer, data_size, 0); if (ret < 0 || ret != data_size) { if (ret == 0) { /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + DBG("Socket %d did an orderly shutdown", conn->sock->fd); } else { ERR("Relay didn't receive the whole metadata"); } @@ -1326,7 +1505,7 @@ int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr, metadata_struct = (struct lttcomm_relayd_metadata_payload *) data_buffer; rcu_read_lock(); - metadata_stream = relay_stream_find_by_id( + metadata_stream = stream_find_by_id(relay_streams_ht, be64toh(metadata_struct->stream_id)); if (!metadata_stream) { ret = -1; @@ -1346,7 +1525,11 @@ int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr, if (ret < 0) { goto end_unlock; } - metadata_stream->ctf_trace->metadata_received += + + ctf_trace = ctf_trace_find_by_path(session->ctf_traces_ht, + metadata_stream->path_name); + assert(ctf_trace); + ctf_trace->metadata_received += payload_size + be32toh(metadata_struct->padding_size); DBG2("Relay metadata written"); @@ -1362,21 +1545,21 @@ end: */ static int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_command *cmd, struct lttng_ht *sessions_ht) + struct relay_connection *conn) { int ret; struct lttcomm_relayd_version reply, msg; - assert(cmd); + assert(conn); - cmd->version_check_done = 1; + conn->version_check_done = 1; /* Get version from the other side. */ - ret = cmd->sock->ops->recvmsg(cmd->sock, &msg, sizeof(msg), 0); + ret = conn->sock->ops->recvmsg(conn->sock, &msg, sizeof(msg), 0); if (ret < 0 || ret != sizeof(msg)) { if (ret == 0) { /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + DBG("Socket %d did an orderly shutdown", conn->sock->fd); } else { ERR("Relay failed to receive the version values."); } @@ -1384,6 +1567,7 @@ int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr, goto end; } + memset(&reply, 0, sizeof(reply)); reply.major = RELAYD_VERSION_COMM_MAJOR; reply.minor = RELAYD_VERSION_COMM_MINOR; @@ -1391,29 +1575,29 @@ int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr, if (reply.major != be32toh(msg.major)) { DBG("Incompatible major versions (%u vs %u), deleting session", reply.major, be32toh(msg.major)); - relay_delete_session(cmd, sessions_ht); + destroy_session(conn->session, conn->sessions_ht); ret = 0; goto end; } - cmd->major = reply.major; + conn->major = reply.major; /* We adapt to the lowest compatible version */ if (reply.minor <= be32toh(msg.minor)) { - cmd->minor = reply.minor; + conn->minor = reply.minor; } else { - cmd->minor = be32toh(msg.minor); + conn->minor = be32toh(msg.minor); } reply.major = htobe32(reply.major); reply.minor = htobe32(reply.minor); - ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, + ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(struct lttcomm_relayd_version), 0); if (ret < 0) { ERR("Relay sending version"); } - DBG("Version check done using protocol %u.%u", cmd->major, - cmd->minor); + DBG("Version check done using protocol %u.%u", conn->major, + conn->minor); end: return ret; @@ -1424,9 +1608,9 @@ end: */ static int relay_data_pending(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_command *cmd) + struct relay_connection *conn) { - struct relay_session *session = cmd->session; + struct relay_session *session = conn->session; struct lttcomm_relayd_data_pending msg; struct lttcomm_relayd_generic_reply reply; struct relay_stream *stream; @@ -1435,17 +1619,17 @@ int relay_data_pending(struct lttcomm_relayd_hdr *recv_hdr, DBG("Data pending command received"); - if (!session || cmd->version_check_done == 0) { + if (!session || conn->version_check_done == 0) { ERR("Trying to check for data before version check"); ret = -1; goto end_no_session; } - ret = cmd->sock->ops->recvmsg(cmd->sock, &msg, sizeof(msg), 0); + ret = conn->sock->ops->recvmsg(conn->sock, &msg, sizeof(msg), 0); if (ret < sizeof(msg)) { if (ret == 0) { /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + DBG("Socket %d did an orderly shutdown", conn->sock->fd); } else { ERR("Relay didn't receive valid data_pending struct size : %d", ret); @@ -1458,7 +1642,7 @@ int relay_data_pending(struct lttcomm_relayd_hdr *recv_hdr, last_net_seq_num = be64toh(msg.last_net_seq_num); rcu_read_lock(); - stream = relay_stream_find_by_id(stream_id); + stream = stream_find_by_id(relay_streams_ht, stream_id); if (stream == NULL) { ret = -1; goto end_unlock; @@ -1483,8 +1667,9 @@ int relay_data_pending(struct lttcomm_relayd_hdr *recv_hdr, end_unlock: rcu_read_unlock(); + memset(&reply, 0, sizeof(reply)); reply.ret_code = htobe32(ret); - ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(reply), 0); + ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); if (ret < 0) { ERR("Relay data pending ret code failed"); } @@ -1502,7 +1687,7 @@ end_no_session: */ static int relay_quiescent_control(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_command *cmd) + struct relay_connection *conn) { int ret; uint64_t stream_id; @@ -1513,17 +1698,17 @@ int relay_quiescent_control(struct lttcomm_relayd_hdr *recv_hdr, DBG("Checking quiescent state on control socket"); - if (!cmd->session || cmd->version_check_done == 0) { + if (!conn->session || conn->version_check_done == 0) { ERR("Trying to check for data before version check"); ret = -1; goto end_no_session; } - ret = cmd->sock->ops->recvmsg(cmd->sock, &msg, sizeof(msg), 0); + ret = conn->sock->ops->recvmsg(conn->sock, &msg, sizeof(msg), 0); if (ret < sizeof(msg)) { if (ret == 0) { /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + DBG("Socket %d did an orderly shutdown", conn->sock->fd); } else { ERR("Relay didn't receive valid begin data_pending struct size: %d", ret); @@ -1536,7 +1721,7 @@ int relay_quiescent_control(struct lttcomm_relayd_hdr *recv_hdr, rcu_read_lock(); cds_lfht_for_each_entry(relay_streams_ht->ht, &iter.iter, stream, - stream_n.node) { + node.node) { if (stream->stream_handle == stream_id) { stream->data_pending_check_done = 1; DBG("Relay quiescent control pending flag set to %" PRIu64, @@ -1546,8 +1731,9 @@ int relay_quiescent_control(struct lttcomm_relayd_hdr *recv_hdr, } rcu_read_unlock(); + memset(&reply, 0, sizeof(reply)); reply.ret_code = htobe32(LTTNG_OK); - ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(reply), 0); + ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); if (ret < 0) { ERR("Relay data quiescent control ret code failed"); } @@ -1565,7 +1751,7 @@ end_no_session: */ static int relay_begin_data_pending(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_command *cmd) + struct relay_connection *conn) { int ret; struct lttng_ht_iter iter; @@ -1575,21 +1761,21 @@ int relay_begin_data_pending(struct lttcomm_relayd_hdr *recv_hdr, uint64_t session_id; assert(recv_hdr); - assert(cmd); + assert(conn); DBG("Init streams for data pending"); - if (!cmd->session || cmd->version_check_done == 0) { + if (!conn->session || conn->version_check_done == 0) { ERR("Trying to check for data before version check"); ret = -1; goto end_no_session; } - ret = cmd->sock->ops->recvmsg(cmd->sock, &msg, sizeof(msg), 0); + ret = conn->sock->ops->recvmsg(conn->sock, &msg, sizeof(msg), 0); if (ret < sizeof(msg)) { if (ret == 0) { /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + DBG("Socket %d did an orderly shutdown", conn->sock->fd); } else { ERR("Relay didn't receive valid begin data_pending struct size: %d", ret); @@ -1607,8 +1793,8 @@ int relay_begin_data_pending(struct lttcomm_relayd_hdr *recv_hdr, */ rcu_read_lock(); cds_lfht_for_each_entry(relay_streams_ht->ht, &iter.iter, stream, - stream_n.node) { - if (stream->session->id == session_id) { + node.node) { + if (stream->session_id == session_id) { stream->data_pending_check_done = 0; DBG("Set begin data pending flag to stream %" PRIu64, stream->stream_handle); @@ -1616,10 +1802,11 @@ int relay_begin_data_pending(struct lttcomm_relayd_hdr *recv_hdr, } rcu_read_unlock(); + memset(&reply, 0, sizeof(reply)); /* All good, send back reply. */ reply.ret_code = htobe32(LTTNG_OK); - ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(reply), 0); + ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); if (ret < 0) { ERR("Relay begin data pending send reply failed"); } @@ -1639,7 +1826,7 @@ end_no_session: */ static int relay_end_data_pending(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_command *cmd) + struct relay_connection *conn) { int ret; struct lttng_ht_iter iter; @@ -1650,21 +1837,21 @@ int relay_end_data_pending(struct lttcomm_relayd_hdr *recv_hdr, uint32_t is_data_inflight = 0; assert(recv_hdr); - assert(cmd); + assert(conn); DBG("End data pending command"); - if (!cmd->session || cmd->version_check_done == 0) { + if (!conn->session || conn->version_check_done == 0) { ERR("Trying to check for data before version check"); ret = -1; goto end_no_session; } - ret = cmd->sock->ops->recvmsg(cmd->sock, &msg, sizeof(msg), 0); + ret = conn->sock->ops->recvmsg(conn->sock, &msg, sizeof(msg), 0); if (ret < sizeof(msg)) { if (ret == 0) { /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + DBG("Socket %d did an orderly shutdown", conn->sock->fd); } else { ERR("Relay didn't receive valid end data_pending struct size: %d", ret); @@ -1678,9 +1865,9 @@ int relay_end_data_pending(struct lttcomm_relayd_hdr *recv_hdr, /* Iterate over all streams to see if the begin data pending flag is set. */ rcu_read_lock(); cds_lfht_for_each_entry(relay_streams_ht->ht, &iter.iter, stream, - stream_n.node) { - if (stream->session->id == session_id && - !stream->data_pending_check_done) { + node.node) { + if (stream->session_id == session_id && + !stream->data_pending_check_done && !stream->terminated_flag) { is_data_inflight = 1; DBG("Data is still in flight for stream %" PRIu64, stream->stream_handle); @@ -1689,10 +1876,11 @@ int relay_end_data_pending(struct lttcomm_relayd_hdr *recv_hdr, } rcu_read_unlock(); + memset(&reply, 0, sizeof(reply)); /* All good, send back reply. */ reply.ret_code = htobe32(is_data_inflight); - ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(reply), 0); + ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); if (ret < 0) { ERR("Relay end data pending send reply failed"); } @@ -1708,32 +1896,32 @@ end_no_session: */ static int relay_recv_index(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_command *cmd) + struct relay_connection *conn) { int ret, send_ret, index_created = 0; - struct relay_session *session = cmd->session; + struct relay_session *session = conn->session; struct lttcomm_relayd_index index_info; struct relay_index *index, *wr_index = NULL; struct lttcomm_relayd_generic_reply reply; struct relay_stream *stream; uint64_t net_seq_num; - assert(cmd); + assert(conn); DBG("Relay receiving index"); - if (!session || cmd->version_check_done == 0) { + if (!session || conn->version_check_done == 0) { ERR("Trying to close a stream before version check"); ret = -1; goto end_no_session; } - ret = cmd->sock->ops->recvmsg(cmd->sock, &index_info, + ret = conn->sock->ops->recvmsg(conn->sock, &index_info, sizeof(index_info), 0); if (ret < sizeof(index_info)) { if (ret == 0) { /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + DBG("Socket %d did an orderly shutdown", conn->sock->fd); } else { ERR("Relay didn't receive valid index struct size : %d", ret); } @@ -1744,7 +1932,8 @@ int relay_recv_index(struct lttcomm_relayd_hdr *recv_hdr, net_seq_num = be64toh(index_info.net_seq_num); rcu_read_lock(); - stream = relay_stream_find_by_id(be64toh(index_info.relay_stream_id)); + stream = stream_find_by_id(relay_streams_ht, + be64toh(index_info.relay_stream_id)); if (!stream) { ret = -1; goto end_rcu_unlock; @@ -1755,9 +1944,10 @@ int relay_recv_index(struct lttcomm_relayd_hdr *recv_hdr, DBG("Received live beacon for stream %" PRIu64, stream->stream_handle); /* - * Only flag a stream inactive when it has already received data. + * Only flag a stream inactive when it has already received data + * and no indexes are in flight. */ - if (stream->total_index_received > 0) { + if (stream->total_index_received > 0 && stream->indexes_in_flight == 0) { stream->beacon_ts_end = be64toh(index_info.timestamp_end); } ret = 0; @@ -1774,9 +1964,13 @@ int relay_recv_index(struct lttcomm_relayd_hdr *recv_hdr, goto end_rcu_unlock; } index_created = 1; + stream->indexes_in_flight++; } copy_index_control_data(index, &index_info); + if (stream->ctf_stream_id == -1ULL) { + stream->ctf_stream_id = be64toh(index_info.stream_id); + } if (index_created) { /* @@ -1796,33 +1990,25 @@ int relay_recv_index(struct lttcomm_relayd_hdr *recv_hdr, /* Do we have a writable ready index to write on disk. */ if (wr_index) { - /* Starting at 2.4, create the index file if none available. */ - if (cmd->minor >= 4 && stream->index_fd < 0) { - ret = index_create_file(stream->path_name, stream->channel_name, - relayd_uid, relayd_gid, stream->tracefile_size, - stream->tracefile_count_current); - if (ret < 0) { - goto end_rcu_unlock; - } - stream->index_fd = ret; - } - ret = relay_index_write(wr_index->fd, wr_index); if (ret < 0) { goto end_rcu_unlock; } stream->total_index_received++; + stream->indexes_in_flight--; + assert(stream->indexes_in_flight >= 0); } end_rcu_unlock: rcu_read_unlock(); + memset(&reply, 0, sizeof(reply)); if (ret < 0) { reply.ret_code = htobe32(LTTNG_ERR_UNK); } else { reply.ret_code = htobe32(LTTNG_OK); } - send_ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(reply), 0); + send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); if (send_ret < 0) { ERR("Relay sending close index id reply"); ret = send_ret; @@ -1832,53 +2018,106 @@ end_no_session: return ret; } +/* + * Receive the streams_sent message. + * + * Return 0 on success else a negative value. + */ +static +int relay_streams_sent(struct lttcomm_relayd_hdr *recv_hdr, + struct relay_connection *conn) +{ + int ret, send_ret; + struct lttcomm_relayd_generic_reply reply; + + assert(conn); + + DBG("Relay receiving streams_sent"); + + if (!conn->session || conn->version_check_done == 0) { + ERR("Trying to close a stream before version check"); + ret = -1; + goto end_no_session; + } + + /* + * Flag every pending stream in the connection recv list that they are + * ready to be used by the viewer. + */ + set_viewer_ready_flag(conn); + + /* + * Inform the viewer that there are new streams in the session. + */ + if (conn->session->viewer_refcount) { + uatomic_set(&conn->session->new_streams, 1); + } + + memset(&reply, 0, sizeof(reply)); + reply.ret_code = htobe32(LTTNG_OK); + send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); + if (send_ret < 0) { + ERR("Relay sending sent_stream reply"); + ret = send_ret; + } else { + /* Success. */ + ret = 0; + } + +end_no_session: + return ret; +} + /* * Process the commands received on the control socket */ static int relay_process_control(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_command *cmd, struct relay_local_data *ctx) + struct relay_connection *conn) { int ret = 0; switch (be32toh(recv_hdr->cmd)) { case RELAYD_CREATE_SESSION: - ret = relay_create_session(recv_hdr, cmd, ctx->sessions_ht); + ret = relay_create_session(recv_hdr, conn); break; case RELAYD_ADD_STREAM: - ret = relay_add_stream(recv_hdr, cmd, ctx->sessions_ht); + ret = relay_add_stream(recv_hdr, conn); break; case RELAYD_START_DATA: - ret = relay_start(recv_hdr, cmd); + ret = relay_start(recv_hdr, conn); break; case RELAYD_SEND_METADATA: - ret = relay_recv_metadata(recv_hdr, cmd); + ret = relay_recv_metadata(recv_hdr, conn); break; case RELAYD_VERSION: - ret = relay_send_version(recv_hdr, cmd, ctx->sessions_ht); + ret = relay_send_version(recv_hdr, conn); break; case RELAYD_CLOSE_STREAM: - ret = relay_close_stream(recv_hdr, cmd); + ret = relay_close_stream(recv_hdr, conn); break; case RELAYD_DATA_PENDING: - ret = relay_data_pending(recv_hdr, cmd); + ret = relay_data_pending(recv_hdr, conn); break; case RELAYD_QUIESCENT_CONTROL: - ret = relay_quiescent_control(recv_hdr, cmd); + ret = relay_quiescent_control(recv_hdr, conn); break; case RELAYD_BEGIN_DATA_PENDING: - ret = relay_begin_data_pending(recv_hdr, cmd); + ret = relay_begin_data_pending(recv_hdr, conn); break; case RELAYD_END_DATA_PENDING: - ret = relay_end_data_pending(recv_hdr, cmd); + ret = relay_end_data_pending(recv_hdr, conn); break; case RELAYD_SEND_INDEX: - ret = relay_recv_index(recv_hdr, cmd); + ret = relay_recv_index(recv_hdr, conn); + break; + case RELAYD_STREAMS_SENT: + ret = relay_streams_sent(recv_hdr, conn); break; case RELAYD_UPDATE_SYNC_INFO: default: ERR("Received unknown command (%u)", be32toh(recv_hdr->cmd)); - relay_unknown_command(cmd); + relay_unknown_command(conn); ret = -1; goto end; } @@ -1921,6 +2160,7 @@ static int handle_index_data(struct relay_stream *stream, uint64_t net_seq_num, goto error; } index_created = 1; + stream->indexes_in_flight++; } if (rotate_index || stream->index_fd < 0) { @@ -1963,6 +2203,8 @@ static int handle_index_data(struct relay_stream *stream, uint64_t net_seq_num, goto error; } stream->total_index_received++; + stream->indexes_in_flight--; + assert(stream->indexes_in_flight >= 0); } error: @@ -1973,7 +2215,7 @@ error: * relay_process_data: Process the data received on the data socket */ static -int relay_process_data(struct relay_command *cmd) +int relay_process_data(struct relay_connection *conn) { int ret = 0, rotate_index = 0; ssize_t size_ret; @@ -1982,15 +2224,18 @@ int relay_process_data(struct relay_command *cmd) uint64_t stream_id; uint64_t net_seq_num; uint32_t data_size; + struct relay_session *session; + + assert(conn); - ret = cmd->sock->ops->recvmsg(cmd->sock, &data_hdr, + ret = conn->sock->ops->recvmsg(conn->sock, &data_hdr, sizeof(struct lttcomm_relayd_data_hdr), 0); if (ret <= 0) { if (ret == 0) { /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + DBG("Socket %d did an orderly shutdown", conn->sock->fd); } else { - ERR("Unable to receive data header on sock %d", cmd->sock->fd); + ERR("Unable to receive data header on sock %d", conn->sock->fd); } ret = -1; goto end; @@ -1999,12 +2244,15 @@ int relay_process_data(struct relay_command *cmd) stream_id = be64toh(data_hdr.stream_id); rcu_read_lock(); - stream = relay_stream_find_by_id(stream_id); + stream = stream_find_by_id(relay_streams_ht, stream_id); if (!stream) { ret = -1; goto end_rcu_unlock; } + session = session_find_by_id(conn->sessions_ht, stream->session_id); + assert(session); + data_size = be32toh(data_hdr.data_size); if (data_buffer_size < data_size) { char *tmp_data_ptr; @@ -2025,11 +2273,11 @@ int relay_process_data(struct relay_command *cmd) DBG3("Receiving data of size %u for stream id %" PRIu64 " seqnum %" PRIu64, data_size, stream_id, net_seq_num); - ret = cmd->sock->ops->recvmsg(cmd->sock, data_buffer, data_size, 0); + ret = conn->sock->ops->recvmsg(conn->sock, data_buffer, data_size, 0); if (ret <= 0) { if (ret == 0) { /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", cmd->sock->fd); + DBG("Socket %d did an orderly shutdown", conn->sock->fd); } ret = -1; goto end_rcu_unlock; @@ -2039,10 +2287,54 @@ int relay_process_data(struct relay_command *cmd) if (stream->tracefile_size > 0 && (stream->tracefile_size_current + data_size) > stream->tracefile_size) { + struct relay_viewer_stream *vstream; + uint64_t new_id; + + new_id = (stream->tracefile_count_current + 1) % + stream->tracefile_count; + /* + * When we wrap-around back to 0, we start overwriting old + * trace data. + */ + if (!stream->tracefile_overwrite && new_id == 0) { + stream->tracefile_overwrite = 1; + } + pthread_mutex_lock(&stream->viewer_stream_rotation_lock); + if (stream->tracefile_overwrite) { + stream->oldest_tracefile_id = + (stream->oldest_tracefile_id + 1) % + stream->tracefile_count; + } + vstream = viewer_stream_find_by_id(stream->stream_handle); + if (vstream) { + /* + * The viewer is reading a file about to be + * overwritten. Close the FDs it is + * currently using and let it handle the fault. + */ + if (vstream->tracefile_count_current == new_id) { + pthread_mutex_lock(&vstream->overwrite_lock); + vstream->abort_flag = 1; + pthread_mutex_unlock(&vstream->overwrite_lock); + DBG("Streaming side setting abort_flag on stream %s_%lu\n", + stream->channel_name, new_id); + } else if (vstream->tracefile_count_current == + stream->tracefile_count_current) { + /* + * The reader and writer were in the + * same trace file, inform the viewer + * that no new index will ever be added + * to this file. + */ + vstream->close_write_flag = 1; + } + } ret = utils_rotate_stream_file(stream->path_name, stream->channel_name, stream->tracefile_size, stream->tracefile_count, relayd_uid, relayd_gid, stream->fd, &(stream->tracefile_count_current), &stream->fd); + stream->total_index_received = 0; + pthread_mutex_unlock(&stream->viewer_stream_rotation_lock); if (ret < 0) { ERR("Rotating stream output file"); goto end_rcu_unlock; @@ -2056,7 +2348,7 @@ int relay_process_data(struct relay_command *cmd) * Index are handled in protocol version 2.4 and above. Also, snapshot and * index are NOT supported. */ - if (stream->session->minor >= 4 && !stream->session->snapshot) { + if (session->minor >= 4 && !session->snapshot) { ret = handle_index_data(stream, net_seq_num, rotate_index); if (ret < 0) { goto end_rcu_unlock; @@ -2082,10 +2374,7 @@ int relay_process_data(struct relay_command *cmd) stream->prev_seq = net_seq_num; - /* Check if we need to close the FD */ - if (close_stream_check(stream)) { - destroy_stream(stream); - } + try_close_stream(session, stream); end_rcu_unlock: rcu_read_unlock(); @@ -2094,11 +2383,13 @@ end: } static -void relay_cleanup_poll_connection(struct lttng_poll_event *events, int pollfd) +void cleanup_connection_pollfd(struct lttng_poll_event *events, int pollfd) { int ret; - lttng_poll_del(events, pollfd); + assert(events); + + (void) lttng_poll_del(events, pollfd); ret = close(pollfd); if (ret < 0) { @@ -2106,79 +2397,20 @@ void relay_cleanup_poll_connection(struct lttng_poll_event *events, int pollfd) } } -static -int relay_add_connection(int fd, struct lttng_poll_event *events, - struct lttng_ht *relay_connections_ht) +static void destroy_connection(struct lttng_ht *relay_connections_ht, + struct relay_connection *conn) { - struct relay_command *relay_connection; - ssize_t ret; + assert(relay_connections_ht); + assert(conn); - relay_connection = zmalloc(sizeof(struct relay_command)); - if (relay_connection == NULL) { - PERROR("Relay command zmalloc"); - goto error; - } - ret = lttng_read(fd, relay_connection, sizeof(struct relay_command)); - if (ret < sizeof(struct relay_command)) { - PERROR("read relay cmd pipe"); - goto error_read; - } + connection_delete(relay_connections_ht, conn); - /* - * Only used by the control side and the reference is copied inside each - * stream from that connection. Thus a destroy HT must be done after every - * stream has been destroyed. - */ - if (relay_connection->type == RELAY_CONTROL) { - relay_connection->ctf_traces_ht = lttng_ht_new(0, - LTTNG_HT_TYPE_STRING); - if (!relay_connection->ctf_traces_ht) { - goto error_read; - } + /* For the control socket, we try to destroy the session. */ + if (conn->type == RELAY_CONTROL && conn->session) { + destroy_session(conn->session, conn->sessions_ht); } - lttng_ht_node_init_ulong(&relay_connection->sock_n, - (unsigned long) relay_connection->sock->fd); - rcu_read_lock(); - lttng_ht_add_unique_ulong(relay_connections_ht, - &relay_connection->sock_n); - rcu_read_unlock(); - return lttng_poll_add(events, - relay_connection->sock->fd, - LPOLLIN | LPOLLRDHUP); - -error_read: - free(relay_connection); -error: - return -1; -} - -static -void deferred_free_connection(struct rcu_head *head) -{ - struct relay_command *relay_connection = - caa_container_of(head, struct relay_command, rcu_node); - - lttcomm_destroy_sock(relay_connection->sock); - free(relay_connection); -} - -static -void relay_del_connection(struct lttng_ht *relay_connections_ht, - struct lttng_ht_iter *iter, struct relay_command *relay_connection, - struct lttng_ht *sessions_ht) -{ - int ret; - - ret = lttng_ht_del(relay_connections_ht, iter); - assert(!ret); - - if (relay_connection->type == RELAY_CONTROL) { - relay_delete_session(relay_connection, sessions_ht); - lttng_ht_destroy(relay_connection->ctf_traces_ht); - } - - call_rcu(&relay_connection->rcu_node, deferred_free_connection); + connection_destroy(conn); } /* @@ -2189,10 +2421,9 @@ void *relay_thread_worker(void *data) { int ret, err = -1, last_seen_data_fd = -1; uint32_t nb_fd; - struct relay_command *relay_connection; + struct relay_connection *conn; struct lttng_poll_event events; struct lttng_ht *relay_connections_ht; - struct lttng_ht_node_ulong *node; struct lttng_ht_iter iter; struct lttcomm_relayd_hdr recv_hdr; struct relay_local_data *relay_ctx = (struct relay_local_data *) data; @@ -2204,6 +2435,10 @@ void *relay_thread_worker(void *data) health_register(health_relayd, HEALTH_RELAYD_TYPE_WORKER); + if (testpoint(relayd_thread_worker)) { + goto error_testpoint; + } + health_code_update(); /* table of connections indexed on socket */ @@ -2223,7 +2458,7 @@ void *relay_thread_worker(void *data) goto error_poll_create; } - ret = lttng_poll_add(&events, relay_cmd_pipe[0], LPOLLIN | LPOLLRDHUP); + ret = lttng_poll_add(&events, relay_conn_pipe[0], LPOLLIN | LPOLLRDHUP); if (ret < 0) { goto error; } @@ -2270,73 +2505,53 @@ restart: goto exit; } - /* Inspect the relay cmd pipe for new connection */ - if (pollfd == relay_cmd_pipe[0]) { + /* Inspect the relay conn pipe for new connection */ + if (pollfd == relay_conn_pipe[0]) { if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { - ERR("Relay pipe error"); + ERR("Relay connection pipe error"); goto error; } else if (revents & LPOLLIN) { - DBG("Relay command received"); - ret = relay_add_connection(relay_cmd_pipe[0], - &events, relay_connections_ht); + ret = lttng_read(relay_conn_pipe[0], &conn, sizeof(conn)); if (ret < 0) { goto error; } - } - } else if (revents) { - rcu_read_lock(); - lttng_ht_lookup(relay_connections_ht, - (void *)((unsigned long) pollfd), - &iter); - node = lttng_ht_iter_get_node_ulong(&iter); - if (node == NULL) { - DBG2("Relay sock %d not found", pollfd); + conn->sessions_ht = sessions_ht; + connection_init(conn); + lttng_poll_add(&events, conn->sock->fd, + LPOLLIN | LPOLLRDHUP); + rcu_read_lock(); + lttng_ht_add_unique_ulong(relay_connections_ht, + &conn->sock_n); rcu_read_unlock(); - goto error; + DBG("Connection socket %d added", conn->sock->fd); } - relay_connection = caa_container_of(node, - struct relay_command, sock_n); - - if (revents & (LPOLLERR)) { - ERR("POLL ERROR"); - relay_cleanup_poll_connection(&events, pollfd); - relay_del_connection(relay_connections_ht, - &iter, relay_connection, sessions_ht); - if (last_seen_data_fd == pollfd) { - last_seen_data_fd = last_notdel_data_fd; - } - } else if (revents & (LPOLLHUP | LPOLLRDHUP)) { - DBG("Socket %d hung up", pollfd); - relay_cleanup_poll_connection(&events, pollfd); - relay_del_connection(relay_connections_ht, - &iter, relay_connection, sessions_ht); + } else { + rcu_read_lock(); + conn = connection_find_by_sock(relay_connections_ht, pollfd); + /* If not found, there is a synchronization issue. */ + assert(conn); + + if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { + cleanup_connection_pollfd(&events, pollfd); + destroy_connection(relay_connections_ht, conn); if (last_seen_data_fd == pollfd) { last_seen_data_fd = last_notdel_data_fd; } } else if (revents & LPOLLIN) { - /* control socket */ - if (relay_connection->type == RELAY_CONTROL) { - ret = relay_connection->sock->ops->recvmsg( - relay_connection->sock, &recv_hdr, - sizeof(struct lttcomm_relayd_hdr), 0); - /* connection closed */ + if (conn->type == RELAY_CONTROL) { + ret = conn->sock->ops->recvmsg(conn->sock, &recv_hdr, + sizeof(recv_hdr), 0); if (ret <= 0) { - relay_cleanup_poll_connection(&events, pollfd); - relay_del_connection(relay_connections_ht, - &iter, relay_connection, sessions_ht); + /* Connection closed */ + cleanup_connection_pollfd(&events, pollfd); + destroy_connection(relay_connections_ht, conn); DBG("Control connection closed with %d", pollfd); } else { - if (relay_connection->session) { - DBG2("Relay worker receiving data for session : %" PRIu64, - relay_connection->session->id); - } - ret = relay_process_control(&recv_hdr, - relay_connection, relay_ctx); + ret = relay_process_control(&recv_hdr, conn); if (ret < 0) { /* Clear the session on error. */ - relay_cleanup_poll_connection(&events, pollfd); - relay_del_connection(relay_connections_ht, - &iter, relay_connection, sessions_ht); + cleanup_connection_pollfd(&events, pollfd); + destroy_connection(relay_connections_ht, conn); DBG("Connection closed with %d", pollfd); } seen_control = 1; @@ -2349,6 +2564,8 @@ restart: */ last_notdel_data_fd = pollfd; } + } else { + ERR("Unknown poll events %u for sock %d", revents, pollfd); } rcu_read_unlock(); } @@ -2384,35 +2601,29 @@ restart: health_code_update(); /* Skip the command pipe. It's handled in the first loop. */ - if (pollfd == relay_cmd_pipe[0]) { + if (pollfd == relay_conn_pipe[0]) { continue; } if (revents) { rcu_read_lock(); - lttng_ht_lookup(relay_connections_ht, - (void *)((unsigned long) pollfd), - &iter); - node = lttng_ht_iter_get_node_ulong(&iter); - if (node == NULL) { + conn = connection_find_by_sock(relay_connections_ht, pollfd); + if (!conn) { /* Skip it. Might be removed before. */ rcu_read_unlock(); continue; } - relay_connection = caa_container_of(node, - struct relay_command, sock_n); if (revents & LPOLLIN) { - if (relay_connection->type != RELAY_DATA) { + if (conn->type != RELAY_DATA) { continue; } - ret = relay_process_data(relay_connection); - /* connection closed */ + ret = relay_process_data(conn); + /* Connection closed */ if (ret < 0) { - relay_cleanup_poll_connection(&events, pollfd); - relay_del_connection(relay_connections_ht, - &iter, relay_connection, sessions_ht); + cleanup_connection_pollfd(&events, pollfd); + destroy_connection(relay_connections_ht, conn); DBG("Data connection closed with %d", pollfd); /* * Every goto restart call sets the last seen fd where @@ -2439,18 +2650,12 @@ exit: error: lttng_poll_clean(&events); - /* empty the hash table and free the memory */ + /* Cleanup reamaining connection object. */ rcu_read_lock(); - cds_lfht_for_each_entry(relay_connections_ht->ht, &iter.iter, node, node) { + cds_lfht_for_each_entry(relay_connections_ht->ht, &iter.iter, conn, + sock_n.node) { health_code_update(); - - node = lttng_ht_iter_get_node_ulong(&iter); - if (node) { - relay_connection = caa_container_of(node, - struct relay_command, sock_n); - relay_del_connection(relay_connections_ht, - &iter, relay_connection, sessions_ht); - } + destroy_connection(relay_connections_ht, conn); } rcu_read_unlock(); error_poll_create: @@ -2458,13 +2663,14 @@ error_poll_create: indexes_ht_error: lttng_ht_destroy(relay_connections_ht); relay_connections_ht_error: - /* Close relay cmd pipes */ - utils_close_pipe(relay_cmd_pipe); + /* Close relay conn pipes */ + utils_close_pipe(relay_conn_pipe); if (err) { DBG("Thread exited with error"); } DBG("Worker thread cleanup complete"); free(data_buffer); +error_testpoint: if (err) { health_error(); ERR("Health error occurred in %s", __func__); @@ -2479,11 +2685,11 @@ relay_connections_ht_error: * Create the relay command pipe to wake thread_manage_apps. * Closed in cleanup(). */ -static int create_relay_cmd_pipe(void) +static int create_relay_conn_pipe(void) { int ret; - ret = utils_create_pipe_cloexec(relay_cmd_pipe); + ret = utils_create_pipe_cloexec(relay_conn_pipe); return ret; } @@ -2497,14 +2703,9 @@ int main(int argc, char **argv) void *status; struct relay_local_data *relay_ctx; - /* Create thread quit pipe */ - if ((ret = init_thread_quit_pipe()) < 0) { - goto error; - } - /* Parse arguments */ progname = argv[0]; - if ((ret = parse_args(argc, argv)) < 0) { + if ((ret = set_options(argc, argv)) < 0) { goto exit; } @@ -2527,12 +2728,28 @@ int main(int argc, char **argv) } /* Daemonize */ - if (opt_daemon) { - ret = daemon(0, 0); + if (opt_daemon || opt_background) { + int i; + + ret = lttng_daemonize(&child_ppid, &recv_child_signal, + !opt_background); if (ret < 0) { - PERROR("daemon"); goto exit; } + + /* + * We are in the child. Make sure all other file + * descriptors are closed, in case we are called with + * more opened file descriptors than the standard ones. + */ + for (i = 3; i < sysconf(_SC_OPEN_MAX); i++) { + (void) close(i); + } + } + + /* Create thread quit pipe */ + if ((ret = init_thread_quit_pipe()) < 0) { + goto error; } /* We need those values for the file/dir creation. */ @@ -2541,7 +2758,7 @@ int main(int argc, char **argv) /* Check if daemon is UID = 0 */ if (relayd_uid == 0) { - if (control_uri->port < 1024 || data_uri->port < 1024) { + if (control_uri->port < 1024 || data_uri->port < 1024 || live_uri->port < 1024) { ERR("Need to be root to use ports < 1024"); ret = -1; goto exit; @@ -2549,18 +2766,19 @@ int main(int argc, char **argv) } /* Setup the thread apps communication pipe. */ - if ((ret = create_relay_cmd_pipe()) < 0) { + if ((ret = create_relay_conn_pipe()) < 0) { goto exit; } /* Init relay command queue. */ - cds_wfq_init(&relay_cmd_queue.queue); + cds_wfcq_init(&relay_conn_queue.head, &relay_conn_queue.tail); /* Set up max poll set size */ lttng_poll_set_max_size(); /* Initialize communication library */ lttcomm_init(); + lttcomm_inet_init(); relay_ctx = zmalloc(sizeof(struct relay_local_data)); if (!relay_ctx) { @@ -2569,13 +2787,13 @@ int main(int argc, char **argv) } /* tables of sessions indexed by session ID */ - relay_ctx->sessions_ht = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG); + relay_ctx->sessions_ht = lttng_ht_new(0, LTTNG_HT_TYPE_U64); if (!relay_ctx->sessions_ht) { goto exit_relay_ctx_sessions; } /* tables of streams indexed by stream ID */ - relay_streams_ht = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG); + relay_streams_ht = lttng_ht_new(0, LTTNG_HT_TYPE_U64); if (!relay_streams_ht) { goto exit_relay_ctx_streams; } @@ -2630,7 +2848,7 @@ int main(int argc, char **argv) goto exit_listener; } - ret = live_start_threads(live_uri, relay_ctx, thread_quit_pipe); + ret = live_start_threads(live_uri, relay_ctx); if (ret != 0) { ERR("Starting live viewer threads"); goto exit_live;