X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=a68c5d96dc99070304357d3a723b136191868ecc;hb=3a5f70173aa04d11ccb22694d5d31a702cad33ab;hp=9ab54e9d7a64553f9e0d61d31d2e54661ad67ef9;hpb=3b9677124ab48bddc945ca67947c49b87b5853e0;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c index 9ab54e9d7..a68c5d96d 100644 --- a/src/bin/lttng-sessiond/ust-consumer.c +++ b/src/bin/lttng-sessiond/ust-consumer.c @@ -1,28 +1,18 @@ /* - * Copyright (C) 2011 - David Goulet + * Copyright (C) 2011 David Goulet * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2 only, - * as published by the Free Software Foundation. + * SPDX-License-Identifier: GPL-2.0-only * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #define _LGPL_SOURCE -#include #include #include #include #include #include +#include #include #include #include @@ -30,6 +20,7 @@ #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" @@ -51,22 +42,24 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, uint64_t key, chan_reg_key; char *pathname = NULL; struct lttcomm_consumer_msg msg; - struct ust_registry_channel *chan_reg; + struct ust_registry_channel *ust_reg_chan; char shm_path[PATH_MAX] = ""; char root_shm_path[PATH_MAX] = ""; bool is_local_trace; + size_t consumer_path_offset = 0; - assert(ua_sess); - assert(ua_chan); - assert(socket); - assert(consumer); - assert(registry); + LTTNG_ASSERT(ua_sess); + LTTNG_ASSERT(ua_chan); + LTTNG_ASSERT(socket); + LTTNG_ASSERT(consumer); + LTTNG_ASSERT(registry); DBG2("Asking UST consumer for channel"); 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->path); + pathname = setup_channel_trace_path(consumer, ua_sess->path, + &consumer_path_offset); if (!pathname) { ret = -1; goto error; @@ -104,7 +97,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, chan_reg_key = ua_chan->key; } - if (ua_chan->attr.type == LTTNG_UST_CHAN_METADATA) { + if (ua_chan->attr.type == LTTNG_UST_ABI_CHAN_METADATA) { chan_id = -1U; /* * Metadata channels shm_path (buffers) are handled within @@ -112,9 +105,9 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, * those buffer files. */ } else { - chan_reg = ust_registry_channel_find(registry, chan_reg_key); - assert(chan_reg); - chan_id = chan_reg->chan_id; + ust_reg_chan = ust_registry_channel_find(registry, chan_reg_key); + LTTNG_ASSERT(ust_reg_chan); + chan_id = ust_reg_chan->chan_id; if (ua_sess->shm_path[0]) { strncpy(shm_path, ua_sess->shm_path, sizeof(shm_path)); shm_path[sizeof(shm_path) - 1] = '\0'; @@ -130,7 +123,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, } switch (ua_chan->attr.output) { - case LTTNG_UST_MMAP: + case LTTNG_UST_ABI_MMAP: default: output = LTTNG_EVENT_MMAP; break; @@ -143,11 +136,12 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, 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, ua_sess->tracing_id, - pathname, + &pathname[consumer_path_offset], ua_chan->name, consumer->net_seq_index, ua_chan->key, @@ -157,7 +151,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, ua_chan->tracefile_count, ua_sess->id, ua_sess->output_traces, - ua_sess->real_credentials.uid, + lttng_credentials_get_uid(&ua_sess->real_credentials), ua_chan->attr.blocking_timeout, root_shm_path, shm_path, trace_chunk, @@ -176,10 +170,10 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, goto error; } /* Communication protocol error. */ - assert(key == ua_chan->key); + LTTNG_ASSERT(key == ua_chan->key); /* We need at least one where 1 stream for 1 cpu. */ if (ua_sess->output_traces) { - assert(ua_chan->expected_stream_count > 0); + LTTNG_ASSERT(ua_chan->expected_stream_count > 0); } DBG2("UST ask channel %" PRIu64 " successfully done with %u stream(s)", key, @@ -207,11 +201,11 @@ int ust_consumer_ask_channel(struct ust_app_session *ua_sess, { int ret; - assert(ua_sess); - assert(ua_chan); - assert(consumer); - assert(socket); - assert(registry); + LTTNG_ASSERT(ua_sess); + LTTNG_ASSERT(ua_chan); + LTTNG_ASSERT(consumer); + LTTNG_ASSERT(socket); + LTTNG_ASSERT(registry); if (!consumer->enabled) { ret = -LTTNG_ERR_NO_CONSUMER; @@ -244,8 +238,8 @@ int ust_consumer_get_channel(struct consumer_socket *socket, int ret; struct lttcomm_consumer_msg msg; - assert(ua_chan); - assert(socket); + LTTNG_ASSERT(ua_chan); + LTTNG_ASSERT(socket); memset(&msg, 0, sizeof(msg)); msg.cmd_type = LTTNG_CONSUMER_GET_CHANNEL; @@ -261,7 +255,7 @@ int ust_consumer_get_channel(struct consumer_socket *socket, } /* First, get the channel from consumer. */ - ret = ustctl_recv_channel_from_consumer(*socket->fd_ptr, &ua_chan->obj); + ret = lttng_ust_ctl_recv_channel_from_consumer(*socket->fd_ptr, &ua_chan->obj); if (ret < 0) { if (ret != -EPIPE) { ERR("Error recv channel from consumer %d with ret %d", @@ -284,7 +278,7 @@ int ust_consumer_get_channel(struct consumer_socket *socket, } /* Stream object is populated by this call if successful. */ - ret = ustctl_recv_stream_from_consumer(*socket->fd_ptr, &stream->obj); + ret = lttng_ust_ctl_recv_stream_from_consumer(*socket->fd_ptr, &stream->obj); if (ret < 0) { free(stream); if (ret == -LTTNG_UST_ERR_NOENT) { @@ -308,7 +302,7 @@ int ust_consumer_get_channel(struct consumer_socket *socket, } /* This MUST match or else we have a synchronization problem. */ - assert(ua_chan->expected_stream_count == ua_chan->streams.count); + LTTNG_ASSERT(ua_chan->expected_stream_count == ua_chan->streams.count); /* Wait for confirmation that we can proceed with the streams. */ ret = consumer_recv_status_reply(socket); @@ -338,8 +332,8 @@ int ust_consumer_destroy_channel(struct consumer_socket *socket, int ret; struct lttcomm_consumer_msg msg; - assert(ua_chan); - assert(socket); + LTTNG_ASSERT(ua_chan); + LTTNG_ASSERT(socket); memset(&msg, 0, sizeof(msg)); msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL; @@ -369,22 +363,27 @@ int ust_consumer_send_stream_to_ust(struct ust_app *app, { int ret; - assert(app); - assert(stream); - assert(channel); + LTTNG_ASSERT(app); + LTTNG_ASSERT(stream); + LTTNG_ASSERT(channel); DBG2("UST consumer send stream to app %d", app->sock); /* Relay stream to application. */ pthread_mutex_lock(&app->sock_lock); - ret = ustctl_send_stream_to_ust(app->sock, channel->obj, stream->obj); + ret = lttng_ust_ctl_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; } @@ -404,24 +403,29 @@ int ust_consumer_send_channel_to_ust(struct ust_app *app, { int ret; - assert(app); - assert(ua_sess); - assert(channel); - assert(channel->obj); + LTTNG_ASSERT(app); + LTTNG_ASSERT(ua_sess); + LTTNG_ASSERT(channel); + LTTNG_ASSERT(channel->obj); DBG2("UST app send channel to sock %d pid %d (name: %s, key: %" PRIu64 ")", app->sock, app->pid, channel->name, channel->tracing_channel_id); /* Send stream to application. */ pthread_mutex_lock(&app->sock_lock); - ret = ustctl_send_channel_to_ust(app->sock, ua_sess->handle, channel->obj); + ret = lttng_ust_ctl_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; } @@ -444,7 +448,7 @@ int ust_consumer_metadata_request(struct consumer_socket *socket) struct ust_registry_session *ust_reg; struct lttcomm_consumer_msg msg; - assert(socket); + LTTNG_ASSERT(socket); rcu_read_lock(); health_code_update(); @@ -487,7 +491,7 @@ int ust_consumer_metadata_request(struct consumer_socket *socket) } ust_reg = reg_pid->registry->reg.ust; } - assert(ust_reg); + LTTNG_ASSERT(ust_reg); pthread_mutex_lock(&ust_reg->lock); ret_push = ust_app_push_metadata(ust_reg, socket, 1);