/*
- * Copyright (C) 2013 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
*
- * 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 <assert.h>
#include <inttypes.h>
#include <string.h>
#include <urcu/uatomic.h>
*
* Return 0 on success or else a negative value.
*/
-static int output_init(uint64_t max_size, const char *name,
+static int output_init(const struct ltt_session *session,
+ uint64_t max_size, const char *name,
struct lttng_uri *uris, size_t nb_uri,
struct consumer_output *consumer, struct snapshot_output *output,
struct snapshot *snapshot)
lttng_ht_node_init_ulong(&output->node, (unsigned long) output->id);
if (name && name[0] != '\0') {
- strncpy(output->name, name, sizeof(output->name));
+ if (lttng_strncpy(output->name, name, sizeof(output->name))) {
+ ret = -LTTNG_ERR_INVALID;
+ goto error;
+ }
} else {
/* Set default name. */
ret = snprintf(output->name, sizeof(output->name), "%s-%" PRIu32,
}
if (uris[0].dtype == LTTNG_DST_PATH) {
- memset(output->consumer->dst.trace_path, 0,
- sizeof(output->consumer->dst.trace_path));
- strncpy(output->consumer->dst.trace_path, uris[0].dst.path,
- sizeof(output->consumer->dst.trace_path));
+ memset(output->consumer->dst.session_root_path, 0,
+ sizeof(output->consumer->dst.session_root_path));
+ if (lttng_strncpy(output->consumer->dst.session_root_path,
+ uris[0].dst.path,
+ sizeof(output->consumer->dst.session_root_path))) {
+ ret = -LTTNG_ERR_INVALID;
+ goto error;
+ }
output->consumer->type = CONSUMER_DST_LOCAL;
ret = 0;
goto end;
for (i = 0; i < nb_uri; i ++) {
/* Network URIs */
- ret = consumer_set_network_uri(output->consumer, &uris[i]);
+ ret = consumer_set_network_uri(session, output->consumer,
+ &uris[i]);
if (ret < 0) {
goto error;
}
*
* Return 0 on success or else a negative value.
*/
-int snapshot_output_init_with_uri(uint64_t max_size, const char *name,
+int snapshot_output_init_with_uri(const struct ltt_session *session,
+ uint64_t max_size, const char *name,
struct lttng_uri *uris, size_t nb_uri,
struct consumer_output *consumer, struct snapshot_output *output,
struct snapshot *snapshot)
{
- return output_init(max_size, name, uris, nb_uri, consumer, output,
- snapshot);
+ return output_init(session, max_size, name, uris, nb_uri, consumer,
+ output, snapshot);
}
/*
*
* Return 0 on success or else a negative value.
*/
-int snapshot_output_init(uint64_t max_size, const char *name,
+int snapshot_output_init(const struct ltt_session *session,
+ uint64_t max_size, const char *name,
const char *ctrl_url, const char *data_url,
struct consumer_output *consumer, struct snapshot_output *output,
struct snapshot *snapshot)
goto error;
}
- ret = output_init(max_size, name, uris, nb_uri, consumer, output,
- snapshot);
+ ret = output_init(session, max_size, name, uris, nb_uri, consumer,
+ output, snapshot);
error:
free(uris);
int ret;
struct lttng_ht_iter iter;
- assert(snapshot);
- assert(snapshot->output_ht);
- assert(output);
+ LTTNG_ASSERT(snapshot);
+ LTTNG_ASSERT(snapshot->output_ht);
+ LTTNG_ASSERT(output);
iter.iter.node = &output->node.node;
rcu_read_lock();
ret = lttng_ht_del(snapshot->output_ht, &iter);
rcu_read_unlock();
- assert(!ret);
+ LTTNG_ASSERT(!ret);
/*
* This is safe because the ownership of a snapshot object is in a session
* for which the session lock need to be acquired to read and modify it.
void snapshot_add_output(struct snapshot *snapshot,
struct snapshot_output *output)
{
- assert(snapshot);
- assert(snapshot->output_ht);
- assert(output);
+ LTTNG_ASSERT(snapshot);
+ LTTNG_ASSERT(snapshot->output_ht);
+ LTTNG_ASSERT(output);
rcu_read_lock();
lttng_ht_add_unique_ulong(snapshot->output_ht, &output->node);
*/
void snapshot_output_destroy(struct snapshot_output *obj)
{
- assert(obj);
+ LTTNG_ASSERT(obj);
if (obj->consumer) {
consumer_output_send_destroy_relayd(obj->consumer);
struct lttng_ht_iter iter;
struct snapshot_output *output = NULL;
- assert(snapshot);
- assert(name);
+ LTTNG_ASSERT(snapshot);
+ LTTNG_ASSERT(name);
cds_lfht_for_each_entry(snapshot->output_ht->ht, &iter.iter, output,
node.node) {
struct lttng_ht_iter iter;
struct snapshot_output *output = NULL;
- assert(snapshot);
+ LTTNG_ASSERT(snapshot);
lttng_ht_lookup(snapshot->output_ht, (void *)((unsigned long) id), &iter);
node = lttng_ht_iter_get_node_ulong(&iter);
{
int ret;
- assert(obj);
+ LTTNG_ASSERT(obj);
memset(obj, 0, sizeof(struct snapshot));
struct lttng_ht_iter iter;
struct snapshot_output *output;
- assert(obj);
+ if (!obj->output_ht) {
+ return;
+ }
rcu_read_lock();
cds_lfht_for_each_entry(obj->output_ht->ht, &iter.iter, output,
projects / lttng-tools.git / blobdiff