Priority heap: fix insert

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

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 730e2a3ae1fee0a7613475d38e1bedd22d0649a3..29f95fec1bcae16ba7a8dcc53665c51d18d7729b 100644 (file)
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -52,7 +52,9 @@
 
 extern int yydebug;
 
+static
 struct trace_descriptor *ctf_open_trace(const char *path, int flags);
+static
 void ctf_close_trace(struct trace_descriptor *descriptor);
 
 static
@@ -85,6 +87,32 @@ struct format ctf_format = {
        .close_trace = ctf_close_trace,
 };
 
+static
+void ctf_update_timestamp(struct ctf_stream *stream,
+                         struct definition_integer *integer_definition)
+{
+       struct declaration_integer *integer_declaration =
+               integer_definition->declaration;
+       uint64_t oldval, newval, updateval;
+
+       if (integer_declaration->len == 64) {
+               stream->timestamp = integer_definition->value._unsigned;
+               return;
+       }
+       /* keep low bits */
+       oldval = stream->timestamp;
+       oldval &= (1ULL << integer_declaration->len) - 1;
+       newval = integer_definition->value._unsigned;
+       /* Test for overflow by comparing low bits */
+       if (newval < oldval)
+               newval += 1ULL << integer_declaration->len;
+       /* updateval contains old high bits, and new low bits (sum) */
+       updateval = stream->timestamp;
+       updateval &= ~((1ULL << integer_declaration->len) - 1);
+       updateval += newval;
+       stream->timestamp = updateval;
+}
+
 static
 int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
 {
@@ -130,12 +158,12 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
                /* lookup timestamp */
                integer_definition = lookup_integer(&stream_class->event_header->p, "timestamp", FALSE);
                if (integer_definition) {
-                       stream->timestamp = integer_definition->value._unsigned;
+                       ctf_update_timestamp(stream, integer_definition);
                } else {
                        if (variant) {
                                integer_definition = lookup_integer(variant, "timestamp", FALSE);
                                if (integer_definition) {
-                                       stream->timestamp = integer_definition->value._unsigned;
+                                       ctf_update_timestamp(stream, integer_definition);
                                }
                        }
                }
@@ -379,7 +407,12 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
                /* Lookup context/packet size in index */
                pos->content_size = index->content_size;
                pos->packet_size = index->packet_size;
-               pos->offset = index->data_offset;
+               if (index->data_offset < index->content_size)
+                       pos->offset = index->data_offset;
+               else {
+                       pos->offset = EOF;
+                       return;
+               }
        }
        /* map new base. Need mapping length from header. */
        pos->base = mmap(NULL, pos->packet_size / CHAR_BIT, pos->prot,
@@ -907,6 +940,7 @@ error:
        return ret;
 }
 
+static
 struct trace_descriptor *ctf_open_trace(const char *path, int flags)
 {
        struct ctf_trace *td;
@@ -945,6 +979,7 @@ void ctf_close_file_stream(struct ctf_file_stream *file_stream)
        close(file_stream->pos.fd);
 }
 
+static
 void ctf_close_trace(struct trace_descriptor *tdp)
 {
        struct ctf_trace *td = container_of(tdp, struct ctf_trace, parent);
@@ -954,7 +989,10 @@ void ctf_close_trace(struct trace_descriptor *tdp)
                for (i = 0; i < td->streams->len; i++) {
                        struct ctf_stream_class *stream;
                        int j;
+
                        stream = g_ptr_array_index(td->streams, i);
+                       if (!stream)
+                               continue;
                        for (j = 0; j < stream->files->len; j++) {
                                struct ctf_file_stream *file_stream;
                                file_stream = g_ptr_array_index(stream->files, j);