Fix: perform an explicit stdout flush in live even on empty packets

[babeltrace.git] / lib / iterator.c

diff --git a/lib/iterator.c b/lib/iterator.c
index fd58dec99ce45dc4e8a682220d20ebf3a6edb3dc..d439d7b926c52f6cdee9a7716d2bc75d3d3d194f 100644 (file)
--- a/lib/iterator.c
+++ b/lib/iterator.c
@@ -28,6 +28,7 @@
 
 #include <stdlib.h>
 #include <babeltrace/babeltrace.h>
+#include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/context.h>
 #include <babeltrace/context-internal.h>
 #include <babeltrace/iterator-internal.h>
@@ -72,6 +73,7 @@ static int stream_read_event(struct ctf_file_stream *sin)
                fprintf(stderr, "[error] Reading event failed.\n");
                return ret;
        }
+
        return 0;
 }
 
@@ -170,6 +172,16 @@ static int seek_ctf_trace_by_timestamp(struct ctf_trace *tin,
 {
        int i, j, ret;
        int found = 0;
+       struct bt_trace_descriptor *td = &tin->parent;
+
+       if (td->interval_set) {
+               /*
+                * If this trace has an interval selected, don't allow seeks
+                * before the selected interval. We seek to the start of the
+                * interval, thereby presenting a shorter "virtual" trace.
+                */
+               timestamp = max(timestamp, td->interval_real.timestamp_begin);
+       }
 
        /* for each stream_class */
        for (i = 0; i < tin->streams->len; i++) {
@@ -399,10 +411,15 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
                        stream_pos->offset = saved_pos->offset;
                        stream_pos->last_offset = LAST_OFFSET_POISON;
 
-                       stream->prev_real_timestamp = 0;
-                       stream->prev_real_timestamp_end = 0;
-                       stream->prev_cycles_timestamp = 0;
-                       stream->prev_cycles_timestamp_end = 0;
+                       stream->current.real.begin = 0;
+                       stream->current.real.end = 0;
+                       stream->current.cycles.begin = 0;
+                       stream->current.cycles.end = 0;
+
+                       stream->prev.real.begin = 0;
+                       stream->prev.real.end = 0;
+                       stream->prev.cycles.begin = 0;
+                       stream->prev.cycles.end = 0;
 
                        printf_debug("restored to cur_index = %" PRId64 " and "
                                "offset = %" PRId64 ", timestamp = %" PRIu64 "\n",
@@ -610,14 +627,11 @@ error:
        return NULL;
 }
 
-struct bt_iter_pos *bt_iter_create_time_pos(struct bt_iter *iter,
+struct bt_iter_pos *bt_iter_create_time_pos(struct bt_iter *unused,
                uint64_t timestamp)
 {
        struct bt_iter_pos *pos;
 
-       if (!iter)
-               return NULL;
-
        pos = g_new0(struct bt_iter_pos, 1);
        pos->type = BT_SEEK_TIME;
        pos->u.seek_time = timestamp;
@@ -659,15 +673,63 @@ static int babeltrace_filestream_seek(struct ctf_file_stream *file_stream,
        return ret;
 }
 
+int bt_iter_add_trace(struct bt_iter *iter,
+               struct bt_trace_descriptor *td_read)
+{
+       struct ctf_trace *tin;
+       int stream_id, ret = 0;
+
+       tin = container_of(td_read, struct ctf_trace, parent);
+
+       /* Populate heap with each stream */
+       for (stream_id = 0; stream_id < tin->streams->len;
+                       stream_id++) {
+               struct ctf_stream_declaration *stream;
+               int filenr;
+
+               stream = g_ptr_array_index(tin->streams, stream_id);
+               if (!stream)
+                       continue;
+               for (filenr = 0; filenr < stream->streams->len;
+                               filenr++) {
+                       struct ctf_file_stream *file_stream;
+                       struct bt_iter_pos pos;
+
+                       file_stream = g_ptr_array_index(stream->streams,
+                                       filenr);
+                       if (!file_stream)
+                               continue;
+
+                       pos.type = BT_SEEK_BEGIN;
+                       ret = babeltrace_filestream_seek(file_stream,
+                                       &pos, stream_id);
+
+                       if (ret == EOF) {
+                               ret = 0;
+                               continue;
+                       } else if (ret != 0 && ret != EAGAIN) {
+                               goto error;
+                       }
+                       /* Add to heap */
+                       ret = bt_heap_insert(iter->stream_heap, file_stream);
+                       if (ret)
+                               goto error;
+               }
+       }
+
+error:
+       return ret;
+}
+
 int bt_iter_init(struct bt_iter *iter,
                struct bt_context *ctx,
                const struct bt_iter_pos *begin_pos,
                const struct bt_iter_pos *end_pos)
 {
-       int i, stream_id;
+       int i;
        int ret = 0;
 
-       if (!iter || !ctx)
+       if (!iter || !ctx || !ctx->tc || !ctx->tc->array)
                return -EINVAL;
 
        if (ctx->current_iterator) {
@@ -685,54 +747,22 @@ int bt_iter_init(struct bt_iter *iter,
                goto error_heap_init;
 
        for (i = 0; i < ctx->tc->array->len; i++) {
-               struct ctf_trace *tin;
                struct bt_trace_descriptor *td_read;
 
                td_read = g_ptr_array_index(ctx->tc->array, i);
                if (!td_read)
                        continue;
-               tin = container_of(td_read, struct ctf_trace, parent);
-
-               /* Populate heap with each stream */
-               for (stream_id = 0; stream_id < tin->streams->len;
-                               stream_id++) {
-                       struct ctf_stream_declaration *stream;
-                       int filenr;
-
-                       stream = g_ptr_array_index(tin->streams, stream_id);
-                       if (!stream)
-                               continue;
-                       for (filenr = 0; filenr < stream->streams->len;
-                                       filenr++) {
-                               struct ctf_file_stream *file_stream;
-                               struct bt_iter_pos pos;
-
-                               file_stream = g_ptr_array_index(stream->streams,
-                                               filenr);
-                               if (!file_stream)
-                                       continue;
-
-                               pos.type = BT_SEEK_BEGIN;
-                               ret = babeltrace_filestream_seek(file_stream,
-                                       &pos, stream_id);
-
-                               if (ret == EOF) {
-                                       ret = 0;
-                                       continue;
-                               } else if (ret != 0 && ret != EAGAIN) {
-                                       goto error;
-                               }
-                               /* Add to heap */
-                               ret = bt_heap_insert(iter->stream_heap, file_stream);
-                               if (ret)
-                                       goto error;
-                       }
-               }
+               ret = bt_iter_add_trace(iter, td_read);
+               if (ret < 0)
+                       goto error;
        }
 
        ctx->current_iterator = iter;
        if (begin_pos && begin_pos->type != BT_SEEK_BEGIN) {
                ret = bt_iter_set_pos(iter, begin_pos);
+               if (ret) {
+                       goto error;
+               }
        }
 
        return ret;
@@ -787,6 +817,7 @@ int bt_iter_next(struct bt_iter *iter)
 {
        struct ctf_file_stream *file_stream, *removed;
        int ret;
+       bool event_outside_interval = false;
 
        if (!iter)
                return -EINVAL;
@@ -799,7 +830,13 @@ int bt_iter_next(struct bt_iter *iter)
        }
 
        ret = stream_read_event(file_stream);
-       if (ret == EOF) {
+       if (file_stream->pos.parent.trace &&
+                       file_stream->pos.parent.trace->interval_set) {
+               event_outside_interval =
+                               file_stream->parent.real_timestamp >
+                               file_stream->pos.parent.trace->interval_real.timestamp_end;
+       }
+       if (ret == EOF || event_outside_interval) {
                removed = bt_heap_remove(iter->stream_heap);
                assert(removed == file_stream);
                ret = 0;