X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Findex%2Findex.h;h=25ecc1975d2c38701ea7f50f0ab8fd896fae05d5;hp=b5ffc314998b483acbb9f0df47da5e2fcef10a45;hb=b66cbf1731486ab4dc7e0b2e1c3fa05cc5360c19;hpb=c35f9726a22f1d93e14589688d830efccda196f3

diff --git a/src/common/index/index.h b/src/common/index/index.h
index b5ffc3149..25ecc1975 100644
--- a/src/common/index/index.h
+++ b/src/common/index/index.h
@@ -1,20 +1,10 @@
 /*
- * Copyright (C) 2013 - Julien Desfossez <jdesfossez@efficios.com>
- *                      David Goulet <dgoulet@efficios.com>
- *               2016 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 Julien Desfossez <jdesfossez@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2016 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.
  */
 
 #ifndef _INDEX_H
@@ -23,11 +13,12 @@
 #include <inttypes.h>
 #include <urcu/ref.h>
 
-#include <common/trace-chunk.h>
 #include "ctf-index.h"
+#include <common/fs-handle.h>
+#include <common/trace-chunk.h>
 
 struct lttng_index_file {
-	int fd;
+	struct fs_handle *file;
 	uint32_t major;
 	uint32_t minor;
 	uint32_t element_len;
@@ -39,15 +30,20 @@ struct lttng_index_file {
  * create and open have refcount of 1. Use put to decrement the
  * refcount. Destroys when reaching 0. Use "get" to increment refcount.
  */
-struct lttng_index_file *lttng_index_file_create_from_trace_chunk(
+enum lttng_trace_chunk_status lttng_index_file_create_from_trace_chunk(
 		struct lttng_trace_chunk *chunk,
-		const char *channel_path, char *stream_name,
+		const char *channel_path, const char *stream_name,
 		uint64_t stream_file_size, uint64_t stream_count,
 		uint32_t index_major, uint32_t index_minor,
-		bool unlink_existing_file);
-struct lttng_index_file *lttng_index_file_open(const char *path_name,
-		const char *channel_name, uint64_t tracefile_count,
-		uint64_t tracefile_count_current);
+		bool unlink_existing_file, struct lttng_index_file **file);
+
+enum lttng_trace_chunk_status lttng_index_file_create_from_trace_chunk_read_only(
+		struct lttng_trace_chunk *chunk,
+		const char *channel_path, const char *stream_name,
+		uint64_t stream_file_size, uint64_t stream_file_index,
+		uint32_t index_major, uint32_t index_minor,
+		bool expect_no_file, struct lttng_index_file **file);
+
 int lttng_index_file_write(const struct lttng_index_file *index_file,
 		const struct ctf_packet_index *element);
 int lttng_index_file_read(const struct lttng_index_file *index_file,