X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Findex%2Findex.c;h=35cff533c59150171fa28ec880b473cc1cf3f784;hb=6c1c0768320135c6936c371b09731851b508c023;hp=2946f7bab3335e5456d9628d9e0a3c6707e0eca6;hpb=50adc26400482c07210afcda8ef1d3322f75871d;p=lttng-tools.git

diff --git a/src/common/index/index.c b/src/common/index/index.c
index 2946f7bab..35cff533c 100644
--- a/src/common/index/index.c
+++ b/src/common/index/index.c
@@ -17,11 +17,15 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <fcntl.h>
 
 #include <common/common.h>
 #include <common/defaults.h>
+#include <common/compat/endian.h>
 #include <common/utils.h>
 
 #include "index.h"
@@ -50,7 +54,7 @@ int index_create_file(char *path_name, char *stream_name, int uid, int gid,
 	ret = run_as_mkdir(fullpath, S_IRWXU | S_IRWXG, uid, gid);
 	if (ret < 0) {
 		if (ret != -EEXIST) {
-			ERR("Index trace directory creation error");
+			PERROR("Index trace directory creation error");
 			goto error;
 		}
 	}
@@ -65,7 +69,7 @@ int index_create_file(char *path_name, char *stream_name, int uid, int gid,
 	hdr.magic = htobe32(CTF_INDEX_MAGIC);
 	hdr.index_major = htobe32(CTF_INDEX_MAJOR);
 	hdr.index_minor = htobe32(CTF_INDEX_MINOR);
-	hdr.packet_index_len = sizeof(struct ctf_packet_index);
+	hdr.packet_index_len = htobe32(sizeof(struct ctf_packet_index));
 
 	size_ret = lttng_write(fd, &hdr, sizeof(hdr));
 	if (size_ret < sizeof(hdr)) {
@@ -98,13 +102,91 @@ ssize_t index_write(int fd, struct ctf_packet_index *index, size_t len)
 {
 	ssize_t ret;
 
-	assert(fd >= 0);
 	assert(index);
 
+	if (fd < 0) {
+		ret = -EINVAL;
+		goto error;
+	}
+
 	ret = lttng_write(fd, index, len);
 	if (ret < len) {
 		PERROR("writing index file");
 	}
 
+error:
+	return ret;
+}
+
+/*
+ * Open index file using a given path, channel name and tracefile count.
+ *
+ * Return read only FD on success or else a negative value.
+ */
+int index_open(const char *path_name, const char *channel_name,
+		uint64_t tracefile_count, uint64_t tracefile_count_current)
+{
+	int ret, read_fd;
+	ssize_t read_len;
+	char fullpath[PATH_MAX];
+	struct ctf_packet_index_file_hdr hdr;
+
+	assert(path_name);
+	assert(channel_name);
+
+	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) {
+		if (errno == ENOENT) {
+			ret = -ENOENT;
+		} else {
+			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;
+	}
+	if (be32toh(hdr.index_major) != CTF_INDEX_MAJOR ||
+			be32toh(hdr.index_minor) != CTF_INDEX_MINOR) {
+		ERR("Invalid header version");
+		goto error_close;
+	}
+
+	return read_fd;
+
+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);
+		}
+	}
+	ret = -1;
+
+error:
 	return ret;
 }