X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Findex%2Findex.c;h=540294a5eae9f44e38328688e8f693567f8763b3;hb=cc280027af4d65437a30613bb63421ae8d7b199a;hp=52a3c2e3fab9c89e2dcd054b8652f7c9582dcfc5;hpb=2ef0da38417d17ed7e485e92572d234fd9e021b3;p=lttng-tools.git

diff --git a/src/common/index/index.c b/src/common/index/index.c
index 52a3c2e3f..540294a5e 100644
--- a/src/common/index/index.c
+++ b/src/common/index/index.c
@@ -49,10 +49,9 @@ static struct lttng_index_file *_lttng_index_file_create_from_trace_chunk(
 	struct ctf_packet_index_file_hdr hdr;
 	char index_directory_path[LTTNG_PATH_MAX];
 	char index_file_path[LTTNG_PATH_MAX];
-	const uint32_t element_len = ctf_packet_index_len(index_major,
-			index_minor);
 	const mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP;
 	const bool acquired_reference = lttng_trace_chunk_get(chunk);
+	const char *separator;
 
 	assert(acquired_reference);
 
@@ -63,8 +62,13 @@ static struct lttng_index_file *_lttng_index_file_create_from_trace_chunk(
 	}
 
 	index_file->trace_chunk = chunk;
+	if (channel_path[0] == '\0') {
+		separator = "";
+	} else {
+		separator = "/";
+	}
 	ret = snprintf(index_directory_path, sizeof(index_directory_path),
-			"%s/" DEFAULT_INDEX_DIR, channel_path);
+			"%s%s" DEFAULT_INDEX_DIR, channel_path, separator);
 	if (ret < 0 || ret >= sizeof(index_directory_path)) {
 		ERR("Failed to format index directory path");
 		goto error;
@@ -102,16 +106,46 @@ static struct lttng_index_file *_lttng_index_file_create_from_trace_chunk(
 		goto error;
 	}
 
-	ctf_packet_index_file_hdr_init(&hdr, index_major, index_minor);
-	size_ret = lttng_write(fd, &hdr, sizeof(hdr));
-	if (size_ret < sizeof(hdr)) {
-		PERROR("Failed to write index header");
-		goto error;
+	if (flags == WRITE_FILE_FLAGS) {
+		ctf_packet_index_file_hdr_init(&hdr, index_major, index_minor);
+		size_ret = lttng_write(fd, &hdr, sizeof(hdr));
+		if (size_ret < sizeof(hdr)) {
+			PERROR("Failed to write index header");
+			goto error;
+		}
+		index_file->element_len = ctf_packet_index_len(index_major, index_minor);
+	} else {
+		uint32_t element_len;
+
+		size_ret = lttng_read(fd, &hdr, sizeof(hdr));
+		if (size_ret < 0) {
+			PERROR("Failed to read index header");
+			goto error;
+		}
+		if (be32toh(hdr.magic) != CTF_INDEX_MAGIC) {
+			ERR("Invalid header magic");
+			goto error;
+		}
+		if (index_major != be32toh(hdr.index_major)) {
+			ERR("Index major number mismatch: %u, expect %u",
+				be32toh(hdr.index_major), index_major);
+			goto error;
+		}
+		if (index_minor != be32toh(hdr.index_minor)) {
+			ERR("Index minor number mismatch: %u, expect %u",
+				be32toh(hdr.index_minor), index_minor);
+			goto error;
+		}
+		element_len = be32toh(hdr.packet_index_len);
+		if (element_len > sizeof(struct ctf_packet_index)) {
+			ERR("Index element length too long");
+			goto error;
+		}
+		index_file->element_len = element_len;
 	}
 	index_file->fd = fd;
 	index_file->major = index_major;
 	index_file->minor = index_minor;
-	index_file->element_len = element_len;
 	urcu_ref_init(&index_file->ref);
 
 	return index_file;
@@ -123,6 +157,7 @@ error:
 			PERROR("Failed to close file descriptor of index file");
 		}
 	}
+	lttng_trace_chunk_put(chunk);
 	free(index_file);
 	return NULL;
 }