diff -Nru babeltrace-1.1~pre/debian/bzr-builder.manifest babeltrace-1.1~pre/debian/bzr-builder.manifest --- babeltrace-1.1~pre/debian/bzr-builder.manifest 2012-03-17 00:29:47.000000000 +0000 +++ babeltrace-1.1~pre/debian/bzr-builder.manifest 2012-03-19 20:27:08.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0+bzr473+pack13+201203170029 -lp:babeltrace revid:git-v1:b07f08673ee15a11b93b1e16eca55cbf4291145c +# bzr-builder format 0.3 deb-version {debupstream}-0+bzr474+pack13+201203192027 +lp:babeltrace revid:git-v1:55c21ea5d3bb180e0b59b08cd9ae84de3ff52f00 nest packaging lp:~lttng/babeltrace/packaging-daily debian revid:alexandre.montplaisir@gmail.com-20120225194100-dyer5bn9d2a6ikfe diff -Nru babeltrace-1.1~pre/debian/changelog babeltrace-1.1~pre/debian/changelog --- babeltrace-1.1~pre/debian/changelog 2012-03-17 00:29:47.000000000 +0000 +++ babeltrace-1.1~pre/debian/changelog 2012-03-19 20:27:08.000000000 +0000 @@ -1,8 +1,8 @@ -babeltrace (1.1~pre-0+bzr473+pack13+201203170029~precise1) precise; urgency=low +babeltrace (1.1~pre-0+bzr474+pack13+201203192027~precise1) precise; urgency=low * Auto build. - -- Avik Sil Sat, 17 Mar 2012 00:29:47 +0000 + -- Avik Sil Mon, 19 Mar 2012 20:27:08 +0000 babeltrace (1.1~pre-0~lttng1) precise; urgency=low diff -Nru babeltrace-1.1~pre/lib/iterator.c babeltrace-1.1~pre/lib/iterator.c --- babeltrace-1.1~pre/lib/iterator.c 2012-03-17 00:29:46.000000000 +0000 +++ babeltrace-1.1~pre/lib/iterator.c 2012-03-19 20:27:07.000000000 +0000 @@ -29,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 @@ -247,6 +251,39 @@ 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_class *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 */ return -EINVAL;