mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-19 15:04:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #21567 from sivanov-work:gapi_streaming_fix

Browse Source 
G-API: Fix streaming hangs for ConstSource & Improve troubleshooting logger messages
This commit is contained in:
Sergey Ivanov 2022-02-09 21:48:06 +03:00 committed by GitHub
parent 619b6dfae3
commit d5ecb5ff5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
modules/gapi/src/executor/gstreamingexecutor.cpp
View File

@ -323,16 +323,40 @@ public:
void rewindToStop(std::vector<Q*> &in_queues,
const std::size_t this_id)
{
for (auto &&qit : ade::util::indexed(in_queues))
{
auto id2 = ade::util::index(qit);
auto &q2 = ade::util::value(qit);
if (this_id == id2) continue;
size_t expected_stop_count = std::count_if(in_queues.begin(), in_queues.end(), [] (const Q* ptr) {
return ptr != nullptr;
});
Cmd cmd;
while (q2 && !cv::util::holds_alternative<Stop>(cmd))
q2->pop(cmd);
if (expected_stop_count > 0) {
// NB: it requires to substract own queues id from total waiting queue count
// because it had got stop message before rewind was called
expected_stop_count--;
}
GAPI_LOG_DEBUG(nullptr, "id: " << this_id << ", queues count: " << in_queues.size() <<
", expected stop msg count: " << expected_stop_count);
size_t got_stop_count = 0;
while(got_stop_count < expected_stop_count) {
for (auto &&qit : ade::util::indexed(in_queues)) {
auto id2 = ade::util::index(qit);
auto &q2 = ade::util::value(qit);
if (this_id == id2) continue;
GAPI_LOG_DEBUG(nullptr, "drain next id: " << id2 <<
", stop count (" << got_stop_count << "/" <<
expected_stop_count << ")");
bool got_cmd = true;
while (q2 && got_cmd) {
Cmd cmd;
got_cmd = q2->try_pop(cmd);
if (got_cmd && cv::util::holds_alternative<Stop>(cmd)) {
got_stop_count ++;
GAPI_LOG_DEBUG(nullptr, "got stop from id: " << id2);
break;
}
}
}
}
GAPI_LOG_DEBUG(nullptr, "completed");
}
// This method handles a stop sign got from some input