/*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
*
- * 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 <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <inttypes.h>
+#include <common/compat/errno.h>
#include <common/common.h>
#include <common/consumer/consumer.h>
#include <common/defaults.h>
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");
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
* 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';
}
switch (ua_chan->attr.output) {
- case LTTNG_UST_MMAP:
+ case LTTNG_UST_ABI_MMAP:
default:
output = LTTNG_EVENT_MMAP;
break;
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_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,
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,
{
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;
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;
}
/* 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",
}
/* 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) {
}
/* 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);
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;
{
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;
}
{
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;
}
struct ust_registry_session *ust_reg;
struct lttcomm_consumer_msg msg;
- assert(socket);
+ LTTNG_ASSERT(socket);
rcu_read_lock();
health_code_update();
}
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);
projects / lttng-tools.git / blobdiff