#include <stdlib.h>
#include <babeltrace/babeltrace.h>
-#include <babeltrace/callbacks-internal.h>
#include <babeltrace/context.h>
#include <babeltrace/context-internal.h>
-#include <babeltrace/ctf/metadata.h>
#include <babeltrace/iterator-internal.h>
#include <babeltrace/iterator.h>
#include <babeltrace/prio_heap.h>
+#include <babeltrace/ctf/metadata.h>
+#include <babeltrace/ctf/events.h>
#include <inttypes.h>
struct stream_saved_pos {
index->timestamp_end <= timestamp)
continue;
- stream_pos->cur_index = i;
- stream_pos->move_pos_slow(stream_pos, index->offset, SEEK_SET);
+ stream_pos->packet_seek(&stream_pos->parent, i, SEEK_SET);
while (cfs->parent.timestamp < timestamp) {
ret = stream_read_event(cfs);
if (ret < 0)
switch (iter_pos->type) {
case BT_SEEK_RESTORE:
if (!iter_pos->u.restore)
- goto error_arg;
+ return -EINVAL;
heap_free(iter->stream_heap);
ret = heap_init(iter->stream_heap, 0, stream_compare);
i++) {
struct stream_saved_pos *saved_pos;
struct ctf_stream_pos *stream_pos;
- struct packet_index *index;
struct ctf_stream *stream;
saved_pos = &g_array_index(
struct stream_saved_pos, i);
stream = &saved_pos->file_stream->parent;
stream_pos = &saved_pos->file_stream->pos;
- index = &g_array_index(stream_pos->packet_index,
- struct packet_index,
- saved_pos->cur_index);
- stream_pos->cur_index = saved_pos->cur_index;
- stream_pos->move_pos_slow(stream_pos, index->offset,
- SEEK_SET);
+ stream_pos->packet_seek(&stream_pos->parent,
+ saved_pos->cur_index, SEEK_SET);
/*
* the timestamp needs to be restored after
- * move_pos_slow, because this function resets
+ * packet_seek, because this function resets
* the timestamp to the beginning of the packet
*/
stream->timestamp = saved_pos->current_timestamp;
if (ret)
goto error;
}
+ case BT_SEEK_BEGIN:
+ /* fall-through to seek time of 0 */
case BT_SEEK_TIME:
tc = iter->ctx->tc;
- if (!iter_pos->u.seek_time)
- goto error_arg;
-
heap_free(iter->stream_heap);
ret = heap_init(iter->stream_heap, 0, stream_compare);
if (ret < 0)
return 0;
default:
/* not implemented */
- goto error_arg;
+ return -EINVAL;
}
return 0;
-error_arg:
- ret = -EINVAL;
error:
heap_free(iter->stream_heap);
if (heap_init(iter->stream_heap, 0, stream_compare) < 0) {
*/
break;
case BT_SEEK_BEGIN:
- file_stream->pos.move_pos_slow(&file_stream->pos, 0, SEEK_SET);
+ file_stream->pos.packet_seek(&file_stream->pos.parent,
+ 0, SEEK_SET);
ret = stream_read_event(file_stream);
break;
case BT_SEEK_TIME:
return ret;
}
-struct bt_iter *bt_iter_create(struct bt_context *ctx,
+int bt_iter_init(struct bt_iter *iter,
+ struct bt_context *ctx,
struct bt_iter_pos *begin_pos,
struct bt_iter_pos *end_pos)
{
int i, stream_id;
int ret = 0;
- struct bt_iter *iter;
- iter = g_new0(struct bt_iter, 1);
iter->stream_heap = g_new(struct ptr_heap, 1);
iter->end_pos = end_pos;
- iter->callbacks = g_array_new(0, 1, sizeof(struct bt_stream_callbacks));
- iter->recalculate_dep_graph = 0;
- iter->main_callbacks.callback = NULL;
- iter->dep_gc = g_ptr_array_new();
bt_context_get(ctx);
iter->ctx = ctx;
}
}
- return iter;
+ return 0;
error:
heap_free(iter->stream_heap);
error_heap_init:
g_free(iter->stream_heap);
- g_free(iter);
- return NULL;
+ return ret;
}
-void bt_iter_destroy(struct bt_iter *iter)
+struct bt_iter *bt_iter_create(struct bt_context *ctx,
+ struct bt_iter_pos *begin_pos,
+ struct bt_iter_pos *end_pos)
{
- struct bt_stream_callbacks *bt_stream_cb;
- struct bt_callback_chain *bt_chain;
- int i, j;
+ struct bt_iter *iter;
+ int ret;
+ iter = g_new0(struct bt_iter, 1);
+ ret = bt_iter_init(iter, ctx, begin_pos, end_pos);
+ if (ret) {
+ g_free(iter);
+ return NULL;
+ }
+ return iter;
+}
+
+void bt_iter_fini(struct bt_iter *iter)
+{
if (iter->stream_heap) {
heap_free(iter->stream_heap);
g_free(iter->stream_heap);
}
-
- /* free all events callbacks */
- if (iter->main_callbacks.callback)
- g_array_free(iter->main_callbacks.callback, TRUE);
-
- /* free per-event callbacks */
- for (i = 0; i < iter->callbacks->len; i++) {
- bt_stream_cb = &g_array_index(iter->callbacks,
- struct bt_stream_callbacks, i);
- if (!bt_stream_cb || !bt_stream_cb->per_id_callbacks)
- continue;
- for (j = 0; j < bt_stream_cb->per_id_callbacks->len; j++) {
- bt_chain = &g_array_index(bt_stream_cb->per_id_callbacks,
- struct bt_callback_chain, j);
- if (bt_chain->callback) {
- g_array_free(bt_chain->callback, TRUE);
- }
- }
- g_array_free(bt_stream_cb->per_id_callbacks, TRUE);
- }
-
bt_context_put(iter->ctx);
+}
+void bt_iter_destroy(struct bt_iter *iter)
+{
+ bt_iter_fini(iter);
g_free(iter);
}
end:
return ret;
}
-
-int bt_iter_read_event(struct bt_iter *iter,
- struct ctf_stream **stream,
- struct ctf_stream_event **event)
-{
- struct ctf_file_stream *file_stream;
- int ret = 0;
-
- file_stream = heap_maximum(iter->stream_heap);
- if (!file_stream) {
- /* end of file for all streams */
- ret = EOF;
- goto end;
- }
- *stream = &file_stream->parent;
- *event = g_ptr_array_index((*stream)->events_by_id, (*stream)->event_id);
-
- if ((*stream)->stream_id > iter->callbacks->len)
- goto end;
-
- process_callbacks(iter, *stream);
-
-end:
- return ret;
-}
projects / babeltrace.git / blobdiff