Move `src/plugins/comp-logging.h` -> `src/logging/comp-logging.h`

[babeltrace.git] / src / plugins / ctf / fs-src / data-stream-file.c

diff --git a/src/plugins/ctf/fs-src/data-stream-file.c b/src/plugins/ctf/fs-src/data-stream-file.c
index b4022c32f5804689e0e7886fab82001c97d34650..3a82da3046ffdf62d1c6d85d074c6a4c0316a074 100644 (file)
--- a/src/plugins/ctf/fs-src/data-stream-file.c
+++ b/src/plugins/ctf/fs-src/data-stream-file.c
@@ -25,7 +25,7 @@
 #define BT_COMP_LOG_SELF_COMP (ds_file->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (ds_file->log_level)
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/DS"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -48,6 +48,7 @@
 static inline
 size_t remaining_mmap_bytes(struct ctf_fs_ds_file *ds_file)
 {
+       BT_ASSERT(ds_file->mmap_len >= ds_file->request_offset);
        return ds_file->mmap_len - ds_file->request_offset;
 }
 
@@ -138,7 +139,10 @@ enum bt_msg_iter_medium_status medop_request_bytes(
                goto end;
        }
 
-       /* Check if we have at least one memory-mapped byte left */
+       /*
+        * Check if we have at least one memory-mapped byte left. If we don't,
+        * mmap the next file.
+        */
        if (remaining_mmap_bytes(ds_file) == 0) {
                /* Are we at the end of the file? */
                if (ds_file->mmap_offset >= ds_file->file->size) {
@@ -163,6 +167,7 @@ enum bt_msg_iter_medium_status medop_request_bytes(
        }
 
        *buffer_sz = MIN(remaining_mmap_bytes(ds_file), request_sz);
+       BT_ASSERT(ds_file->mmap_addr);
        *buffer_addr = ((uint8_t *) ds_file->mmap_addr) + ds_file->request_offset;
        ds_file->request_offset += *buffer_sz;
        goto end;
@@ -206,7 +211,7 @@ enum bt_msg_iter_medium_status medop_seek(enum bt_msg_iter_seek_whence whence,
        enum bt_msg_iter_medium_status ret =
                        BT_MSG_ITER_MEDIUM_STATUS_OK;
        struct ctf_fs_ds_file *ds_file = data;
-       off_t file_size = ds_file->file->size;
+       off_t offset_in_mapping, file_size = ds_file->file->size;
 
        if (whence != BT_MSG_ITER_SEEK_WHENCE_SET ||
                offset < 0 || offset > file_size) {
@@ -217,16 +222,18 @@ enum bt_msg_iter_medium_status medop_seek(enum bt_msg_iter_seek_whence whence,
                goto end;
        }
 
+       /* If there is no current mapping, map the right file directly. */
+       if (!ds_file->mmap_addr) {
+               goto map_requested_offset;
+       }
+
        /*
         * Determine whether or not the destination is contained within the
         * current mapping.
         */
-       if (ds_file->mmap_addr && (offset < ds_file->mmap_offset ||
-                       offset >= ds_file->mmap_offset + ds_file->mmap_len)) {
+       if (offset < ds_file->mmap_offset ||
+                       offset >= ds_file->mmap_offset + ds_file->mmap_len) {
                int unmap_ret;
-               off_t offset_in_mapping = offset %
-                       bt_common_get_page_size(ds_file->log_level);
-
                BT_COMP_LOGD("Medium seek request cannot be accomodated by the current "
                                "file mapping: offset=%jd, mmap-offset=%jd, "
                                "mmap-len=%zu", offset, ds_file->mmap_offset,
@@ -236,17 +243,24 @@ enum bt_msg_iter_medium_status medop_seek(enum bt_msg_iter_seek_whence whence,
                        ret = BT_MSG_ITER_MEDIUM_STATUS_ERROR;
                        goto end;
                }
-
-               ds_file->mmap_offset = offset - offset_in_mapping;
-               ds_file->request_offset = offset_in_mapping;
-               ret = ds_file_mmap_next(ds_file);
-               if (ret != BT_MSG_ITER_MEDIUM_STATUS_OK) {
-                       goto end;
-               }
+               goto map_requested_offset;
        } else {
                ds_file->request_offset = offset - ds_file->mmap_offset;
+               goto test_end;
+       }
+
+map_requested_offset:
+       offset_in_mapping = offset %
+               bt_common_get_page_size(ds_file->log_level);
+
+       ds_file->mmap_offset = offset - offset_in_mapping;
+       ds_file->request_offset = offset_in_mapping;
+       ret = ds_file_mmap_next(ds_file);
+       if (ret != BT_MSG_ITER_MEDIUM_STATUS_OK) {
+               goto end;
        }
 
+test_end:
        ds_file->end_reached = (offset == file_size);
 end:
        return ret;
@@ -282,7 +296,7 @@ struct ctf_fs_ds_index *build_index_from_idx_file(
        const char *mmap_begin = NULL, *file_pos = NULL;
        const struct ctf_packet_index_file_hdr *header = NULL;
        struct ctf_fs_ds_index *index = NULL;
-       struct ctf_fs_ds_index_entry *index_entry = NULL;
+       struct ctf_fs_ds_index_entry *index_entry = NULL, *prev_index_entry = NULL;
        uint64_t total_packets_size = 0;
        size_t file_index_entry_size;
        size_t file_entry_count;
@@ -394,10 +408,10 @@ struct ctf_fs_ds_index *build_index_from_idx_file(
                index_entry->packet_size = packet_size;
 
                index_entry->offset = be64toh(file_index->offset);
-               if (i != 0 && index_entry->offset < (index_entry - 1)->offset) {
+               if (i != 0 && index_entry->offset < prev_index_entry->offset) {
                        BT_COMP_LOGW("Invalid, non-monotonic, packet offset encountered in LTTng trace index file: "
                                "previous offset=%" PRIu64 ", current offset=%" PRIu64,
-                               (index_entry - 1)->offset, index_entry->offset);
+                               prev_index_entry->offset, index_entry->offset);
                        goto error;
                }
 
@@ -431,6 +445,7 @@ struct ctf_fs_ds_index *build_index_from_idx_file(
                file_pos += file_index_entry_size;
 
                g_ptr_array_add(index->entries, index_entry);
+               prev_index_entry = index_entry;
        }
 
        /* Validate that the index addresses the complete stream. */