X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=5207bfa74f740200d10dcaa50a6c5d6c98710069;hp=43bf2616a2c4a93ba91f81f2a6f60476289dbe7c;hb=470cc211d9a571d0158ba43fdfb39beb2159bd3c;hpb=491d15395b58df09f8a3e7ba7404eb1f46392b79 diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c index 43bf2616a..5207bfa74 100644 --- a/src/bin/lttng-sessiond/ust-consumer.c +++ b/src/bin/lttng-sessiond/ust-consumer.c @@ -36,13 +36,12 @@ /* * Return allocated full pathname of the session using the consumer trace path - * and subdir if available. On a successful allocation, the directory of the - * trace is created with the session credentials. + * and subdir if available. * * The caller can safely free(3) the returned value. On error, NULL is * returned. */ -static char *setup_trace_path(struct consumer_output *consumer, +static char *setup_channel_trace_path(struct consumer_output *consumer, struct ust_app_session *ua_sess) { int ret; @@ -53,8 +52,11 @@ static char *setup_trace_path(struct consumer_output *consumer, health_code_update(); - /* Allocate our self the string to make sure we never exceed PATH_MAX. */ - pathname = zmalloc(PATH_MAX); + /* + * Allocate the string ourself to make sure we never exceed + * LTTNG_PATH_MAX. + */ + pathname = zmalloc(LTTNG_PATH_MAX); if (!pathname) { goto error; } @@ -62,29 +64,24 @@ static char *setup_trace_path(struct consumer_output *consumer, /* Get correct path name destination */ if (consumer->type == CONSUMER_DST_LOCAL) { /* Set application path to the destination path */ - ret = snprintf(pathname, PATH_MAX, "%s%s%s", - consumer->dst.trace_path, consumer->subdir, ua_sess->path); - if (ret < 0) { - PERROR("snprintf channel path"); - goto error; - } - - /* Create directory. Ignore if exist. */ - ret = run_as_mkdir_recursive(pathname, S_IRWXU | S_IRWXG, - ua_sess->euid, ua_sess->egid); - if (ret < 0) { - if (errno != EEXIST) { - ERR("Trace directory creation error"); - goto error; - } - } + ret = snprintf(pathname, LTTNG_PATH_MAX, "%s%s", + consumer->domain_subdir, ua_sess->path); + DBG3("Userspace local consumer trace path relative to current trace chunk: \"%s\"", + pathname); } else { - ret = snprintf(pathname, PATH_MAX, "%s%s", consumer->subdir, + ret = snprintf(pathname, LTTNG_PATH_MAX, "%s%s/%s%s", + consumer->dst.net.base_dir, + consumer->chunk_path, + consumer->domain_subdir, ua_sess->path); - if (ret < 0) { - PERROR("snprintf channel path"); - goto error; - } + } + if (ret < 0) { + PERROR("Failed to format channel path"); + goto error; + } else if (ret >= LTTNG_PATH_MAX) { + ERR("Truncation occurred while formatting channel path"); + ret = -1; + goto error; } return pathname; @@ -100,8 +97,11 @@ error: * Consumer socket lock MUST be acquired before calling this. */ static int ask_channel_creation(struct ust_app_session *ua_sess, - struct ust_app_channel *ua_chan, struct consumer_output *consumer, - struct consumer_socket *socket, struct ust_registry_session *registry) + struct ust_app_channel *ua_chan, + struct consumer_output *consumer, + struct consumer_socket *socket, + struct ust_registry_session *registry, + struct lttng_trace_chunk *trace_chunk) { int ret, output; uint32_t chan_id; @@ -111,6 +111,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, struct ust_registry_channel *chan_reg; char shm_path[PATH_MAX] = ""; char root_shm_path[PATH_MAX] = ""; + bool is_local_trace; assert(ua_sess); assert(ua_chan); @@ -120,10 +121,34 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, DBG2("Asking UST consumer for channel"); - /* Get and create full trace path of session. */ - if (ua_sess->output_traces) { - pathname = setup_trace_path(consumer, ua_sess); - if (!pathname) { + is_local_trace = consumer->net_seq_index == -1ULL; + /* Format the channel's path (relative to the current trace chunk). */ + pathname = setup_channel_trace_path(consumer, ua_sess); + if (!pathname) { + ret = -1; + goto error; + } + + if (is_local_trace && trace_chunk) { + enum lttng_trace_chunk_status chunk_status; + char *pathname_index; + + ret = asprintf(&pathname_index, "%s/" DEFAULT_INDEX_DIR, + pathname); + if (ret < 0) { + ERR("Failed to format channel index directory"); + ret = -1; + goto error; + } + + /* + * Create the index subdirectory which will take care + * of implicitly creating the channel's path. + */ + chunk_status = lttng_trace_chunk_create_subdirectory( + trace_chunk, pathname_index); + free(pathname_index); + if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) { ret = -1; goto error; } @@ -181,8 +206,6 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, ua_sess->tracing_id, pathname, ua_chan->name, - ua_sess->euid, - ua_sess->egid, consumer->net_seq_index, ua_chan->key, registry->uuid, @@ -191,9 +214,11 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, ua_chan->tracefile_count, ua_sess->id, ua_sess->output_traces, - ua_sess->uid, + ua_sess->real_credentials.uid, ua_chan->attr.blocking_timeout, - root_shm_path, shm_path); + root_shm_path, shm_path, + trace_chunk, + &ua_sess->effective_credentials); health_code_update(); @@ -231,11 +256,13 @@ error: * Returns 0 on success else a negative value. */ int ust_consumer_ask_channel(struct ust_app_session *ua_sess, - struct ust_app_channel *ua_chan, struct consumer_output *consumer, - struct consumer_socket *socket, struct ust_registry_session *registry) + struct ust_app_channel *ua_chan, + struct consumer_output *consumer, + struct consumer_socket *socket, + struct ust_registry_session *registry, + struct lttng_trace_chunk * trace_chunk) { int ret; - struct ltt_session *session; assert(ua_sess); assert(ua_chan); @@ -249,11 +276,9 @@ int ust_consumer_ask_channel(struct ust_app_session *ua_sess, goto error; } - session = session_find_by_id(ua_sess->tracing_id); - assert(session); - pthread_mutex_lock(socket->lock); - ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry); + ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry, + trace_chunk); pthread_mutex_unlock(socket->lock); if (ret < 0) { ERR("ask_channel_creation consumer command failed"); @@ -321,7 +346,6 @@ int ust_consumer_get_channel(struct consumer_socket *socket, free(stream); if (ret == -LTTNG_UST_ERR_NOENT) { DBG3("UST app consumer has no more stream available"); - ret = 0; break; } if (ret != -EPIPE) { @@ -506,7 +530,9 @@ int ust_consumer_metadata_request(struct consumer_socket *socket) memset(&msg, 0, sizeof(msg)); msg.cmd_type = LTTNG_ERR_UND; + pthread_mutex_lock(socket->lock); (void) consumer_send_msg(socket, &msg); + pthread_mutex_unlock(socket->lock); /* * This is possible since the session might have been destroyed * during a consumer metadata request. So here, return gracefully