#include "consumer.h"
#include "health-sessiond.h"
#include "ust-consumer.h"
+#include "lttng-ust-error.h"
#include "buffer-registry.h"
#include "session.h"
#include "lttng-sessiond.h"
-/*
- * Return allocated full pathname of the session using the consumer trace path
- * and subdir if available.
- *
- * The caller can safely free(3) the returned value. On error, NULL is
- * returned.
- */
-static char *setup_channel_trace_path(struct consumer_output *consumer,
- struct ust_app_session *ua_sess)
-{
- int ret;
- char *pathname;
-
- assert(consumer);
- assert(ua_sess);
-
- health_code_update();
-
- /*
- * 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_NET &&
- consumer->relay_major_version == 2 &&
- consumer->relay_minor_version < 11) {
- ret = snprintf(pathname, LTTNG_PATH_MAX, "%s%s/%s%s",
- consumer->dst.net.base_dir,
- consumer->chunk_path, consumer->domain_subdir,
- ua_sess->path);
- } else {
- ret = snprintf(pathname, LTTNG_PATH_MAX, "%s%s",
- consumer->domain_subdir, ua_sess->path);
- }
- DBG3("Userspace consumer trace path relative to current trace chunk: \"%s\"",
- pathname);
- 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;
-error:
- free(pathname);
- return NULL;
-}
-
/*
* Send a single channel to the consumer using command ASK_CHANNEL_CREATION.
*
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);
+ pathname = setup_channel_trace_path(consumer, ua_sess->path);
if (!pathname) {
ret = -1;
goto error;
ua_chan->attr.switch_timer_interval,
ua_chan->attr.read_timer_interval,
ua_sess->live_timer_interval,
+ ua_sess->live_timer_interval != 0,
ua_chan->monitor_timer_interval,
output,
(int) ua_chan->attr.type,
ret = ustctl_send_stream_to_ust(app->sock, channel->obj, stream->obj);
pthread_mutex_unlock(&app->sock_lock);
if (ret < 0) {
- if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
- ERR("ustctl send stream handle %d to app pid: %d with ret %d",
- stream->obj->handle, app->pid, ret);
+ if (ret == -EPIPE || ret == -LTTNG_UST_ERR_EXITING) {
+ DBG3("UST app send stream to ust failed. Application is dead. (pid: %d, sock: %d).",
+ app->pid, app->sock);
+ } else if (ret == -EAGAIN) {
+ WARN("UST app send stream to ust failed. Communication time out (pid: %d, sock: %d).",
+ app->pid, app->sock);
} else {
- DBG3("UST app send stream to ust failed. Application is dead.");
+ ERR("UST app send stream, handle %d, to ust failed with ret %d (pid: %d, sock: %d).",
+ stream->obj->handle, ret, app->pid,
+ app->sock);
}
goto error;
}
ret = ustctl_send_channel_to_ust(app->sock, ua_sess->handle, channel->obj);
pthread_mutex_unlock(&app->sock_lock);
if (ret < 0) {
- if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
- ERR("Error ustctl send channel %s to app pid: %d with ret %d",
- channel->name, app->pid, ret);
+ if (ret == -EPIPE || ret == -LTTNG_UST_ERR_EXITING) {
+ DBG3("UST app send channel to ust failed. Application is dead (pid: %d, sock: %d).",
+ app->pid, app->sock);
+ } else if (ret == -EAGAIN) {
+ WARN("UST app send channel to ust failed. Communication timeout (pid: %d, sock: %d).",
+ app->pid, app->sock);
} else {
- DBG3("UST app send channel to ust failed. Application is dead.");
+ ERR("UST app send channel %s, to ust failed with ret %d (pid: %d, sock: %d).",
+ channel->name, ret, app->pid,
+ app->sock);
}
goto error;
}