API Fix : missing list fields of event decl
[babeltrace.git] / formats / ctf / ctf.c
index 33287524f51d7b7aeb0b533f012cd60423b1469d..1e4e491d2f55e9635db2c004f1e72662b172864c 100644 (file)
 #include <babeltrace/ctf/types.h>
 #include <babeltrace/ctf/metadata.h>
 #include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/ctf/events-internal.h>
+#include <babeltrace/trace-handle-internal.h>
+#include <babeltrace/context-internal.h>
+#include <babeltrace/uuid.h>
+#include <babeltrace/endian.h>
 #include <inttypes.h>
 #include <stdio.h>
-#include <uuid/uuid.h>
 #include <sys/mman.h>
 #include <errno.h>
-#include <endian.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -39,6 +42,8 @@
 #include "metadata/ctf-scanner.h"
 #include "metadata/ctf-parser.h"
 #include "metadata/ctf-ast.h"
+#include "events-private.h"
+#include "memstream.h"
 
 /*
  * We currently simply map a page to read the packet header and packet
  */
 #define MAX_PACKET_HEADER_LEN  (getpagesize() * CHAR_BIT)
 #define WRITE_PACKET_LEN       (getpagesize() * 8 * CHAR_BIT)
-#define UUID_LEN 16    /* uuid by value len */
 
 #ifndef min
 #define min(a, b)      (((a) < (b)) ? (a) : (b))
 #endif
 
+#define NSEC_PER_SEC 1000000000ULL
+
+int opt_clock_raw,
+       opt_clock_seconds,
+       opt_clock_date,
+       opt_clock_gmt;
+
+uint64_t opt_clock_offset;
+
 extern int yydebug;
 
 static
-struct trace_descriptor *ctf_open_trace(const char *collection_path, const char *path, int flags,
-               void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
-                       int whence), FILE *metadata_fp);
+struct trace_descriptor *ctf_open_trace(const char *path, int flags,
+               void (*packet_seek)(struct stream_pos *pos, size_t index,
+                       int whence),
+               FILE *metadata_fp);
 static
 struct trace_descriptor *ctf_open_mmap_trace(
                struct mmap_stream_list *mmap_list,
-               void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, int whence),
+               void (*packet_seek)(struct stream_pos *pos, size_t index,
+                       int whence),
                FILE *metadata_fp);
+static
+void ctf_set_context(struct trace_descriptor *descriptor,
+               struct bt_context *ctx);
+static
+void ctf_set_handle(struct trace_descriptor *descriptor,
+               struct bt_trace_handle *handle);
 
 static
 void ctf_close_trace(struct trace_descriptor *descriptor);
