projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib: do not allow port to be removed when message iterators are active
[babeltrace.git]
/
plugins
/
utils
/
muxer
/
muxer.c
diff --git
a/plugins/utils/muxer/muxer.c
b/plugins/utils/muxer/muxer.c
index cc6dc4602d649092eb19a75890346c52da23c3ca..8270e14b7113382d09d8037e9195d1147b1a8349 100644
(file)
--- a/
plugins/utils/muxer/muxer.c
+++ b/
plugins/utils/muxer/muxer.c
@@
-492,7
+492,6
@@
bt_message_iterator_status muxer_upstream_msg_iter_next(
*/
break;
case BT_MESSAGE_ITERATOR_STATUS_END: /* Fall-through. */
*/
break;
case BT_MESSAGE_ITERATOR_STATUS_END: /* Fall-through. */
- case BT_MESSAGE_ITERATOR_STATUS_CANCELED:
/*
* Message iterator reached the end: release it. It
* won't be considered again to find the youngest
/*
* Message iterator reached the end: release it. It
* won't be considered again to find the youngest
@@
-1056,8
+1055,7
@@
bt_message_iterator_status muxer_msg_iter_do_next_one(
status = muxer_msg_iter_youngest_upstream_msg_iter(muxer_comp,
muxer_msg_iter, &muxer_upstream_msg_iter,
&next_return_ts);
status = muxer_msg_iter_youngest_upstream_msg_iter(muxer_comp,
muxer_msg_iter, &muxer_upstream_msg_iter,
&next_return_ts);
- if (status < 0 || status == BT_MESSAGE_ITERATOR_STATUS_END ||
- status == BT_MESSAGE_ITERATOR_STATUS_CANCELED) {
+ if (status < 0 || status == BT_MESSAGE_ITERATOR_STATUS_END) {
if (status < 0) {
BT_LOGE("Cannot find the youngest upstream message iterator wrapper: "
"status=%s",
if (status < 0) {
BT_LOGE("Cannot find the youngest upstream message iterator wrapper: "
"status=%s",
This page took
0.034797 seconds
and
4
git commands to generate.