Remove outdated Python bindings test
[babeltrace.git] / formats / ctf / ctf.c
index 794e428c51d069a97354826b17f0f391afbafcbf..122b708f6e74fdfb0b6b6241442c96aca4eb9a39 100644 (file)
@@ -471,6 +471,19 @@ int ctf_read_event(struct bt_stream_pos *ppos, struct ctf_stream_definition *str
         */
        if (unlikely(pos->offset == EOF))
                return EOF;
+
+       /* Stream is inactive for now (live reading). */
+       if (unlikely(pos->content_size == 0))
+               return EAGAIN;
+
+       /*
+        * Packet seeked to by ctf_pos_get_event() only contains
+        * headers, no event. Consider stream as inactive (live
+        * reading).
+        */
+       if (unlikely(pos->data_offset == pos->content_size))
+               return EAGAIN;
+
        assert(pos->offset < pos->content_size);
 
        /* Read event header */
@@ -618,6 +631,107 @@ error:
        return ret;
 }
 
+/*
+ * One side-effect of this function is to unmap pos mmap base if one is
+ * mapped.
+ */
+static
+int find_data_offset(struct ctf_stream_pos *pos,
+               struct ctf_file_stream *file_stream,
+               struct packet_index *packet_index)
+{
+       uint64_t packet_map_len = DEFAULT_HEADER_LEN, tmp_map_len;
+       struct stat filestats;
+       size_t filesize;
+       int ret;
+
+       pos = &file_stream->pos;
+
+       ret = fstat(pos->fd, &filestats);
+       if (ret < 0)
+               return ret;
+       filesize = filestats.st_size;
+
+       /* Deal with empty files */
+       if (!filesize) {
+               return 0;
+       }
+
+begin:
+       if (filesize - pos->mmap_offset < (packet_map_len >> LOG2_CHAR_BIT)) {
+               packet_map_len = (filesize - pos->mmap_offset) << LOG2_CHAR_BIT;
+       }
+
+       if (pos->base_mma) {
+               /* unmap old base */
+               ret = munmap_align(pos->base_mma);
+               if (ret) {
+                       fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
+                                       strerror(errno));
+                       return ret;
+               }
+               pos->base_mma = NULL;
+       }
+       /* map new base. Need mapping length from header. */
+       pos->base_mma = mmap_align(packet_map_len >> LOG2_CHAR_BIT, PROT_READ,
+                       MAP_PRIVATE, pos->fd, pos->mmap_offset);
+       assert(pos->base_mma != MAP_FAILED);
+
+       pos->content_size = packet_map_len;
+       pos->packet_size = packet_map_len;
+       pos->offset = 0;        /* Position of the packet header */
+
+       /* update trace_packet_header and stream_packet_context */
+       if (pos->prot == PROT_READ && file_stream->parent.trace_packet_header) {
+               /* Read packet header */
+               ret = generic_rw(&pos->parent, &file_stream->parent.trace_packet_header->p);
+               if (ret) {
+                       if (ret == -EFAULT)
+                               goto retry;
+               }
+       }
+       if (pos->prot == PROT_READ && file_stream->parent.stream_packet_context) {
+               /* Read packet context */
+               ret = generic_rw(&pos->parent, &file_stream->parent.stream_packet_context->p);
+               if (ret) {
+                       if (ret == -EFAULT)
+                               goto retry;
+               }
+       }
+       packet_index->data_offset = pos->offset;
+
+       /* unmap old base */
+       ret = munmap_align(pos->base_mma);
+       if (ret) {
+               fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
+                               strerror(errno));
+               return ret;
+       }
+       pos->base_mma = NULL;
+
+       return 0;
+
+       /* Retry with larger mapping */
+retry:
+       if (packet_map_len == ((filesize - pos->mmap_offset) << LOG2_CHAR_BIT)) {
+               /*
+                * Reached EOF, but still expecting header/context data.
+                */
+               fprintf(stderr, "[error] Reached end of file, but still expecting header or context fields.\n");
+               return -EFAULT;
+       }
+       /* Double the mapping len, and retry */
+       tmp_map_len = packet_map_len << 1;
+       if (tmp_map_len >> 1 != packet_map_len) {
+               /* Overflow */
+               fprintf(stderr, "[error] Packet mapping length overflow\n");
+               return -EFAULT;
+       }
+       packet_map_len = tmp_map_len;
+       goto begin;
+}
+
+
 int ctf_init_pos(struct ctf_stream_pos *pos, struct bt_trace_descriptor *trace,
                int fd, int open_flags)
 {
@@ -836,14 +950,21 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence)
                                struct packet_index,
                                pos->cur_index);
                file_stream->parent.real_timestamp = packet_index->timestamp_begin;
