Fix: get rid of consumed flag

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

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index 3ad9dfc04146053bbede4ed70e1540e65db38955..4cb4297e1363bc32afc29231cd47685be39eab83 100644 (file)
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -22,8 +22,8 @@
 #include <babeltrace/ctf-text/types.h>
 #include <babeltrace/ctf/metadata.h>
 #include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/ctf/events-internal.h>
 #include <inttypes.h>
-#include <uuid/uuid.h>
 #include <sys/mman.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -76,7 +76,7 @@ enum bt_loglevel {
 
 
 struct trace_descriptor *ctf_text_open_trace(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);
 void ctf_text_close_trace(struct trace_descriptor *descriptor);
 
@@ -211,15 +211,15 @@ const char *print_loglevel(int value)
 }
 
 static
-int ctf_text_write_event(struct stream_pos *ppos,
-                        struct ctf_stream *stream)
+int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *stream)
+                        
 {
        struct ctf_text_stream_pos *pos =
                container_of(ppos, struct ctf_text_stream_pos, parent);
-       struct ctf_stream_class *stream_class = stream->stream_class;
+       struct ctf_stream_declaration *stream_class = stream->stream_class;
        int field_nr_saved;
-       struct ctf_event *event_class;
-       struct ctf_stream_event *event;
+       struct ctf_event_declaration *event_class;
+       struct ctf_event_definition *event;
        uint64_t id;
        int ret;
        int dom_print = 0;
@@ -236,20 +236,20 @@ int ctf_text_write_event(struct stream_pos *ppos,
                return -EINVAL;
        }
        event_class = g_ptr_array_index(stream_class->events_by_id, id);
-       if (!event) {
-               fprintf(stderr, "[error] Event id %" PRIu64 " is unknown.\n", id);
+       if (!event_class) {
+               fprintf(stderr, "[error] Event class id %" PRIu64 " is unknown.\n", id);
                return -EINVAL;
        }
 
        /* Print events discarded */
        if (stream->events_discarded) {
                fflush(pos->fp);
-               fprintf(stderr, "[warning] Tracer discarded %d events between [",
+               fprintf(stderr, "[warning] Tracer discarded %" PRIu64 " events between [",
                        stream->events_discarded);
                ctf_print_timestamp(stderr, stream, stream->prev_timestamp);
                fprintf(stderr, "] and [");
                ctf_print_timestamp(stderr, stream, stream->prev_timestamp_end);
-               fprintf(stderr, "]. You should consider increasing the buffer size.\n");
+               fprintf(stderr, "]. You should consider recording a new trace with larger buffers or with fewer events enabled.\n");
                fflush(stderr);
                stream->events_discarded = 0;
        }
@@ -448,7 +448,6 @@ int ctf_text_write_event(struct stream_pos *ppos,
        /* newline */
        fprintf(pos->fp, "\n");
        pos->field_nr = 0;
-       stream->consumed = 1;
 
        return 0;
 
@@ -459,7 +458,7 @@ error:
 
 
 struct trace_descriptor *ctf_text_open_trace(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)
 {
        struct ctf_text_stream_pos *pos;