Move index initialization to ctf-index.h

[lttng-tools.git] / src / common / index / index.c

diff --git a/src/common/index/index.c b/src/common/index/index.c
index b481badb1d6556e2f6f1807264d33e81e6be41b2..0935d702dccea0b2fd60ea4de2baa3babd9848f3 100644 (file)
--- a/src/common/index/index.c
+++ b/src/common/index/index.c
@@ -35,7 +35,7 @@
  *
  * Return allocated struct lttng_index_file, NULL on error.
  */
-struct lttng_index_file *lttng_index_file_create(char *path_name,
+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)
 {
@@ -88,15 +88,10 @@ struct lttng_index_file *lttng_index_file_create(char *path_name,
        }
        fd = ret;
 
-       hdr.magic = htobe32(CTF_INDEX_MAGIC);
-       hdr.index_major = htobe32(major);
-       hdr.index_minor = htobe32(minor);
-       hdr.packet_index_len = htobe32(element_len);
-
+       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");
-               ret = -1;
                goto error;
        }
        index_file->fd = fd;
@@ -128,12 +123,16 @@ error:
 int lttng_index_file_write(const struct lttng_index_file *index_file,
                const struct ctf_packet_index *element)
 {
+       int fd;
+       size_t len;
        ssize_t ret;
-       int fd = index_file->fd;
-       size_t len = index_file->element_len;
 
+       assert(index_file);
        assert(element);
 
+       fd = index_file->fd;
+       len = index_file->element_len;
+
        if (fd < 0) {
                goto error;
        }
@@ -168,10 +167,14 @@ int lttng_index_file_read(const struct lttng_index_file *index_file,
        }
 
        ret = lttng_read(fd, element, len);
-       if (ret < len) {
+       if (ret < 0) {
                PERROR("read index file");
                goto error;
        }
+       if (ret < len) {
+               ERR("lttng_read expected %zu, returned %zd", len, ret);
+               goto error;
+       }
        return 0;
 
 error:
@@ -219,11 +222,7 @@ struct lttng_index_file *lttng_index_file_open(const char *path_name,
        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");
-               }
+               PERROR("opening index in read-only");
                goto error;
        }
 
@@ -267,7 +266,6 @@ error_close:
                        PERROR("close read fd %d", read_fd);
                }
        }
-       ret = -1;
 
 error:
        free(index_file);