X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Findex%2Findex.c;h=52a3c2e3fab9c89e2dcd054b8652f7c9582dcfc5;hp=694e3d18698dd3dfe142bc9e199026a9a8f6c9b4;hb=2ef0da38417d17ed7e485e92572d234fd9e021b3;hpb=d295668767ac8234e83984e1812d342d03293d88

diff --git a/src/common/index/index.c b/src/common/index/index.c
index 694e3d186..52a3c2e3f 100644
--- a/src/common/index/index.c
+++ b/src/common/index/index.c
@@ -31,97 +31,16 @@
 
 #include "index.h"
 
-/*
- * Create the index file associated with a trace file.
- *
- * Return allocated struct lttng_index_file, NULL on error.
- */
-struct lttng_index_file *lttng_index_file_create(const char *path_name,
-		char *stream_name, int uid, int gid,
-		uint64_t size, uint64_t count, uint32_t major, uint32_t minor)
-{
-	struct lttng_index_file *index_file;
-	int ret, fd = -1;
-	ssize_t size_ret;
-	struct ctf_packet_index_file_hdr hdr;
-	char fullpath[PATH_MAX];
-	uint32_t element_len = ctf_packet_index_len(major, minor);
-
-	index_file = zmalloc(sizeof(*index_file));
-	if (!index_file) {
-		PERROR("allocating lttng_index_file");
-		goto error;
-	}
-
-	ret = snprintf(fullpath, sizeof(fullpath), "%s/" DEFAULT_INDEX_DIR,
-			path_name);
-	if (ret < 0) {
-		PERROR("snprintf index path");
-		goto error;
-	}
-
-	/* Create index directory if necessary. */
-	ret = utils_mkdir(fullpath, S_IRWXU | S_IRWXG, uid, gid);
-	if (ret < 0) {
-		if (errno != EEXIST) {
-			PERROR("Index trace directory creation error");
-			goto error;
-		}
-	}
-
-	/*
-	 * For tracefile rotation. We need to unlink the old
-	 * file if present to synchronize with the tail of the
-	 * live viewer which could be working on this same file.
-	 * By doing so, any reference to the old index file
-	 * stays valid even if we re-create a new file with the
-	 * same name afterwards.
-	 */
-	ret = utils_unlink_stream_file(fullpath, stream_name, size, count, uid,
-			gid, DEFAULT_INDEX_FILE_SUFFIX);
-	if (ret < 0 && errno != ENOENT) {
-		goto error;
-	}
-	ret = utils_create_stream_file(fullpath, stream_name, size, count, uid,
-			gid, DEFAULT_INDEX_FILE_SUFFIX);
-	if (ret < 0) {
-		goto error;
-	}
-	fd = ret;
-
-	ctf_packet_index_file_hdr_init(&hdr, major, minor);
-	size_ret = lttng_write(fd, &hdr, sizeof(hdr));
-	if (size_ret < sizeof(hdr)) {
-		PERROR("write index header");
-		goto error;
-	}
-	index_file->fd = fd;
-	index_file->major = major;
-	index_file->minor = minor;
-	index_file->element_len = element_len;
-	urcu_ref_init(&index_file->ref);
-
-	return index_file;
-
-error:
-	if (fd >= 0) {
-		int close_ret;
+#define WRITE_FILE_FLAGS	(O_WRONLY | O_CREAT | O_TRUNC)
+#define READ_ONLY_FILE_FLAGS	O_RDONLY
 
-		close_ret = close(fd);
-		if (close_ret < 0) {
-			PERROR("close index fd");
-		}
-	}
-	free(index_file);
-	return NULL;
-}
-
-struct lttng_index_file *lttng_index_file_create_from_trace_chunk(
+static struct lttng_index_file *_lttng_index_file_create_from_trace_chunk(
 		struct lttng_trace_chunk *chunk,
-		const char *channel_path, char *stream_name,
-		uint64_t stream_file_size, uint64_t stream_count,
+		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 unlink_existing_file)
+		bool unlink_existing_file,
+		int flags)
 {
 	struct lttng_index_file *index_file;
 	enum lttng_trace_chunk_status chunk_status;
@@ -132,8 +51,10 @@ struct lttng_index_file *lttng_index_file_create_from_trace_chunk(
 	char index_file_path[LTTNG_PATH_MAX];
 	const uint32_t element_len = ctf_packet_index_len(index_major,
 			index_minor);
-	const int flags = O_WRONLY | O_CREAT | O_TRUNC;
 	const mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP;
+	const bool acquired_reference = lttng_trace_chunk_get(chunk);
+
+	assert(acquired_reference);
 
 	index_file = zmalloc(sizeof(*index_file));
 	if (!index_file) {
@@ -141,6 +62,7 @@ struct lttng_index_file *lttng_index_file_create_from_trace_chunk(
 		goto error;
 	}
 
+	index_file->trace_chunk = chunk;
 	ret = snprintf(index_directory_path, sizeof(index_directory_path),
 			"%s/" DEFAULT_INDEX_DIR, channel_path);
 	if (ret < 0 || ret >= sizeof(index_directory_path)) {
@@ -149,7 +71,7 @@ struct lttng_index_file *lttng_index_file_create_from_trace_chunk(
 	}
 
 	ret = utils_stream_file_path(index_directory_path, stream_name,
-			stream_file_size, stream_count,
+			stream_file_size, stream_file_index,
 			DEFAULT_INDEX_FILE_SUFFIX,
 			index_file_path, sizeof(index_file_path));
 	if (ret) {
@@ -165,12 +87,14 @@ struct lttng_index_file *lttng_index_file_create_from_trace_chunk(
 		 * stays valid even if we re-create a new file with the
 		 * same name afterwards.
 		 */
-		chunk_status = lttng_trace_chunk_unlink_file(chunk,
-				index_file_path);
-		if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+		chunk_status = lttng_trace_chunk_unlink_file(
+				chunk, index_file_path);
+		if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK &&
+				!(chunk_status == LTTNG_TRACE_CHUNK_STATUS_ERROR &&
+						errno == ENOENT)) {
 			goto error;
 		}
-        }
+	}
 
 	chunk_status = lttng_trace_chunk_open_file(chunk, index_file_path,
 			flags, mode, &fd);
@@ -203,6 +127,31 @@ error:
 	return NULL;
 }
 
+struct lttng_index_file *lttng_index_file_create_from_trace_chunk(
+		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 unlink_existing_file)
+{
+	return _lttng_index_file_create_from_trace_chunk(chunk, channel_path,
+			stream_name, stream_file_size, stream_file_index,
+			index_major, index_minor, unlink_existing_file,
+			WRITE_FILE_FLAGS);
+}
+
+struct lttng_index_file *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)
+{
+	return _lttng_index_file_create_from_trace_chunk(chunk, channel_path,
+			stream_name, stream_file_size, stream_file_index,
+			index_major, index_minor, false,
+			READ_ONLY_FILE_FLAGS);
+}
+
 /*
  * Write index values to the given index file.
  *
@@ -269,97 +218,6 @@ error:
 	return -1;
 }
 
-/*
- * Open index file using a given path, channel name and tracefile count.
- *
- * Return allocated struct lttng_index_file, NULL on error.
- */
-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)
-{
-	struct lttng_index_file *index_file;
-	int ret, read_fd;
-	ssize_t read_len;
-	char fullpath[PATH_MAX];
-	struct ctf_packet_index_file_hdr hdr;
-	uint32_t major, minor, element_len;
-
-	assert(path_name);
-	assert(channel_name);
-
-	index_file = zmalloc(sizeof(*index_file));
-	if (!index_file) {
-		PERROR("allocating lttng_index_file");
-		goto error;
-	}
-
-	if (tracefile_count > 0) {
-		ret = snprintf(fullpath, sizeof(fullpath), "%s/" DEFAULT_INDEX_DIR "/%s_%"
-				PRIu64 DEFAULT_INDEX_FILE_SUFFIX, path_name,
-				channel_name, tracefile_count_current);
-	} else {
-		ret = snprintf(fullpath, sizeof(fullpath), "%s/" DEFAULT_INDEX_DIR "/%s"
-				DEFAULT_INDEX_FILE_SUFFIX, path_name, channel_name);
-	}
-	if (ret < 0) {
-		PERROR("snprintf index path");
-		goto error;
-	}
-
-	DBG("Index opening file %s in read only", fullpath);
-	read_fd = open(fullpath, O_RDONLY);
-	if (read_fd < 0) {
-		PERROR("opening index in read-only");
-		goto error;
-	}
-
-	read_len = lttng_read(read_fd, &hdr, sizeof(hdr));
-	if (read_len < 0) {
-		PERROR("Reading index header");
-		goto error_close;
-	}
-
-	if (be32toh(hdr.magic) != CTF_INDEX_MAGIC) {
-		ERR("Invalid header magic");
-		goto error_close;
-	}
-	major = be32toh(hdr.index_major);
-	minor = be32toh(hdr.index_minor);
-	element_len = be32toh(hdr.packet_index_len);
-
-	if (major != CTF_INDEX_MAJOR) {
-		ERR("Invalid header version");
-		goto error_close;
-	}
-	if (element_len > sizeof(struct ctf_packet_index)) {
-		ERR("Index element length too long");
-		goto error_close;
-	}
-
-	index_file->fd = read_fd;
-	index_file->major = major;
-	index_file->minor = minor;
-	index_file->element_len = element_len;
-	urcu_ref_init(&index_file->ref);
-
-	return index_file;
-
-error_close:
-	if (read_fd >= 0) {
-		int close_ret;
-
-		close_ret = close(read_fd);
-		if (close_ret < 0) {
-			PERROR("close read fd %d", read_fd);
-		}
-	}
-
-error:
-	free(index_file);
-	return NULL;
-}
-
 void lttng_index_file_get(struct lttng_index_file *index_file)
 {
 	urcu_ref_get(&index_file->ref);
@@ -373,6 +231,7 @@ static void lttng_index_file_release(struct urcu_ref *ref)
 	if (close(index_file->fd)) {
 		PERROR("close index fd");
 	}
+	lttng_trace_chunk_put(index_file->trace_chunk);
 	free(index_file);
 }