Fix: index: use parenthesis around define
[lttng-tools.git] / src / common / index / index.c
index b5591d137c923a97617005f9a85145e09264cba4..52a3c2e3fab9c89e2dcd054b8652f7c9582dcfc5 100644 (file)
@@ -23,6 +23,7 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
+#include <lttng/constant.h>
 #include <common/common.h>
 #include <common/defaults.h>
 #include <common/compat/endian.h>
 
 #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(char *path_name,
-               char *stream_name, int uid, int gid,
-               uint64_t size, uint64_t count, uint32_t major, uint32_t minor)
+#define WRITE_FILE_FLAGS       (O_WRONLY | O_CREAT | O_TRUNC)
+#define READ_ONLY_FILE_FLAGS   O_RDONLY
+
+static 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,
+               int flags)
 {
        struct lttng_index_file *index_file;
+       enum lttng_trace_chunk_status chunk_status;
        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);
+       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);
+
+       assert(acquired_reference);
 
        index_file = zmalloc(sizeof(*index_file));
        if (!index_file) {
-               PERROR("allocating lttng_index_file");
+               PERROR("Failed to allocate lttng_index_file");
                goto error;
        }
 
-       ret = snprintf(fullpath, sizeof(fullpath), "%s/" DEFAULT_INDEX_DIR,
-                       path_name);
-       if (ret < 0) {
-               PERROR("snprintf index path");
+       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)) {
+               ERR("Failed to format index directory 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");
+       ret = utils_stream_file_path(index_directory_path, stream_name,
+                       stream_file_size, stream_file_index,
+                       DEFAULT_INDEX_FILE_SUFFIX,
+                       index_file_path, sizeof(index_file_path));
+       if (ret) {
+               goto error;
+       }
+
+       if (unlink_existing_file) {
+               /*
+                * 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.
+                */
+               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;
                }
        }
 
-       /*
-        * 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) {
+       chunk_status = lttng_trace_chunk_open_file(chunk, index_file_path,
+                       flags, mode, &fd);
+       if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
                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;
-
-       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, index_major, index_minor);
        size_ret = lttng_write(fd, &hdr, sizeof(hdr));
        if (size_ret < sizeof(hdr)) {
-               PERROR("write index header");
-               ret = -1;
+               PERROR("Failed to write index header");
                goto error;
        }
        index_file->fd = fd;
-       index_file->major = major;
-       index_file->minor = minor;
+       index_file->major = index_major;
+       index_file->minor = index_minor;
        index_file->element_len = element_len;
        urcu_ref_init(&index_file->ref);
 
@@ -109,17 +118,40 @@ struct lttng_index_file *lttng_index_file_create(char *path_name,
 
 error:
        if (fd >= 0) {
-               int close_ret;
-
-               close_ret = close(fd);
-               if (close_ret < 0) {
-                       PERROR("close index fd");
+               ret = close(fd);
+               if (ret < 0) {
+                       PERROR("Failed to close file descriptor of index file");
                }
        }
        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, 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.
  *
@@ -128,12 +160,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,106 +204,18 @@ int lttng_index_file_read(const struct lttng_index_file *index_file,
        }
 
        ret = lttng_read(fd, element, len);
-       if (ret < len) {
-               PERROR("read index file");
-               goto error;
-       }
-       return 0;
-
-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");
+               PERROR("read index file");
                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");
-               }
+       if (ret < len) {
+               ERR("lttng_read expected %zu, returned %zd", len, ret);
                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;
-       }
-
-       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);
-               }
-       }
-       ret = -1;
+       return 0;
 
 error:
-       free(index_file);
-       return NULL;
+       return -1;
 }
 
 void lttng_index_file_get(struct lttng_index_file *index_file)
@@ -283,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);
 }
 
This page took 0.031611 seconds and 4 git commands to generate.