-               pos->mmap_offset = packet_index->offset;
 
                /* Lookup context/packet size in index */
+               if (packet_index->data_offset == -1) {
+                       ret = find_data_offset(pos, file_stream, packet_index);
+                       if (ret < 0) {
+                               return;
+                       }
+               }
                pos->content_size = packet_index->content_size;
                pos->packet_size = packet_index->packet_size;
-               if (packet_index->data_offset < packet_index->content_size) {
+               pos->mmap_offset = packet_index->offset;
+               pos->data_offset = packet_index->data_offset;
+               if (pos->data_offset < packet_index->content_size) {
                        pos->offset = 0;        /* will read headers */
-               } else if (packet_index->data_offset == packet_index->content_size) {
+               } else if (pos->data_offset == packet_index->content_size) {
                        /* empty packet */
                        pos->offset = packet_index->data_offset;
                        whence = SEEK_CUR;
@@ -1693,7 +1814,6 @@ int import_stream_packet_index(struct ctf_trace *td,
        struct ctf_packet_index ctf_index;
        struct ctf_packet_index_file_hdr index_hdr;
        struct packet_index index;
-       int index_read;
        int ret = 0;
        int first_packet = 1;
        size_t len;
@@ -1727,8 +1847,8 @@ int import_stream_packet_index(struct ctf_trace *td,
                goto error;
        }
 
-       while ((index_read = fread(&ctf_index, index_hdr.packet_index_len, 1,
-                                       pos->index_fp)) == 1) {
+       while (fread(&ctf_index, index_hdr.packet_index_len, 1,
+                       pos->index_fp) == 1) {
                uint64_t stream_id;
 
                memset(&index, 0, sizeof(index));
@@ -1739,6 +1859,7 @@ int import_stream_packet_index(struct ctf_trace *td,
                index.timestamp_end = be64toh(ctf_index.timestamp_end);
                index.events_discarded = be64toh(ctf_index.events_discarded);
                index.events_discarded_len = 64;
+               index.data_offset = -1;
                stream_id = be64toh(ctf_index.stream_id);
 
                if (!first_packet) {
@@ -2072,6 +2193,7 @@ void ctf_init_mmap_pos(struct ctf_stream_pos *pos,
        pos->flags = MAP_PRIVATE;
        pos->parent.rw_table = read_dispatch_table;
        pos->parent.event_cb = ctf_read_event;
+       pos->priv = mmap_info->priv;
 }
 
 static
@@ -2269,10 +2391,12 @@ int ctf_close_file_stream(struct ctf_file_stream *file_stream)
                fprintf(stderr, "Error on ctf_fini_pos\n");
                return -1;
        }
-       ret = close(file_stream->pos.fd);
-       if (ret) {
-               perror("Error closing file fd");
-               return -1;
+       if (file_stream->pos.fd >= 0) {
+               ret = close(file_stream->pos.fd);
+               if (ret) {
+                       perror("Error closing file fd");
+                       return -1;
+               }
        }
        return 0;
 }
@@ -2304,15 +2428,19 @@ int ctf_close_trace(struct bt_trace_descriptor *tdp)
                }
        }
        ctf_destroy_metadata(td);
-       ret = close(td->dirfd);
-       if (ret) {
-               perror("Error closing dirfd");
-               return ret;
+       if (td->dirfd >= 0) {
+               ret = close(td->dirfd);
+               if (ret) {
+                       perror("Error closing dirfd");
+                       return ret;
+               }
        }
-       ret = closedir(td->dir);
-       if (ret) {
-               perror("Error closedir");
-               return ret;
+       if (td->dir) {
+               ret = closedir(td->dir);
+               if (ret) {
+                       perror("Error closedir");
+                       return ret;
+               }
        }
        free(td->metadata_string);
        g_free(td);
This page took 0.026126 seconds and 4 git commands to generate.