Free the callbacks on iter_destroy

[babeltrace.git] / formats / ctf / ctf.c

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index fee9a5578d809de68f233c2b855980a6f1fb0173..0d1418c1b33cf7bc471c6a692e69309cd7729bff 100644 (file)
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -21,7 +21,7 @@
 #include <babeltrace/format.h>
 #include <babeltrace/ctf/types.h>
 #include <babeltrace/ctf/metadata.h>
-#include <babeltrace/babeltrace.h>
+#include <babeltrace/babeltrace-internal.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <uuid/uuid.h>
@@ -97,7 +97,7 @@ void ctf_update_timestamp(struct ctf_stream *stream,
                integer_definition->declaration;
        uint64_t oldval, newval, updateval;
 
-       if (integer_declaration->len == 64) {
+       if (unlikely(integer_declaration->len == 64)) {
                stream->timestamp = integer_definition->value._unsigned;
                return;
        }
@@ -125,16 +125,19 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
        uint64_t id = 0;
        int ret;
 
-       if (pos->offset == EOF)
+       ctf_pos_get_event(pos);
+
+       if (unlikely(pos->offset == EOF))
                return EOF;
+       assert(pos->offset < pos->content_size);
 
        /* Read event header */
-       if (stream->stream_event_header) {
+       if (likely(stream->stream_event_header)) {
                struct definition_integer *integer_definition;
                struct definition *variant;
 
                ret = generic_rw(ppos, &stream->stream_event_header->p);
-               if (ret)
+               if (unlikely(ret))
                        goto error;
                /* lookup event id */
                integer_definition = lookup_integer(&stream->stream_event_header->p, "id", FALSE);
@@ -156,6 +159,7 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
                                id = integer_definition->value._unsigned;
                        }
                }
+               stream->event_id = id;
 
                /* lookup timestamp */
                stream->has_timestamp = 0;
@@ -181,12 +185,12 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
                        goto error;
        }
 
-       if (id >= stream_class->events_by_id->len) {
+       if (unlikely(id >= stream_class->events_by_id->len)) {
                fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id);
                return -EINVAL;
        }
        event = g_ptr_array_index(stream->events_by_id, id);
-       if (!event) {
+       if (unlikely(!event)) {
                fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
                return -EINVAL;
        }
@@ -199,7 +203,7 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
        }
 
        /* Read event payload */
-       if (event->event_fields) {
+       if (likely(event->event_fields)) {
                ret = generic_rw(ppos, &event->event_fields->p);
                if (ret)
                        goto error;
@@ -217,35 +221,13 @@ int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream)
 {
        struct ctf_stream_class *stream_class = stream->stream_class;
        struct ctf_stream_event *event;
-       uint64_t id = 0;
+       uint64_t id;
        int ret;
 
-       /* print event header */
-       if (stream->stream_event_header) {
-               struct definition_integer *integer_definition;
-               struct definition *variant;
-
-               /* lookup event id */
-               integer_definition = lookup_integer(&stream->stream_event_header->p, "id", FALSE);
-               if (integer_definition) {
-                       id = integer_definition->value._unsigned;
-               } else {
-                       struct definition_enum *enum_definition;
-
-                       enum_definition = lookup_enum(&stream->stream_event_header->p, "id", FALSE);
-                       if (enum_definition) {
-                               id = enum_definition->integer->value._unsigned;
-                       }
-               }
-
-               variant = lookup_variant(&stream->stream_event_header->p, "v");
-               if (variant) {
-                       integer_definition = lookup_integer(variant, "id", FALSE);
-                       if (integer_definition) {
-                               id = integer_definition->value._unsigned;
-                       }
-               }
+       id = stream->event_id;
 
+       /* print event header */
+       if (likely(stream->stream_event_header)) {
                ret = generic_rw(pos, &stream->stream_event_header->p);
                if (ret)
                        goto error;
@@ -258,12 +240,12 @@ int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream)
                        goto error;
        }
 
-       if (id >= stream_class->events_by_id->len) {
+       if (unlikely(id >= stream_class->events_by_id->len)) {
                fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id);
                return -EINVAL;
        }
        event = g_ptr_array_index(stream->events_by_id, id);
-       if (!event) {
+       if (unlikely(!event)) {
                fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
                return -EINVAL;
        }
@@ -276,7 +258,7 @@ int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream)
        }
 
        /* Read and print event payload */
-       if (event->event_fields) {
+       if (likely(event->event_fields)) {
                ret = generic_rw(pos, &event->event_fields->p);
                if (ret)
                        goto error;
@@ -390,8 +372,11 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
                assert(off >= 0);
                pos->offset = 0;
        } else {
+       read_next_packet:
                switch (whence) {
                case SEEK_CUR:
+                       if (pos->offset == EOF)
+                               return;
                        /* The reader will expect us to skip padding */
                        assert(pos->offset + offset == pos->content_size);
                        ++pos->cur_index;
@@ -415,8 +400,13 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
                file_stream->parent.timestamp = index->timestamp_begin;
                pos->content_size = index->content_size;
                pos->packet_size = index->packet_size;
-               if (index->data_offset <= index->content_size) {
+               if (index->data_offset < index->content_size) {
                        pos->offset = 0;        /* will read headers */
+               } else if (index->data_offset == index->content_size) {
+                       /* empty packet */
+                       pos->offset = index->data_offset;
+                       offset = 0;
+                       goto read_next_packet;
                } else {
                        pos->offset = EOF;
                        return;
@@ -568,10 +558,19 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
                toread -= readlen;
                if (!toread) {
                        ret = 0;        /* continue reading next packet */
-                       break;
+                       goto read_padding;
                }
        }
        return ret;
+
+read_padding:
+       toread = (header.packet_size - header.content_size) / CHAR_BIT;
+       ret = fseek(in, toread, SEEK_CUR);
+       if (ret < 0) {
+               fprintf(stdout, "[warning] Missing padding at end of file\n");
+               ret = 0;
+       }
+       return ret;
 }
 
 static