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;
}
/* 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);
+ ret = snprintf(pathname, LTTNG_PATH_MAX, "%s%s%s%s",
+ consumer->dst.session_root_path,
+ consumer->chunk_path,
+ consumer->subdir, ua_sess->path);
if (ret < 0) {
PERROR("snprintf channel path");
goto error;
}
}
} 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->subdir,
ua_sess->path);
if (ret < 0) {
PERROR("snprintf channel path");
* 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,
+ uint64_t trace_archive_id)
{
int ret, output;
uint32_t chan_id;
ua_sess->output_traces,
ua_sess->uid,
ua_chan->attr.blocking_timeout,
- root_shm_path, shm_path);
+ root_shm_path, shm_path,
+ trace_archive_id);
health_code_update();
* 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,
+ uint64_t trace_archive_id)
{
int ret;
- struct ltt_session *session;
assert(ua_sess);
assert(ua_chan);
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_archive_id);
pthread_mutex_unlock(socket->lock);
if (ret < 0) {
ERR("ask_channel_creation consumer command failed");
free(stream);
if (ret == -LTTNG_UST_ERR_NOENT) {
DBG3("UST app consumer has no more stream available");
- ret = 0;
break;
}
if (ret != -EPIPE) {
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