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");
struct consumer_socket *socket, struct ust_registry_session *registry)
{
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);
pthread_mutex_unlock(socket->lock);
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