X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Findex%2Findex.c;h=5a6fe3d8608bf56def8212199dcaaac540def172;hp=694e3d18698dd3dfe142bc9e199026a9a8f6c9b4;hb=c35f9726a22f1d93e14589688d830efccda196f3;hpb=d295668767ac8234e83984e1812d342d03293d88

diff --git a/src/common/index/index.c b/src/common/index/index.c
index 694e3d186..5a6fe3d86 100644
--- a/src/common/index/index.c
+++ b/src/common/index/index.c
@@ -31,95 +31,10 @@
 
 #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;
-
-		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(
 		struct lttng_trace_chunk *chunk,
 		const char *channel_path, char *stream_name,
-		uint64_t stream_file_size, uint64_t stream_count,
+		uint64_t stream_file_size, uint64_t stream_file_index,
 		uint32_t index_major, uint32_t index_minor,
 		bool unlink_existing_file)
 {
@@ -134,6 +49,9 @@ struct lttng_index_file *lttng_index_file_create_from_trace_chunk(
 			index_minor);
 	const int flags = O_WRONLY | O_CREAT | O_TRUNC;
 	const mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP;
+	bool acquired_reference = lttng_trace_chunk_get(chunk);
+
+	assert(acquired_reference);
 
 	index_file = zmalloc(sizeof(*index_file));
 	if (!index_file) {
@@ -141,6 +59,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 +68,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 +84,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);
@@ -373,6 +294,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);
 }