core(logger): avoid destruction of GlobalLoggingInitStruct object

- keep logger available until the program termination

core(logger): avoid destruction of GlobalLoggingInitStruct object
- keep logger available until the program termination
6f5d56d9 · Alexander Alekhin · 199687a1 · 6f5d56d9 · 6f5d56d9
隐藏空白更改
内联并排

Showing with 8 addition and 2 deletion

modules/core/src/logger.cpp modules/core/src/logger.cpp +1 -2

platforms/scripts/valgrind.supp platforms/scripts/valgrind.supp +7 -0

未找到文件。
--- a/modules/core/src/logger.cpp
+++ b/modules/core/src/logger.cpp
@@ -94,8 +94,7 @@ LogLevel GlobalLoggingInitStruct::m_defaultUnconfiguredGlobalLevel = GlobalLoggi
 //
 static GlobalLoggingInitStruct& getGlobalLoggingInitStruct()
 {
-    static GlobalLoggingInitStruct globalLoggingInitInstance;
-    return globalLoggingInitInstance;
+    CV_SINGLETON_LAZY_INIT_REF(GlobalLoggingInitStruct, new GlobalLoggingInitStruct());
 }

 // To ensure that the combined struct defined above is initialized even

--- a/platforms/scripts/valgrind.supp
+++ b/platforms/scripts/valgrind.supp
@@ -218,6 +218,13 @@
   fun:__itt_*create*
 }

+{
+   OpenCV-SingletonLogger
+   Memcheck:Leak
+   ...
+   fun:_ZN2cv5utils7logging8internalL26getGlobalLoggingInitStructEv
+}
+
 {
   OpenCV-gtk_init
   Memcheck:Leak