+static
+uint64_t ctf_timestamp_begin(struct trace_descriptor *descriptor,
+               struct bt_trace_handle *handle);
+static
+uint64_t ctf_timestamp_end(struct trace_descriptor *descriptor,
+               struct bt_trace_handle *handle);
 
 static
 rw_dispatch read_dispatch_table[] = {
@@ -96,10 +123,104 @@ struct format ctf_format = {
        .open_trace = ctf_open_trace,
        .open_mmap_trace = ctf_open_mmap_trace,
        .close_trace = ctf_close_trace,
+       .set_context = ctf_set_context,
+       .set_handle = ctf_set_handle,
+       .timestamp_begin = ctf_timestamp_begin,
+       .timestamp_end = ctf_timestamp_end,
 };
 
 static
-void ctf_update_timestamp(struct ctf_stream *stream,
+uint64_t ctf_timestamp_begin(struct trace_descriptor *descriptor,
+               struct bt_trace_handle *handle)
+{
+       struct ctf_trace *tin;
+       uint64_t begin = ULLONG_MAX;
+       int i, j;
+
+       tin = container_of(descriptor, struct ctf_trace, parent);
+
+       if (!tin)
+               goto error;
+
+       /* for each stream_class */
+       for (i = 0; i < tin->streams->len; i++) {
+               struct ctf_stream_declaration *stream_class;
+
+               stream_class = g_ptr_array_index(tin->streams, i);
+               /* for each file_stream */
+               for (j = 0; j < stream_class->streams->len; j++) {
+                       struct ctf_stream_definition *stream;
+                       struct ctf_file_stream *cfs;
+                       struct ctf_stream_pos *stream_pos;
+                       struct packet_index *index;
+
+                       stream = g_ptr_array_index(stream_class->streams, j);
+                       cfs = container_of(stream, struct ctf_file_stream,
+                                       parent);
+                       stream_pos = &cfs->pos;
+
+                       index = &g_array_index(stream_pos->packet_index,
+                                       struct packet_index, 0);
+                       if (index->timestamp_begin < begin)
+                               begin = index->timestamp_begin;
+               }
+       }
+
+       return begin;
+
+error:
+       return -1ULL;
+}
+
+static
+uint64_t ctf_timestamp_end(struct trace_descriptor *descriptor,
+               struct bt_trace_handle *handle)
+{
+       struct ctf_trace *tin;
+       uint64_t end = 0;
+       int i, j;
+
+       tin = container_of(descriptor, struct ctf_trace, parent);
+
+       if (!tin)
+               goto error;
+
+       /* for each stream_class */
+       for (i = 0; i < tin->streams->len; i++) {
+               struct ctf_stream_declaration *stream_class;
+
+               stream_class = g_ptr_array_index(tin->streams, i);
+               /* for each file_stream */
+               for (j = 0; j < stream_class->streams->len; j++) {
+                       struct ctf_stream_definition *stream;
+                       struct ctf_file_stream *cfs;
+                       struct ctf_stream_pos *stream_pos;
+                       struct packet_index *index;
+
+                       stream = g_ptr_array_index(stream_class->streams, j);
+                       cfs = container_of(stream, struct ctf_file_stream,
+                                       parent);
+                       stream_pos = &cfs->pos;
+
+                       index = &g_array_index(stream_pos->packet_index,
+                                       struct packet_index,
+                                       stream_pos->packet_index->len - 1);
+                       if (index->timestamp_end > end)
+                               end = index->timestamp_end;
+               }
+       }
+
+       return end;
+
+error:
+       return -1ULL;
+}
+
+/*
+ * Update stream current timestamp, keep at clock frequency.
+ */
+static
+void ctf_update_timestamp(struct ctf_stream_definition *stream,
                          struct definition_integer *integer_definition)
 {
        struct declaration_integer *integer_declaration =
@@ -121,16 +242,86 @@ void ctf_update_timestamp(struct ctf_stream *stream,
        updateval = stream->timestamp;
        updateval &= ~((1ULL << integer_declaration->len) - 1);
        updateval += newval;
+       stream->prev_timestamp = stream->timestamp;
        stream->timestamp = updateval;
 }
 
+/*
+ * Print timestamp, rescaling clock frequency to nanoseconds and
+ * applying offsets as needed (unix time).
+ */
+void ctf_print_timestamp(FILE *fp,
+                       struct ctf_stream_definition *stream,
+                       uint64_t timestamp)
+{
+       uint64_t ts_sec = 0, ts_nsec;
+
+       if (opt_clock_raw) {
+               ts_nsec = ctf_get_timestamp_raw(stream, timestamp);
+       } else {
+               ts_nsec = ctf_get_timestamp(stream, timestamp);
+       }
+
+       /* Add command-line offset */
+       ts_sec += opt_clock_offset;
+
+       ts_sec += ts_nsec / NSEC_PER_SEC;
+       ts_nsec = ts_nsec % NSEC_PER_SEC;
+
+       if (!opt_clock_seconds) {
+               struct tm tm;
+               time_t time_s = (time_t) ts_sec;
+
+               if (!opt_clock_gmt) {
+                       struct tm *res;
+
+                       res = localtime_r(&time_s, &tm);
+                       if (!res) {
+                               fprintf(stderr, "[warning] Unable to get localtime.\n");
+                               goto seconds;
+                       }
+               } else {
+                       struct tm *res;
+
+                       res = gmtime_r(&time_s, &tm);
+                       if (!res) {
+                               fprintf(stderr, "[warning] Unable to get gmtime.\n");
+                               goto seconds;
+                       }
+               }
+               if (opt_clock_date) {
+                       char timestr[26];
+                       size_t res;
+
+                       /* Print date and time */
+                       res = strftime(timestr, sizeof(timestr),
+                               "%F ", &tm);
+                       if (!res) {
+                               fprintf(stderr, "[warning] Unable to print ascii time.\n");
+                               goto seconds;
+                       }
+                       fprintf(fp, "%s", timestr);
+               }
+               /* Print time in HH:MM:SS.ns */
+               fprintf(fp, "%02d:%02d:%02d.%09" PRIu64,
+                       tm.tm_hour, tm.tm_min, tm.tm_sec, ts_nsec);
+               goto end;
+       }
+seconds:
+       fprintf(fp, "%3" PRIu64 ".%09" PRIu64,
+               ts_sec, ts_nsec);
+
+end:
+       return;
+}
+
 static
-int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
+int ctf_read_event(struct stream_pos *ppos, struct ctf_stream_definition *stream)
 {
        struct ctf_stream_pos *pos =
                container_of(ppos, struct ctf_stream_pos, parent);
-       struct ctf_stream_class *stream_class = stream->stream_class;
-       struct ctf_stream_event *event;
+       struct ctf_stream_declaration *stream_class = stream->stream_class;
+       struct ctf_event_definition *event;
        uint64_t id = 0;
        int ret;
 
@@ -140,6 +331,11 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
 
        ctf_pos_get_event(pos);
 
+       /* save the current position as a restore point */
+       pos->last_offset = pos->offset;
+       /* we just read the event, it is consumed when used by the caller */
+       stream->consumed = 0;
+
        /*
         * This is the EOF check after we've advanced the position in
         * ctf_pos_get_event.
@@ -203,12 +399,12 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
        }
 
        if (unlikely(id >= stream_class->events_by_id->len)) {
-               fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id);
+               fprintf(stderr, "[error] Event id %" PRIu64 " is outside range.\n", id);
                return -EINVAL;
        }
        event = g_ptr_array_index(stream->events_by_id, id);
        if (unlikely(!event)) {
-               fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
+               fprintf(stderr, "[error] Event id %" PRIu64 " is unknown.\n", id);
                return -EINVAL;
        }
 
@@ -229,15 +425,15 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
        return 0;
 
 error:
-       fprintf(stdout, "[error] Unexpected end of stream. Either the trace data stream is corrupted or metadata description does not match data layout.\n");
+       fprintf(stderr, "[error] Unexpected end of stream. Either the trace data stream is corrupted or metadata description does not match data layout.\n");
        return ret;
 }
 
 static
-int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream)
+int ctf_write_event(struct stream_pos *pos, struct ctf_stream_definition *stream)
 {
-       struct ctf_stream_class *stream_class = stream->stream_class;
-       struct ctf_stream_event *event;
+       struct ctf_stream_declaration *stream_class = stream->stream_class;
+       struct ctf_event_definition *event;
        uint64_t id;
        int ret;
 
@@ -258,12 +454,12 @@ int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream)
        }
 
        if (unlikely(id >= stream_class->events_by_id->len)) {
-               fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id);
+               fprintf(stderr, "[error] Event id %" PRIu64 " is outside range.\n", id);
                return -EINVAL;
        }
        event = g_ptr_array_index(stream->events_by_id, id);
        if (unlikely(!event)) {
-               fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
+               fprintf(stderr, "[error] Event id %" PRIu64 " is unknown.\n", id);
                return -EINVAL;
        }
 
@@ -284,7 +480,7 @@ int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream)
        return 0;
 
 error:
-       fprintf(stdout, "[error] Unexpected end of stream. Either the trace data stream is corrupted or metadata description does not match data layout.\n");
+       fprintf(stderr, "[error] Unexpected end of stream. Either the trace data stream is corrupted or metadata description does not match data layout.\n");
        return ret;
 }
 
@@ -317,7 +513,7 @@ void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags)
                pos->parent.rw_table = write_dispatch_table;
                pos->parent.event_cb = ctf_write_event;
                if (fd >= 0)
-                       ctf_move_pos_slow(pos, 0, SEEK_SET);    /* position for write */
+                       ctf_packet_seek(&pos->parent, 0, SEEK_SET);     /* position for write */
                break;
        default:
                assert(0);
@@ -334,7 +530,7 @@ void ctf_fini_pos(struct ctf_stream_pos *pos)
                /* unmap old base */
                ret = munmap(pos->base, pos->packet_size / CHAR_BIT);
                if (ret) {
-                       fprintf(stdout, "[error] Unable to unmap old base: %s.\n",
+                       fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
                                strerror(errno));
                        assert(0);
                }
@@ -342,13 +538,19 @@ void ctf_fini_pos(struct ctf_stream_pos *pos)
        (void) g_array_free(pos->packet_index, TRUE);
 }
 
-void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
+/*
+ * for SEEK_CUR: go to next packet.
+ * for SEEK_POS: go to packet numer (index).
+ */
+void ctf_packet_seek(struct stream_pos *stream_pos, size_t index, int whence)
 {
+       struct ctf_stream_pos *pos =
+               container_of(stream_pos, struct ctf_stream_pos, parent);
        struct ctf_file_stream *file_stream =
                container_of(pos, struct ctf_file_stream, pos);
        int ret;
        off_t off;
-       struct packet_index *index;
+       struct packet_index *packet_index;
 
        if (pos->prot == PROT_WRITE && pos->content_size_loc)
                *pos->content_size_loc = pos->offset;
@@ -357,7 +559,7 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
                /* unmap old base */
                ret = munmap(pos->base, pos->packet_size / CHAR_BIT);
                if (ret) {
-                       fprintf(stdout, "[error] Unable to unmap old base: %s.\n",
+                       fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
                                strerror(errno));
                        assert(0);
                }
@@ -372,11 +574,10 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
                switch (whence) {
                case SEEK_CUR:
                        /* The writer will add padding */
-                       assert(pos->offset + offset == pos->packet_size);
                        pos->mmap_offset += WRITE_PACKET_LEN / CHAR_BIT;
                        break;
                case SEEK_SET:
-                       assert(offset == 0);    /* only seek supported for now */
+                       assert(index == 0);     /* only seek supported for now */
                        pos->cur_index = 0;
                        break;
                default:
@@ -392,37 +593,84 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
        read_next_packet:
                switch (whence) {
                case SEEK_CUR:
-                       if (pos->offset == EOF)
+               {
+                       uint32_t events_discarded_diff;
+
+                       if (pos->offset == EOF) {
                                return;
+                       }
+                       /* For printing discarded event count */
+                       packet_index = &g_array_index(pos->packet_index,
+                                       struct packet_index, pos->cur_index);
+                       events_discarded_diff = packet_index->events_discarded;
+                       file_stream->parent.prev_timestamp_end =
+                                               packet_index->timestamp_end;
+                       if (pos->cur_index > 0) {
+                               packet_index = &g_array_index(pos->packet_index,
+                                               struct packet_index,
+                                               pos->cur_index - 1);
+                               events_discarded_diff -= packet_index->events_discarded;
+                       }
+                       file_stream->parent.events_discarded = events_discarded_diff;
+                       file_stream->parent.prev_timestamp = file_stream->parent.timestamp;
                        /* The reader will expect us to skip padding */
-                       assert(pos->offset + offset == pos->content_size);
                        ++pos->cur_index;
                        break;
+               }
                case SEEK_SET:
-                       assert(offset == 0);    /* only seek supported for now */
-                       pos->cur_index = 0;
+                       pos->cur_index = index;
+                       file_stream->parent.prev_timestamp = 0;
+                       file_stream->parent.prev_timestamp_end = 0;
                        break;
                default:
                        assert(0);
                }
                if (pos->cur_index >= pos->packet_index->len) {
+                       /*
+                        * When a stream reaches the end of the
+                        * file, we need to show the number of
+                        * events discarded ourselves, because
+                        * there is no next event scheduled to
+                        * be printed in the output.
+                        */
+                       if (file_stream->parent.events_discarded) {
+                               /*
+                                * We need to check if we are in trace
+                                * read or called from packet indexing.
+                                * In this last case, the collection is
+                                * not there, so we cannot print the
+                                * timestamps.
+                                */
+                               if ((&file_stream->parent)->stream_class->trace->collection) {
+                                       fflush(stdout);
+                                       fprintf(stderr, "[warning] Tracer discarded %d events at end of stream between [",
+                                                       file_stream->parent.events_discarded);
+                                       ctf_print_timestamp(stderr, &file_stream->parent,
+                                                       file_stream->parent.prev_timestamp);
+                                       fprintf(stderr, "] and [");
+                                       ctf_print_timestamp(stderr, &file_stream->parent,
+                                                       file_stream->parent.prev_timestamp_end);
+                                       fprintf(stderr, "]. You should consider increasing the buffer size.\n");
+                                       fflush(stderr);
+                               }
+                               file_stream->parent.events_discarded = 0;
+                       }
                        pos->offset = EOF;
                        return;
                }
-               index = &g_array_index(pos->packet_index, struct packet_index,
+               packet_index = &g_array_index(pos->packet_index, struct packet_index,
                                       pos->cur_index);
-               pos->mmap_offset = index->offset;
+               pos->mmap_offset = packet_index->offset;
 
                /* Lookup context/packet size in index */
-               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) {
+               file_stream->parent.timestamp = packet_index->timestamp_begin;
+               pos->content_size = packet_index->content_size;
+               pos->packet_size = packet_index->packet_size;
+               if (packet_index->data_offset < packet_index->content_size) {
                        pos->offset = 0;        /* will read headers */
-               } else if (index->data_offset == index->content_size) {
+               } else if (packet_index->data_offset == packet_index->content_size) {
                        /* empty packet */
-                       pos->offset = index->data_offset;
-                       offset = 0;
+                       pos->offset = packet_index->data_offset;
                        whence = SEEK_CUR;
                        goto read_next_packet;
                } else {
@@ -434,7 +682,7 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
        pos->base = mmap(NULL, pos->packet_size / CHAR_BIT, pos->prot,
                         pos->flags, pos->fd, pos->mmap_offset);
        if (pos->base == MAP_FAILED) {
-               fprintf(stdout, "[error] mmap error %s.\n",
+               fprintf(stderr, "[error] mmap error %s.\n",
                        strerror(errno));
                assert(0);
        }
@@ -499,7 +747,7 @@ int check_version(unsigned int major, unsigned int minor)
 
        /* eventually return an error instead of warning */
 warning:
-       fprintf(stdout, "[warning] Unsupported CTF specification version %u.%u. Trying anyway.\n",
+       fprintf(stderr, "[warning] Unsupported CTF specification version %u.%u. Trying anyway.\n",
                major, minor);
        return 0;
 }
@@ -524,19 +772,19 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
                header.packet_size = GUINT32_SWAP_LE_BE(header.packet_size);
        }
        if (header.checksum)
-               fprintf(stdout, "[warning] checksum verification not supported yet.\n");
+               fprintf(stderr, "[warning] checksum verification not supported yet.\n");
        if (header.compression_scheme) {
-               fprintf(stdout, "[error] compression (%u) not supported yet.\n",
+               fprintf(stderr, "[error] compression (%u) not supported yet.\n",
                        header.compression_scheme);
                return -EINVAL;
        }
        if (header.encryption_scheme) {
-               fprintf(stdout, "[error] encryption (%u) not supported yet.\n",
+               fprintf(stderr, "[error] encryption (%u) not supported yet.\n",
                        header.encryption_scheme);
                return -EINVAL;
        }
        if (header.checksum_scheme) {
-               fprintf(stdout, "[error] checksum (%u) not supported yet.\n",
+               fprintf(stderr, "[error] checksum (%u) not supported yet.\n",
                        header.checksum_scheme);
                return -EINVAL;
        }
@@ -546,7 +794,7 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
                memcpy(td->uuid, header.uuid, sizeof(header.uuid));
                CTF_TRACE_SET_FIELD(td, uuid);
        } else {
-               if (uuid_compare(header.uuid, td->uuid))
+               if (babeltrace_uuid_compare(header.uuid, td->uuid))
                        return -EINVAL;
        }
 
@@ -560,7 +808,7 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
                }
                if (babeltrace_debug) {
                        buf[readlen] = '\0';
-                       fprintf(stdout, "[debug] metadata packet read: %s\n",
+                       fprintf(stderr, "[debug] metadata packet read: %s\n",
                                buf);
                }
 
@@ -585,7 +833,7 @@ 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");
+               fprintf(stderr, "[warning] Missing padding at end of file\n");
                ret = 0;
        }
        return ret;
@@ -605,7 +853,7 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
         * because its size includes garbage at the end (after final
         * \0). This is the allocated size, not the actual string size.
         */
-       out = open_memstream(buf, &size);
+       out = babeltrace_open_memstream(buf, &size);
        if (out == NULL) {
                perror("Metadata open_memstream");
                return -errno;
@@ -620,10 +868,16 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
                        break;
                }
        }
-       fclose(out);    /* flush the buffer */
+       /* close to flush the buffer */
+       ret = babeltrace_close_memstream(buf, &size, out);
+       if (ret < 0) {
+               perror("babeltrace_flush_memstream");
+               fclose(in);
+               return -errno;
+       }
        fclose(in);
        /* open for reading */
-       *fp = fmemopen(*buf, strlen(*buf), "rb");
+       *fp = babeltrace_fmemopen(*buf, strlen(*buf), "rb");
        if (!*fp) {
                perror("Metadata fmemopen");
                return -errno;
@@ -633,7 +887,7 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
 
 static
 int ctf_open_trace_metadata_read(struct ctf_trace *td,
-               void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+               void (*packet_seek)(struct stream_pos *pos, size_t index,
                        int whence), FILE *metadata_fp)
 {
        struct ctf_scanner *scanner;
@@ -644,10 +898,10 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td,
 
        metadata_stream = g_new0(struct ctf_file_stream, 1);
 
-       if (move_pos_slow) {
-               metadata_stream->pos.move_pos_slow = move_pos_slow;
+       if (packet_seek) {
+               metadata_stream->pos.packet_seek = packet_seek;
        } else {
-               fprintf(stderr, "[error] move_pos_slow function undefined.\n");
+               fprintf(stderr, "[error] packet_seek function undefined.\n");
                ret = -1;
                goto end_stream;
        }
@@ -658,13 +912,13 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td,
                td->metadata = &metadata_stream->parent;
                metadata_stream->pos.fd = openat(td->dirfd, "metadata", O_RDONLY);
                if (metadata_stream->pos.fd < 0) {
-                       fprintf(stdout, "Unable to open metadata.\n");
+                       fprintf(stderr, "Unable to open metadata.\n");
                        return metadata_stream->pos.fd;
                }
 
                fp = fdopen(metadata_stream->pos.fd, "r");
                if (!fp) {
-                       fprintf(stdout, "[error] Unable to open metadata stream.\n");
+                       fprintf(stderr, "[error] Unable to open metadata stream.\n");
                        perror("Metadata stream open");
                        ret = -errno;
                        goto end_stream;
@@ -686,7 +940,7 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td,
                /* Check text-only metadata header and version */
                nr_items = fscanf(fp, "/* CTF %u.%u", &major, &minor);
                if (nr_items < 2)
-                       fprintf(stdout, "[warning] Ill-shapen or missing \"/* CTF x.y\" header for text-only metadata.\n");
+                       fprintf(stderr, "[warning] Ill-shapen or missing \"/* CTF x.y\" header for text-only metadata.\n");
                if (check_version(major, minor) < 0) {
                        ret = -EINVAL;
                        goto end_packet_read;
@@ -696,33 +950,33 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td,
 
        scanner = ctf_scanner_alloc(fp);
        if (!scanner) {
-               fprintf(stdout, "[error] Error allocating scanner\n");
+               fprintf(stderr, "[error] Error allocating scanner\n");
                ret = -ENOMEM;
                goto end_scanner_alloc;
        }
        ret = ctf_scanner_append_ast(scanner);
        if (ret) {
-               fprintf(stdout, "[error] Error creating AST\n");
+               fprintf(stderr, "[error] Error creating AST\n");
                goto end;
        }
 
        if (babeltrace_debug) {
-               ret = ctf_visitor_print_xml(stdout, 0, &scanner->ast->root);
+               ret = ctf_visitor_print_xml(stderr, 0, &scanner->ast->root);
                if (ret) {
-                       fprintf(stdout, "[error] Error visiting AST for XML output\n");
+                       fprintf(stderr, "[error] Error visiting AST for XML output\n");
                        goto end;
                }
        }
 
-       ret = ctf_visitor_semantic_check(stdout, 0, &scanner->ast->root);
+       ret = ctf_visitor_semantic_check(stderr, 0, &scanner->ast->root);
        if (ret) {
-               fprintf(stdout, "[error] Error in CTF semantic validation %d\n", ret);
+               fprintf(stderr, "[error] Error in CTF semantic validation %d\n", ret);
                goto end;
        }
-       ret = ctf_visitor_construct_metadata(stdout, 0, &scanner->ast->root,
+       ret = ctf_visitor_construct_metadata(stderr, 0, &scanner->ast->root,
                        td, td->byte_order);
        if (ret) {
-               fprintf(stdout, "[error] Error in CTF metadata constructor %d\n", ret);
+               fprintf(stderr, "[error] Error in CTF metadata constructor %d\n", ret);
                goto end;
        }
 end:
@@ -739,11 +993,11 @@ end_stream:
 }
 
 static
-struct ctf_stream_event *create_event_definitions(struct ctf_trace *td,
-                                                 struct ctf_stream *stream,
-                                                 struct ctf_event *event)
+struct ctf_event_definition *create_event_definitions(struct ctf_trace *td,
+                                                 struct ctf_stream_definition *stream,
+                                                 struct ctf_event_declaration *event)
 {
-       struct ctf_stream_event *stream_event = g_new0(struct ctf_stream_event, 1);
+       struct ctf_event_definition *stream_event = g_new0(struct ctf_event_definition, 1);
 
        if (event->context_decl) {
                struct definition *definition =
@@ -767,6 +1021,7 @@ struct ctf_stream_event *create_event_definitions(struct ctf_trace *td,
                                        struct definition_struct, p);
                stream->parent_def_scope = stream_event->event_fields->p.scope;
        }
+       stream_event->stream = stream;
        return stream_event;
 
 error:
@@ -778,9 +1033,9 @@ error:
 }
 
 static
-int create_stream_definitions(struct ctf_trace *td, struct ctf_stream *stream)
+int create_stream_definitions(struct ctf_trace *td, struct ctf_stream_definition *stream)
 {
-       struct ctf_stream_class *stream_class;
+       struct ctf_stream_declaration *stream_class;
        int ret;
        int i;
 
@@ -828,8 +1083,8 @@ int create_stream_definitions(struct ctf_trace *td, struct ctf_stream *stream)
        stream->events_by_id = g_ptr_array_new();
        g_ptr_array_set_size(stream->events_by_id, stream_class->events_by_id->len);
        for (i = 0; i < stream->events_by_id->len; i++) {
-               struct ctf_event *event = g_ptr_array_index(stream_class->events_by_id, i);
-               struct ctf_stream_event *stream_event;
+               struct ctf_event_declaration *event = g_ptr_array_index(stream_class->events_by_id, i);
+               struct ctf_event_definition *stream_event;
 
                if (!event)
                        continue;
@@ -842,7 +1097,7 @@ int create_stream_definitions(struct ctf_trace *td, struct ctf_stream *stream)
 
 error_event:
        for (i = 0; i < stream->events_by_id->len; i++) {
-               struct ctf_stream_event *stream_event = g_ptr_array_index(stream->events_by_id, i);
+               struct ctf_event_definition *stream_event = g_ptr_array_index(stream->events_by_id, i);
                if (stream_event)
                        g_free(stream_event);
        }
@@ -862,7 +1117,7 @@ static
 int create_stream_packet_index(struct ctf_trace *td,
                               struct ctf_file_stream *file_stream)
 {
-       struct ctf_stream_class *stream;
+       struct ctf_stream_declaration *stream;
        int len_index;
        struct ctf_stream_pos *pos;
        struct stat filestats;
@@ -886,7 +1141,7 @@ int create_stream_packet_index(struct ctf_trace *td,
                        /* unmap old base */
                        ret = munmap(pos->base, pos->packet_size / CHAR_BIT);
                        if (ret) {
-                               fprintf(stdout, "[error] Unable to unmap old base: %s.\n",
+                               fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
                                        strerror(errno));
                                return ret;
                        }
@@ -904,6 +1159,7 @@ int create_stream_packet_index(struct ctf_trace *td,
                packet_index.packet_size = 0;
                packet_index.timestamp_begin = 0;
                packet_index.timestamp_end = 0;
+               packet_index.events_discarded = 0;
 
                /* read and check header, set stream id (and check) */
                if (file_stream->parent.trace_packet_header) {
@@ -919,7 +1175,7 @@ int create_stream_packet_index(struct ctf_trace *td,
                                field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
                                magic = get_unsigned_int(field);
                                if (magic != CTF_MAGIC) {
-                                       fprintf(stdout, "[error] Invalid magic number 0x%" PRIX64 " at packet %u (file offset %zd).\n",
+                                       fprintf(stderr, "[error] Invalid magic number 0x%" PRIX64 " at packet %u (file offset %zd).\n",
                                                        magic,
                                                        file_stream->pos.packet_index->len,
                                                        (ssize_t) pos->mmap_offset);
@@ -933,22 +1189,22 @@ int create_stream_packet_index(struct ctf_trace *td,
                                struct definition_array *defarray;
                                struct definition *field;
                                uint64_t i;
-                               uint8_t uuidval[UUID_LEN];
+                               uint8_t uuidval[BABELTRACE_UUID_LEN];
 
                                field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
                                assert(field->declaration->id == CTF_TYPE_ARRAY);
                                defarray = container_of(field, struct definition_array, p);
-                               assert(array_len(defarray) == UUID_LEN);
+                               assert(array_len(defarray) == BABELTRACE_UUID_LEN);
 
-                               for (i = 0; i < UUID_LEN; i++) {
+                               for (i = 0; i < BABELTRACE_UUID_LEN; i++) {
                                        struct definition *elem;
 
                                        elem = array_index(defarray, i);
                                        uuidval[i] = get_unsigned_int(elem);
                                }
-                               ret = uuid_compare(td->uuid, uuidval);
+                               ret = babeltrace_uuid_compare(td->uuid, uuidval);
                                if (ret) {
-                                       fprintf(stdout, "[error] Unique Universal Identifiers do not match.\n");
+                                       fprintf(stderr, "[error] Unique Universal Identifiers do not match.\n");
                                        return -EINVAL;
                                }
                        }
@@ -964,18 +1220,18 @@ int create_stream_packet_index(struct ctf_trace *td,
                }
 
                if (!first_packet && file_stream->parent.stream_id != stream_id) {
-                       fprintf(stdout, "[error] Stream ID is changing within a stream.\n");
+                       fprintf(stderr, "[error] Stream ID is changing within a stream.\n");
                        return -EINVAL;
                }
                if (first_packet) {
                        file_stream->parent.stream_id = stream_id;
                        if (stream_id >= td->streams->len) {
-                               fprintf(stdout, "[error] Stream %" PRIu64 " is not declared in metadata.\n", stream_id);
+                               fprintf(stderr, "[error] Stream %" PRIu64 " is not declared in metadata.\n", stream_id);
                                return -EINVAL;
                        }
                        stream = g_ptr_array_index(td->streams, stream_id);
                        if (!stream) {
-                               fprintf(stdout, "[error] Stream %" PRIu64 " is not declared in metadata.\n", stream_id);
+                               fprintf(stderr, "[error] Stream %" PRIu64 " is not declared in metadata.\n", stream_id);
                                return -EINVAL;
                        }
                        file_stream->parent.stream_class = stream;
@@ -1031,6 +1287,15 @@ int create_stream_packet_index(struct ctf_trace *td,
                                field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
                                packet_index.timestamp_end = get_unsigned_int(field);
                        }
+
+                       /* read events discarded from header */
+                       len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("events_discarded"));
+                       if (len_index >= 0) {
+                               struct definition *field;
+
+                               field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
+                               packet_index.events_discarded = get_unsigned_int(field);
+                       }
                } else {
                        /* Use file size for packet size */
                        packet_index.content_size = filestats.st_size * CHAR_BIT;
@@ -1040,14 +1305,14 @@ int create_stream_packet_index(struct ctf_trace *td,
 
                /* Validate content size and packet size values */
                if (packet_index.content_size > packet_index.packet_size) {
-                       fprintf(stdout, "[error] Content size (%zu bits) is larger than packet size (%zu bits).\n",
+                       fprintf(stderr, "[error] Content size (%" PRIu64 " bits) is larger than packet size (%" PRIu64 " bits).\n",
                                packet_index.content_size, packet_index.packet_size);
                        return -EINVAL;
                }
 
-               if (packet_index.packet_size > (filestats.st_size - packet_index.offset) * CHAR_BIT) {
-                       fprintf(stdout, "[error] Packet size (%zu bits) is larger than remaining file size (%zu bits).\n",
-                               packet_index.content_size, (size_t) (filestats.st_size - packet_index.offset) * CHAR_BIT);
+               if (packet_index.packet_size > ((uint64_t)filestats.st_size - packet_index.offset) * CHAR_BIT) {
+                       fprintf(stderr, "[error] Packet size (%" PRIu64 " bits) is larger than remaining file size (%" PRIu64 " bits).\n",
+                               packet_index.content_size, ((uint64_t)filestats.st_size - packet_index.offset) * CHAR_BIT);
                        return -EINVAL;
                }
 
@@ -1061,13 +1326,13 @@ int create_stream_packet_index(struct ctf_trace *td,
        }
 
        /* Move pos back to beginning of file */
-       ctf_move_pos_slow(pos, 0, SEEK_SET);    /* position for write */
+       ctf_packet_seek(&pos->parent, 0, SEEK_SET);     /* position for write */
 
        return 0;
 }
 
 static
-int create_trace_definitions(struct ctf_trace *td, struct ctf_stream *stream)
+int create_trace_definitions(struct ctf_trace *td, struct ctf_stream_definition *stream)
 {
        int ret;
 
@@ -1096,7 +1361,7 @@ error:
  */
 static
 int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags,
-               void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+               void (*packet_seek)(struct stream_pos *pos, size_t index,
                        int whence))
 {
        int ret;
@@ -1109,10 +1374,10 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags,
        }
        file_stream = g_new0(struct ctf_file_stream, 1);
 
-       if (move_pos_slow) {
-               file_stream->pos.move_pos_slow = move_pos_slow;
+       if (packet_seek) {
+               file_stream->pos.packet_seek = packet_seek;
        } else {
-               fprintf(stderr, "[error] move_pos_slow function undefined.\n");
+               fprintf(stderr, "[error] packet_seek function undefined.\n");
                ret = -1;
                goto error_def;
        }
@@ -1121,6 +1386,10 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags,
        ret = create_trace_definitions(td, &file_stream->parent);
        if (ret)
                goto error_def;
+       /*
+        * For now, only a single slock is supported.
+        */
+       file_stream->parent.current_clock = td->single_clock;
        ret = create_stream_packet_index(td, file_stream);
        if (ret)
                goto error_index;
@@ -1140,94 +1409,10 @@ error:
        return ret;
 }
 
-static void
-init_domain_name(struct ctf_trace *td)
-{
-       char *start, *end;
-
-       start = td->path + strlen(td->collection_path);
-       start++;        /* skip / */
-       end = strchr(start, '/');
-       if (!end)
-               return;
-       memcpy(td->domain, start, end - start);
-       td->domain[end - start] = '\0';
-}
-
-static void
-init_proc_name(struct ctf_trace *td)
-{
-       char buf[PATH_MAX];
-       char *start, *end;
-
-       if (td->domain[0] == '\0')
-               return;
-       memcpy(buf, td->path, PATH_MAX);
-       start = buf + strlen(td->collection_path);
-       start++;        /* skip / */
-       start = strchr(start, '/');     /* get begin of domain content */
-       if (!start)
-               return;
-       start++;        /* skip / */
-       /* find last -, skips time */
-       end = strrchr(start, '-');
-       if (!end)
-               return;
-       *end = '\0';
-       /* find previous -, skips date */
-       end = strrchr(start, '-');
-       if (!end)
-               return;
-       *end = '\0';
-       /* find previous -, skips pid */
-       end = strrchr(start, '-');
-       if (!end)
-               return;
-       *end = '\0';
-
-       memcpy(td->procname, start, end - start);
-       td->procname[end - start] = '\0';
-}
-
-static void
-init_vpid(struct ctf_trace *td)
-{
-       char buf[PATH_MAX];
-       char *start, *end;
-
-       if (td->domain[0] == '\0')
-               return;
-       memcpy(buf, td->path, PATH_MAX);
-       start = buf + strlen(td->collection_path);
-       start++;        /* skip / */
-       start = strchr(start, '/');     /* get begin of domain content */
-       if (!start)
-               return;
-       start++;        /* skip / */
-       /* find last -, skips time */
-       end = strrchr(start, '-');
-       if (!end)
-               return;
-       *end = '\0';
-       /* find previous -, skips date */
-       end = strrchr(start, '-');
-       if (!end)
-               return;
-       *end = '\0';
-       /* find previous -, skips pid */
-       start = strrchr(start, '-');
-       if (!start)
-               return;
-       start++;        /* skip - */
-
-       memcpy(td->vpid, start, end - start);
-       td->vpid[end - start] = '\0';
-}
-
 static
-int ctf_open_trace_read(struct ctf_trace *td, const char *collection_path,
+int ctf_open_trace_read(struct ctf_trace *td,
                const char *path, int flags,
-               void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+               void (*packet_seek)(struct stream_pos *pos, size_t index,
                        int whence), FILE *metadata_fp)
 {
        int ret;
@@ -1240,31 +1425,26 @@ int ctf_open_trace_read(struct ctf_trace *td, const char *collection_path,
        /* Open trace directory */
        td->dir = opendir(path);
        if (!td->dir) {
-               fprintf(stdout, "[error] Unable to open trace directory.\n");
+               fprintf(stderr, "[error] Unable to open trace directory.\n");
                ret = -ENOENT;
                goto error;
        }
 
        td->dirfd = open(path, 0);
        if (td->dirfd < 0) {
-               fprintf(stdout, "[error] Unable to open trace directory file descriptor.\n");
+               fprintf(stderr, "[error] Unable to open trace directory file descriptor.\n");
                perror("Trace directory open");
                ret = -errno;
                goto error_dirfd;
        }
-       strncpy(td->collection_path, collection_path, PATH_MAX);
-       td->collection_path[PATH_MAX - 1] = '\0';
-       strncpy(td->path, path, PATH_MAX);
-       td->path[PATH_MAX - 1] = '\0';
-       init_domain_name(td);
-       init_proc_name(td);
-       init_vpid(td);
+       strncpy(td->path, path, sizeof(td->path));
+       td->path[sizeof(td->path) - 1] = '\0';
 
        /*
         * Keep the metadata file separate.
         */
 
-       ret = ctf_open_trace_metadata_read(td, move_pos_slow, metadata_fp);
+       ret = ctf_open_trace_metadata_read(td, packet_seek, metadata_fp);
        if (ret) {
                goto error_metadata;
        }
@@ -1283,7 +1463,7 @@ int ctf_open_trace_read(struct ctf_trace *td, const char *collection_path,
        for (;;) {
                ret = readdir_r(td->dir, dirent, &diriter);
                if (ret) {
-                       fprintf(stdout, "[error] Readdir error.\n");
+                       fprintf(stderr, "[error] Readdir error.\n");
                        goto readdir_error;
                }
                if (!diriter)
@@ -1293,9 +1473,10 @@ int ctf_open_trace_read(struct ctf_trace *td, const char *collection_path,
                                || !strcmp(diriter->d_name, "..")
                                || !strcmp(diriter->d_name, "metadata"))
                        continue;
-               ret = ctf_open_file_stream_read(td, diriter->d_name, flags, move_pos_slow);
+               ret = ctf_open_file_stream_read(td, diriter->d_name,
+                                       flags, packet_seek);
                if (ret) {
-                       fprintf(stdout, "[error] Open file stream error.\n");
+                       fprintf(stderr, "[error] Open file stream error.\n");
                        goto readdir_error;
                }
        }
@@ -1314,30 +1495,36 @@ error:
 }
 
 static
-struct trace_descriptor *ctf_open_trace(const char *collection_path, const char *path, int flags,
-               void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+struct trace_descriptor *ctf_open_trace(const char *path, int flags,
+               void (*packet_seek)(struct stream_pos *pos, size_t index,
                        int whence), FILE *metadata_fp)
 {
        struct ctf_trace *td;
        int ret;
 
+       /*
+        * If packet_seek is NULL, we provide our default version.
+        */
+       if (!packet_seek)
+               packet_seek = ctf_packet_seek;
+
        td = g_new0(struct ctf_trace, 1);
 
        switch (flags & O_ACCMODE) {
        case O_RDONLY:
                if (!path) {
-                       fprintf(stdout, "[error] Path missing for input CTF trace.\n");
+                       fprintf(stderr, "[error] Path missing for input CTF trace.\n");
                        goto error;
                }
-               ret = ctf_open_trace_read(td, collection_path, path, flags, move_pos_slow, metadata_fp);
+               ret = ctf_open_trace_read(td, path, flags, packet_seek, metadata_fp);
                if (ret)
                        goto error;
                break;
        case O_RDWR:
-               fprintf(stdout, "[error] Opening CTF traces for output is not supported yet.\n");
+               fprintf(stderr, "[error] Opening CTF traces for output is not supported yet.\n");
                goto error;
        default:
-               fprintf(stdout, "[error] Incorrect open flags.\n");
+               fprintf(stderr, "[error] Incorrect open flags.\n");
                goto error;
        }
 
@@ -1371,20 +1558,20 @@ static
 int prepare_mmap_stream_definition(struct ctf_trace *td,
                struct ctf_file_stream *file_stream)
 {
-       struct ctf_stream_class *stream;
+       struct ctf_stream_declaration *stream;
        uint64_t stream_id = 0;
        int ret;
 
        file_stream->parent.stream_id = stream_id;
        if (stream_id >= td->streams->len) {
-               fprintf(stdout, "[error] Stream %" PRIu64 " is not declared "
+               fprintf(stderr, "[error] Stream %" PRIu64 " is not declared "
                                "in metadata.\n", stream_id);
                ret = -EINVAL;
                goto end;
        }
        stream = g_ptr_array_index(td->streams, stream_id);
        if (!stream) {
-               fprintf(stdout, "[error] Stream %" PRIu64 " is not declared "
+               fprintf(stderr, "[error] Stream %" PRIu64 " is not declared "
                                "in metadata.\n", stream_id);
                ret = -EINVAL;
                goto end;
@@ -1398,7 +1585,7 @@ end:
 static
 int ctf_open_mmap_stream_read(struct ctf_trace *td,
                struct mmap_stream *mmap_info,
-               void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+               void (*packet_seek)(struct stream_pos *pos, size_t index,
                        int whence))
 {
        int ret;
@@ -1407,7 +1594,7 @@ int ctf_open_mmap_stream_read(struct ctf_trace *td,
        file_stream = g_new0(struct ctf_file_stream, 1);
        ctf_init_mmap_pos(&file_stream->pos, mmap_info);
 
-       file_stream->pos.move_pos_slow = move_pos_slow;
+       file_stream->pos.packet_seek = packet_seek;
 
        ret = create_trace_definitions(td, &file_stream->parent);
        if (ret) {
@@ -1433,14 +1620,14 @@ error_def:
 
 int ctf_open_mmap_trace_read(struct ctf_trace *td,
                struct mmap_stream_list *mmap_list,
-               void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+               void (*packet_seek)(struct stream_pos *pos, size_t index,
                        int whence),
                FILE *metadata_fp)
 {
        int ret;
        struct mmap_stream *mmap_info;
 
-       ret = ctf_open_trace_metadata_read(td, ctf_move_pos_slow, metadata_fp);
+       ret = ctf_open_trace_metadata_read(td, ctf_packet_seek, metadata_fp);
        if (ret) {
                goto error;
        }
@@ -1449,10 +1636,10 @@ int ctf_open_mmap_trace_read(struct ctf_trace *td,
         * for each stream, try to open, check magic number, and get the
         * stream ID to add to the right location in the stream array.
         */
-       cds_list_for_each_entry(mmap_info, &mmap_list->head, list) {
-               ret = ctf_open_mmap_stream_read(td, mmap_info, move_pos_slow);
+       bt_list_for_each_entry(mmap_info, &mmap_list->head, list) {
+               ret = ctf_open_mmap_stream_read(td, mmap_info, packet_seek);
                if (ret) {
-                       fprintf(stdout, "[error] Open file mmap stream error.\n");
+                       fprintf(stderr, "[error] Open file mmap stream error.\n");
                        goto error;
                }
        }
@@ -1466,7 +1653,8 @@ error:
 static
 struct trace_descriptor *ctf_open_mmap_trace(
                struct mmap_stream_list *mmap_list,
-               void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, int whence),
+               void (*packet_seek)(struct stream_pos *pos, size_t index,
+                       int whence),
                FILE *metadata_fp)
 {
        struct ctf_trace *td;
@@ -1477,12 +1665,12 @@ struct trace_descriptor *ctf_open_mmap_trace(
                                "required for mmap parsing\n");
                goto error;
        }
-       if (!move_pos_slow) {
-               fprintf(stderr, "[error] move_pos_slow function undefined.\n");
+       if (!packet_seek) {
+               fprintf(stderr, "[error] packet_seek function undefined.\n");
                goto error;
        }
        td = g_new0(struct ctf_trace, 1);
-       ret = ctf_open_mmap_trace_read(td, mmap_list, move_pos_slow, metadata_fp);
+       ret = ctf_open_mmap_trace_read(td, mmap_list, packet_seek, metadata_fp);
        if (ret)
                goto error_free;
 
@@ -1509,7 +1697,7 @@ void ctf_close_trace(struct trace_descriptor *tdp)
 
        if (td->streams) {
                for (i = 0; i < td->streams->len; i++) {
-                       struct ctf_stream_class *stream;
+                       struct ctf_stream_declaration *stream;
                        int j;
 
                        stream = g_ptr_array_index(td->streams, i);
@@ -1524,10 +1712,52 @@ void ctf_close_trace(struct trace_descriptor *tdp)
                }
                g_ptr_array_free(td->streams, TRUE);
        }
+
+       if (td->event_declarations) {
+               for (i = 0; i < td->event_declarations->len; i++) {
+                       struct bt_ctf_event_decl *event;
+
+                       event = g_ptr_array_index(td->event_declarations, i);
+                       if (event->context_decl)
+                               g_ptr_array_free(event->context_decl, TRUE);
+                       if (event->fields_decl)
+                               g_ptr_array_free(event->fields_decl, TRUE);
+                       if (event->packet_header_decl)
+                               g_ptr_array_free(event->packet_header_decl, TRUE);
+                       if (event->event_context_decl)
+                               g_ptr_array_free(event->event_context_decl, TRUE);
+                       if (event->event_header_decl)
+                               g_ptr_array_free(event->event_header_decl, TRUE);
+                       if (event->packet_context_decl)
+                               g_ptr_array_free(event->packet_context_decl, TRUE);
+                       g_free(event);
+               }
+               g_ptr_array_free(td->event_declarations, TRUE);
+       }
        closedir(td->dir);
        g_free(td);
 }
 
+static
+void ctf_set_context(struct trace_descriptor *descriptor,
+               struct bt_context *ctx)
+{
+       struct ctf_trace *td = container_of(descriptor, struct ctf_trace,
+                       parent);
+
+       td->ctx = ctx;
+}
+
+static
+void ctf_set_handle(struct trace_descriptor *descriptor,
+               struct bt_trace_handle *handle)
+{
+       struct ctf_trace *td = container_of(descriptor, struct ctf_trace,
+                       parent);
+
+       td->handle = handle;
+}
+
 void __attribute__((constructor)) ctf_init(void)
 {
        int ret;
This page took 0.042415 seconds and 4 git commands to generate.