if (!iter_pos)
return;
- if (iter_pos->u.restore) {
+ if (iter_pos->type == BT_SEEK_RESTORE && iter_pos->u.restore) {
if (iter_pos->u.restore->stream_saved_pos) {
g_array_free(
iter_pos->u.restore->stream_saved_pos,
*/
stream->timestamp = saved_pos->current_timestamp;
stream_pos->offset = saved_pos->offset;
- stream_pos->last_offset = saved_pos->offset;
+ stream_pos->last_offset = LAST_OFFSET_POISON;
stream->prev_timestamp = 0;
stream->prev_timestamp_end = 0;
- stream->consumed = 0;
printf_debug("restored to cur_index = %zd and "
"offset = %zd, timestamp = %" PRIu64 "\n",
if (ret)
goto error;
}
+ return 0;
case BT_SEEK_TIME:
tc = iter->ctx->tc;
return 0;
case BT_SEEK_BEGIN:
tc = iter->ctx->tc;
+ heap_free(iter->stream_heap);
+ ret = heap_init(iter->stream_heap, 0, stream_compare);
+ if (ret < 0)
+ goto error;
+
for (i = 0; i < tc->array->len; i++) {
struct ctf_trace *tin;
struct trace_descriptor *td_read;
if (ret != 0 && ret != EOF) {
goto error;
}
+ ret = heap_insert(iter->stream_heap, file_stream);
+ if (ret)
+ goto error;
}
}
}
{
struct bt_iter_pos *pos;
struct trace_collection *tc = iter->ctx->tc;
- int i, stream_class_id, stream_id;
+ struct ctf_file_stream *file_stream = NULL, *removed;
+ struct ptr_heap iter_heap_copy;
+ int ret;
pos = g_new0(struct bt_iter_pos, 1);
+ pos->type = BT_SEEK_RESTORE;
pos->u.restore = g_new0(struct bt_saved_pos, 1);
pos->u.restore->tc = tc;
pos->u.restore->stream_saved_pos = g_array_new(FALSE, TRUE,
if (!pos->u.restore->stream_saved_pos)
goto error;
- for (i = 0; i < tc->array->len; i++) {
- struct ctf_trace *tin;
- struct trace_descriptor *td_read;
+ ret = heap_copy(&iter_heap_copy, iter->stream_heap);
+ if (ret < 0)
+ goto error_heap;
- td_read = g_ptr_array_index(tc->array, i);
- if (!td_read)
- continue;
- tin = container_of(td_read, struct ctf_trace, parent);
+ /* iterate over each stream in the heap */
+ file_stream = heap_maximum(&iter_heap_copy);
+ while (file_stream != NULL) {
+ struct stream_saved_pos saved_pos;
- for (stream_class_id = 0; stream_class_id < tin->streams->len;
- stream_class_id++) {
- struct ctf_stream_declaration *stream_class;
+ assert(file_stream->pos.last_offset != LAST_OFFSET_POISON);
+ saved_pos.offset = file_stream->pos.last_offset;
+ saved_pos.file_stream = file_stream;
+ saved_pos.cur_index = file_stream->pos.cur_index;
- stream_class = g_ptr_array_index(tin->streams,
- stream_class_id);
- if (!stream_class)
- continue;
- for (stream_id = 0;
- stream_id < stream_class->streams->len;
- stream_id++) {
- struct ctf_stream_definition *stream;
- struct ctf_file_stream *cfs;
- struct stream_saved_pos saved_pos;
+ saved_pos.current_timestamp = file_stream->parent.timestamp;
- stream = g_ptr_array_index(
- stream_class->streams,
- stream_id);
- if (!stream)
- continue;
- cfs = container_of(stream,
- struct ctf_file_stream,
- parent);
+ g_array_append_val(
+ pos->u.restore->stream_saved_pos,
+ saved_pos);
- saved_pos.file_stream = cfs;
- saved_pos.cur_index = cfs->pos.cur_index;
+ printf_debug("stream : %" PRIu64 ", cur_index : %zd, "
+ "offset : %zd, "
+ "timestamp = %" PRIu64 "\n",
+ file_stream->parent.stream_id,
+ saved_pos.cur_index, saved_pos.offset,
+ saved_pos.current_timestamp);
- /*
- * It is possible that an event was read during
- * the last restore, never consumed and its
- * position saved again. For this case, we
- * need to check if the event really was
- * consumed by the caller otherwise it is lost.
- */
- if (stream->consumed)
- saved_pos.offset = cfs->pos.offset;
- else
- saved_pos.offset = cfs->pos.last_offset;
-
- saved_pos.current_timestamp = stream->timestamp;
-
- g_array_append_val(
- pos->u.restore->stream_saved_pos,
- saved_pos);
-
- printf_debug("stream : %" PRIu64 ", cur_index : %zd, "
- "offset : %zd, "
- "timestamp = %" PRIu64 "\n",
- stream->stream_id, saved_pos.cur_index,
- saved_pos.offset,
- saved_pos.current_timestamp);
- }
- }
- }
+ /* remove the stream from the heap copy */
+ removed = heap_remove(&iter_heap_copy);
+ assert(removed == file_stream);
+ file_stream = heap_maximum(&iter_heap_copy);
+ }
+ heap_free(&iter_heap_copy);
return pos;
+error_heap:
+ g_array_free(pos->u.restore->stream_saved_pos, TRUE);
error:
+ g_free(pos);
return NULL;
}