1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00

Merge pull request #15238 from andrey-golubev:fluid_fix_journal

G-API: Fix Journal usage in Fluid backend (#15238)

* Fix Journal usage in Fluid backend

* Delete dumpDotRequired(): invalid check

* Update mem consumption test

* Test that new test works

* Debug memory consumption function

* Increase iterations in test

* Re-write memory consumption measurement part

* Restore correct fix for Fluid journals
This commit is contained in:
Andrey Golubev
2019-08-14 10:03:52 +03:00
committed by Alexander Alekhin
parent f7f2438478
commit f6bb900259
4 changed files with 71 additions and 0 deletions
+10
View File
@@ -185,6 +185,16 @@ void GModel::log(Graph &g, ade::EdgeHandle eh, std::string &&msg, ade::NodeHandl
}
}
void GModel::log_clear(Graph &g, ade::NodeHandle node)
{
if (g.metadata(node).contains<Journal>())
{
// according to documentation, clear() doesn't deallocate (__capacity__ of vector preserved)
g.metadata(node).get<Journal>().messages.clear();
}
}
ade::NodeHandle GModel::detail::dataNodeOf(const ConstLayoutGraph &g, const GOrigin &origin)
{
// FIXME: Does it still work with graph transformations, e.g. redirectWriter()??