X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fiterator.c;h=c6ee4c9c0dba3ebf53883a8ad4a7c7c53c1a2ada;hp=b4c5a697fa7023d9bf4aa35d7186e38fecb6b8f9;hb=bed54c92f5e3c9159b776105d17ab5b4c0d682c7;hpb=3a25e036c64003c5778538d7cfef8beccc65d640 diff --git a/lib/iterator.c b/lib/iterator.c index b4c5a697..c6ee4c9c 100644 --- a/lib/iterator.c +++ b/lib/iterator.c @@ -199,7 +199,7 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos) heap_free(iter->stream_heap); ret = heap_init(iter->stream_heap, 0, stream_compare); if (ret < 0) - goto error; + goto error_heap_init; for (i = 0; i < iter_pos->u.restore->stream_saved_pos->len; i++) { @@ -248,7 +248,7 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos) heap_free(iter->stream_heap); ret = heap_init(iter->stream_heap, 0, stream_compare); if (ret < 0) - goto error; + goto error_heap_init; /* for each trace in the trace_collection */ for (i = 0; i < tc->array->len; i++) { @@ -276,6 +276,11 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos) 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_heap_init; + for (i = 0; i < tc->array->len; i++) { struct ctf_trace *tin; struct trace_descriptor *td_read; @@ -310,6 +315,9 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos) if (ret != 0 && ret != EOF) { goto error; } + ret = heap_insert(iter->stream_heap, file_stream); + if (ret) + goto error; } } } @@ -323,12 +331,14 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos) error: heap_free(iter->stream_heap); +error_heap_init: if (heap_init(iter->stream_heap, 0, stream_compare) < 0) { heap_free(iter->stream_heap); g_free(iter->stream_heap); iter->stream_heap = NULL; ret = -ENOMEM; } + return ret; } @@ -336,7 +346,9 @@ struct bt_iter_pos *bt_iter_get_pos(struct bt_iter *iter) { 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; @@ -347,61 +359,46 @@ struct bt_iter_pos *bt_iter_get_pos(struct bt_iter *iter) 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); - - saved_pos.file_stream = cfs; - saved_pos.cur_index = cfs->pos.cur_index; - 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); - } - } - } + g_array_append_val( + pos->u.restore->stream_saved_pos, + saved_pos); + + 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); + + /* 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; } @@ -449,53 +446,6 @@ static int babeltrace_filestream_seek(struct ctf_file_stream *file_stream, return ret; } -/* - * bt_iter_seek: seek iterator to given position. - */ -int bt_iter_seek(struct bt_iter *iter, - const struct bt_iter_pos *begin_pos) -{ - int i, stream_id; - int ret = 0; - struct trace_collection *tc = iter->ctx->tc; - - for (i = 0; i < tc->array->len; i++) { - struct ctf_trace *tin; - struct trace_descriptor *td_read; - - td_read = g_ptr_array_index(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; - - file_stream = g_ptr_array_index(stream->streams, - filenr); - if (!file_stream) - continue; - ret = babeltrace_filestream_seek(file_stream, begin_pos, - stream_id); - if (ret < 0) - goto end; - } - } - } -end: - return ret; -} - int bt_iter_init(struct bt_iter *iter, struct bt_context *ctx, const struct bt_iter_pos *begin_pos, @@ -577,6 +527,7 @@ error: heap_free(iter->stream_heap); error_heap_init: g_free(iter->stream_heap); + iter->stream_heap = NULL; error_ctx: return ret; }