X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Findex.c;h=ff27d958a0aebd6eb0f7816544eaa1f686ee192d;hp=92d4581d124a95921694129cba29213c08a7bd90;hb=211d28db4ccebf1a2abcd04eabba31cf46af3060;hpb=d3ecc5503007bc81faa8049fac945f163b6356f3

diff --git a/src/bin/lttng-relayd/index.c b/src/bin/lttng-relayd/index.c
index 92d4581d1..ff27d958a 100644
--- a/src/bin/lttng-relayd/index.c
+++ b/src/bin/lttng-relayd/index.c
@@ -1,20 +1,10 @@
 /*
- * Copyright (C) 2013 - Julien Desfossez <jdesfossez@efficios.com>
- *                      David Goulet <dgoulet@efficios.com>
- *               2015 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 Julien Desfossez <jdesfossez@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2015 Mathieu Desnoyers <mathieu.desnoyers@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
@@ -27,6 +17,7 @@
 #include "lttng-relayd.h"
 #include "stream.h"
 #include "index.h"
+#include "connection.h"
 
 /*
  * Allocate a new relay index object. Pass the stream in which it is
@@ -176,7 +167,7 @@ end:
 }
 
 int relay_index_set_data(struct relay_index *index,
-                const struct ctf_packet_index *data)
+		const struct ctf_packet_index *data)
 {
 	int ret = 0;
 
@@ -272,7 +263,6 @@ int relay_index_try_flush(struct relay_index *index)
 {
 	int ret = 1;
 	bool flushed = false;
-	int fd;
 
 	pthread_mutex_lock(&index->lock);
 	if (index->flushed) {
@@ -282,10 +272,9 @@ int relay_index_try_flush(struct relay_index *index)
 	if (!index->has_index_data || !index->index_file) {
 		goto skip;
 	}
-	fd = index->index_file->fd;
-	DBG2("Writing index for stream ID %" PRIu64 " and seq num %" PRIu64
-			" on fd %d", index->stream->stream_handle,
-			index->index_n.key, fd);
+
+	DBG2("Writing index for stream ID %" PRIu64 " and seq num %" PRIu64,
+			index->stream->stream_handle, index->index_n.key);
 	flushed = true;
 	index->flushed = true;
 	ret = lttng_index_file_write(index->index_file, &index->index_data);
@@ -400,7 +389,6 @@ int relay_index_switch_all_files(struct relay_stream *stream)
 	rcu_read_lock();
 	cds_lfht_for_each_entry(stream->indexes_ht->ht, &iter.iter,
 			index, index_n.node) {
-		DBG("Update index to fd %d", stream->index_file->fd);
 		ret = relay_index_switch_file(index, stream->index_file,
 				stream->pos_after_last_complete_data_index);
 		if (ret) {
@@ -411,3 +399,33 @@ end:
 	rcu_read_unlock();
 	return ret;
 }
+
+/*
+ * Set index data from the control port to a given index object.
+ */
+int relay_index_set_control_data(struct relay_index *index,
+		const struct lttcomm_relayd_index *data,
+		unsigned int minor_version)
+{
+	/* The index on disk is encoded in big endian. */
+	const struct ctf_packet_index index_data = {
+		.packet_size = htobe64(data->packet_size),
+		.content_size = htobe64(data->content_size),
+		.timestamp_begin = htobe64(data->timestamp_begin),
+		.timestamp_end = htobe64(data->timestamp_end),
+		.events_discarded = htobe64(data->events_discarded),
+		.stream_id = htobe64(data->stream_id),
+	};
+
+	if (minor_version >= 8) {
+		index->index_data.stream_instance_id = htobe64(data->stream_instance_id);
+		index->index_data.packet_seq_num = htobe64(data->packet_seq_num);
+	} else {
+		uint64_t unset_value = -1ULL;
+
+		index->index_data.stream_instance_id = htobe64(unset_value);
+		index->index_data.packet_seq_num = htobe64(unset_value);
+	}
+
+	return relay_index_set_data(index, &index_data);
+}