/*
- * 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>
#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.
*
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);
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,
+ &consumer_path_offset);
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,
ua_sess->tracing_id,
- pathname,
+ &pathname[consumer_path_offset],
ua_chan->name,
consumer->net_seq_index,
ua_chan->key,
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,