From: Francis Deslauriers Date: Wed, 12 Jun 2019 17:28:32 +0000 (-0400) Subject: ctf: only reset state of `bt_msg_iter` on _reset() X-Git-Tag: v2.0.0-rc1~251 X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=b25ff394d8f3c4f9febb55bcbd6c630e4a5a04f4;hp=bcc4b99e2cf1ebf3d21478dd543e3895bec848b9;p=babeltrace.git ctf: only reset state of `bt_msg_iter` on _reset() The `bt_msg_iter` configuration should be left untouched by the reset. The `bt_msg_iter_reset()` is used at the creation of the `bt_msg_iter` (`bt_msg_iter_create()`) and when seeking with it (`bt_msg_iter_seek()`). It's also used by `src.ctf.fs` message iterators when seeking is done. Signed-off-by: Francis Deslauriers Change-Id: I2ab948858aa5b955a3063174c9887c54d98bad5d Reviewed-on: https://review.lttng.org/c/babeltrace/+/1416 Tested-by: jenkins Reviewed-by: Philippe Proulx --- diff --git a/src/plugins/ctf/common/msg-iter/msg-iter.c b/src/plugins/ctf/common/msg-iter/msg-iter.c index 87ff39af..ba686961 100644 --- a/src/plugins/ctf/common/msg-iter/msg-iter.c +++ b/src/plugins/ctf/common/msg-iter/msg-iter.c @@ -1791,8 +1791,6 @@ void bt_msg_iter_reset(struct bt_msg_iter *notit) bt_msg_iter_reset_for_next_stream_file(notit); notit->cur_stream_class_id = -1; notit->cur_data_stream_id = -1; - notit->emit_stream_begin_msg = true; - notit->emit_stream_end_msg = true; notit->snapshots.discarded_events = UINT64_C(-1); notit->snapshots.packets = UINT64_C(-1); notit->prev_packet_snapshots.discarded_events = UINT64_C(-1);