From bdf816def0646c189d2f0984f56f96dc82908793 Mon Sep 17 00:00:00 2001 From: Momoko Kono Date: Tue, 14 Nov 2023 07:25:13 +0900 Subject: [PATCH] added the stopper for infinite loop by invalid framecount --- src/bb/image-io/rt_u3v.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/bb/image-io/rt_u3v.h b/src/bb/image-io/rt_u3v.h index 912ac7cb..79737dbe 100644 --- a/src/bb/image-io/rt_u3v.h +++ b/src/bb/image-io/rt_u3v.h @@ -380,6 +380,9 @@ class U3V { : static_cast(arv_buffer_get_timestamp(bufs[cameN_idx_]) & 0x00000000FFFFFFFF); latest_cnt = devices_[cameN_idx_].frame_count_; + int internal_count = 0; + int max_internal_count = 1000; + while (frame_cnt_ >= latest_cnt) { arv_stream_push_buffer(devices_[cameN_idx_].stream_, bufs[cameN_idx_]); cameN_idx_ = (cameN_idx_+1) >= num_device ? 0 : cameN_idx_+1; @@ -392,6 +395,10 @@ class U3V { ? static_cast(get_frame_count_from_genDC_descriptor(bufs[cameN_idx_], devices_[cameN_idx_])) : static_cast(arv_buffer_get_timestamp(bufs[cameN_idx_]) & 0x00000000FFFFFFFF); latest_cnt = devices_[cameN_idx_].frame_count_; + if (internal_count++ > max_internal_count){ + log::error("pop_buffer(L9) The sequential invalid buffer is more than {}; Stop the pipeline.", max_internal_count); + throw ::std::runtime_error("Invalid framecount"); + } } frame_cnt_ = latest_cnt; @@ -507,6 +514,9 @@ class U3V { : static_cast(arv_buffer_get_timestamp(bufs[cameN_idx_]) & 0x00000000FFFFFFFF); latest_cnt = devices_[cameN_idx_].frame_count_; + int internal_count = 0; + int max_internal_count = 1000; + while (frame_cnt_ >= latest_cnt) { arv_stream_push_buffer(devices_[cameN_idx_].stream_, bufs[cameN_idx_]); cameN_idx_ = (cameN_idx_+1) >= num_device ? 0 : cameN_idx_+1; @@ -515,11 +525,15 @@ class U3V { if (bufs[cameN_idx_] == nullptr){ log::error("pop_buffer(L8) failed due to timeout ({}s)", timeout2_us*1e-6f); throw ::std::runtime_error("buffer is null"); - } + } devices_[cameN_idx_].frame_count_ = is_gendc_ ? static_cast(get_frame_count_from_genDC_descriptor(bufs[cameN_idx_], devices_[cameN_idx_])) : static_cast(arv_buffer_get_timestamp(bufs[cameN_idx_]) & 0x00000000FFFFFFFF); latest_cnt = devices_[cameN_idx_].frame_count_; + if (internal_count++ > max_internal_count){ + log::error("pop_buffer(L10) The sequential invalid buffer is more than {}; Stop the pipeline.", max_internal_count); + throw ::std::runtime_error("Invalid framecount"); + } } frame_cnt_ = latest_cnt;