X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fiterator.c;h=784166f2bf167caa672144716df4aa5dde315832;hp=bf87193a3b64f8bdf491fc5ba309f4ca4ae80e82;hb=30c276af575248a4f83e594c987264f6caa238ba;hpb=e419579102094d83539d79ce6af83d9786d387ee diff --git a/lib/iterator.c b/lib/iterator.c index bf87193a..784166f2 100644 --- a/lib/iterator.c +++ b/lib/iterator.c @@ -20,7 +20,6 @@ #include #include -#include #include #include #include @@ -30,6 +29,10 @@ #include #include +static int babeltrace_filestream_seek(struct ctf_file_stream *file_stream, + const struct bt_iter_pos *begin_pos, + unsigned long stream_id); + struct stream_saved_pos { /* * Use file_stream pointer to check if the trace collection we @@ -111,8 +114,7 @@ static int seek_file_stream_by_timestamp(struct ctf_file_stream *cfs, for (i = 0; i < stream_pos->packet_index->len; i++) { index = &g_array_index(stream_pos->packet_index, struct packet_index, i); - if (index->timestamp_begin >= timestamp || - index->timestamp_end <= timestamp) + if (index->timestamp_end <= timestamp) continue; stream_pos->packet_seek(&stream_pos->parent, i, SEEK_SET); @@ -142,12 +144,12 @@ static int seek_ctf_trace_by_timestamp(struct ctf_trace *tin, /* for each stream_class */ for (i = 0; i < tin->streams->len; i++) { - struct ctf_stream_class *stream_class; + 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 *stream; + struct ctf_stream_definition *stream; struct ctf_file_stream *cfs; stream = g_ptr_array_index(stream_class->streams, j); @@ -178,7 +180,7 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos) 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); @@ -189,7 +191,7 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos) i++) { struct stream_saved_pos *saved_pos; struct ctf_stream_pos *stream_pos; - struct ctf_stream *stream; + struct ctf_stream_definition *stream; saved_pos = &g_array_index( iter_pos->u.restore->stream_saved_pos, @@ -229,9 +231,6 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos) 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) @@ -252,15 +251,46 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos) goto error; } return 0; + case BT_SEEK_BEGIN: + tc = iter->ctx->tc; + for (i = 0; i < tc->array->len; i++) { + struct ctf_trace *tin; + struct trace_descriptor *td_read; + int stream_id; + + td_read = g_ptr_array_index(tc->array, i); + 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; + file_stream = g_ptr_array_index( + stream->streams, + filenr); + ret = babeltrace_filestream_seek( + file_stream, iter_pos, + stream_id); + } + } + } + break; 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) { @@ -295,14 +325,14 @@ struct bt_iter_pos *bt_iter_get_pos(struct bt_iter *iter) for (stream_class_id = 0; stream_class_id < tin->streams->len; stream_class_id++) { - struct ctf_stream_class *stream_class; + struct ctf_stream_declaration *stream_class; stream_class = g_ptr_array_index(tin->streams, stream_class_id); for (stream_id = 0; stream_id < stream_class->streams->len; stream_id++) { - struct ctf_stream *stream; + struct ctf_stream_definition *stream; struct ctf_file_stream *cfs; struct stream_saved_pos saved_pos; @@ -414,7 +444,7 @@ int bt_iter_seek(struct bt_iter *iter, /* Populate heap with each stream */ for (stream_id = 0; stream_id < tin->streams->len; stream_id++) { - struct ctf_stream_class *stream; + struct ctf_stream_declaration *stream; int filenr; stream = g_ptr_array_index(tin->streams, stream_id); @@ -437,18 +467,19 @@ end: int bt_iter_init(struct bt_iter *iter, struct bt_context *ctx, - struct bt_iter_pos *begin_pos, - struct bt_iter_pos *end_pos) + const struct bt_iter_pos *begin_pos, + const struct bt_iter_pos *end_pos) { int i, stream_id; int ret = 0; + if (ctx->current_iterator) { + ret = -1; + goto error_ctx; + } + 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; @@ -466,7 +497,7 @@ int bt_iter_init(struct bt_iter *iter, /* Populate heap with each stream */ for (stream_id = 0; stream_id < tin->streams->len; stream_id++) { - struct ctf_stream_class *stream; + struct ctf_stream_declaration *stream; int filenr; stream = g_ptr_array_index(tin->streams, stream_id); @@ -480,14 +511,22 @@ int bt_iter_init(struct bt_iter *iter, filenr); if (begin_pos) { - ret = babeltrace_filestream_seek(file_stream, begin_pos, + ret = babeltrace_filestream_seek( + file_stream, + begin_pos, + stream_id); + } else { + struct bt_iter_pos pos; + pos.type = BT_SEEK_BEGIN; + ret = babeltrace_filestream_seek( + file_stream, &pos, stream_id); - if (ret == EOF) { - ret = 0; - continue; - } else if (ret) { - goto error; - } + } + if (ret == EOF) { + ret = 0; + continue; + } else if (ret) { + goto error; } /* Add to heap */ ret = heap_insert(iter->stream_heap, file_stream); @@ -497,18 +536,20 @@ int bt_iter_init(struct bt_iter *iter, } } + ctx->current_iterator = iter; return 0; error: heap_free(iter->stream_heap); error_heap_init: g_free(iter->stream_heap); +error_ctx: return ret; } struct bt_iter *bt_iter_create(struct bt_context *ctx, - struct bt_iter_pos *begin_pos, - struct bt_iter_pos *end_pos) + const struct bt_iter_pos *begin_pos, + const struct bt_iter_pos *end_pos) { struct bt_iter *iter; int ret; @@ -524,35 +565,11 @@ struct bt_iter *bt_iter_create(struct bt_context *ctx, void bt_iter_fini(struct bt_iter *iter) { - struct bt_stream_callbacks *bt_stream_cb; - struct bt_callback_chain *bt_chain; - int i, j; - 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); - } - + iter->ctx->current_iterator = NULL; bt_context_put(iter->ctx); }