#include "ust-consumer.h"
#include "buffer-registry.h"
#include "session.h"
+#include "lttng-sessiond.h"
/*
* Return allocated full pathname of the session using the consumer trace path
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");
}
/*
- * Send a single channel to the consumer using command ADD_CHANNEL.
+ * Send a single channel to the consumer using command ASK_CHANNEL_CREATION.
*
* Consumer socket lock MUST be acquired before calling this.
*/
ua_chan->attr.switch_timer_interval,
ua_chan->attr.read_timer_interval,
ua_sess->live_timer_interval,
+ ua_chan->monitor_timer_interval,
output,
(int) ua_chan->attr.type,
ua_sess->tracing_id,
ua_sess->id,
ua_sess->output_traces,
ua_sess->uid,
+ ua_chan->attr.blocking_timeout,
root_shm_path, shm_path);
health_code_update();
/*
* Ask consumer to create a channel for a given session.
*
+ * Session list and rcu read side locks must be held by the caller.
+ *
* Returns 0 on success else a negative value.
*/
int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
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);
if (ret < 0) {
+ ERR("ask_channel_creation consumer command failed");
goto error;
}
free(stream);
if (ret == -LTTNG_UST_ERR_NOENT) {
DBG3("UST app consumer has no more stream available");
- ret = 0;
break;
}
if (ret != -EPIPE) {