Merge remote-tracking branch 'upstream/3.4' into merge-3.4

diff --cc cmake/OpenCVDetectCXXCompiler.cmake
Simple merge

diff --cc modules/core/src/parallel.cpp
Simple merge

diff --cc modules/core/src/system.cpp
index 9d35939,27142a4..f3f47e4
--- 1/modules/core/src/system.cpp
--- 2/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@@@ -53,8 -53,18 +53,20 @@@
  #include <opencv2/core/utils/tls.hpp>
  #include <opencv2/core/utils/instrumentation.hpp>
  
 +#include <opencv2/core/utils/filesystem.private.hpp>
 +
+ #ifndef OPENCV_WITH_THREAD_SANITIZER
+   #if defined(__clang__) && defined(__has_feature)
+   #if __has_feature(thread_sanitizer)
+       #define OPENCV_WITH_THREAD_SANITIZER 1
+       #include <atomic>  // assume C++11
+   #endif
+   #endif
+ #endif
+ #ifndef OPENCV_WITH_THREAD_SANITIZER
+     #define OPENCV_WITH_THREAD_SANITIZER 0
+ #endif
+ 
  namespace cv {
  
  static void _initSystem()
@@@ -1430,17 -1474,39 +1431,26 @@@ private
  #endif
  };
  
- template<> bool DisposedSingletonMark<TlsAbstraction>::mark = false;
- 
- static TlsAbstraction& getTlsAbstraction_()
+ class TlsAbstractionReleaseGuard
  {
-     static TlsAbstraction g_tls;  // disposed in atexit() handlers (required for unregistering our callbacks)
-     return g_tls;
- }
+     TlsAbstraction& tls_;
+ public:
+     TlsAbstractionReleaseGuard(TlsAbstraction& tls) : tls_(tls)
+     {
+         /* nothing */
+     }
+     ~TlsAbstractionReleaseGuard()
+     {
+         tls_.releaseSystemResources();
+     }
+ };
+ 
+ // TODO use reference
  static TlsAbstraction* getTlsAbstraction()
  {
-     static TlsAbstraction* instance = &getTlsAbstraction_();
-     return DisposedSingletonMark<TlsAbstraction>::isDisposed() ? NULL : instance;
 -#ifdef CV_CXX11
+     static TlsAbstraction *g_tls = new TlsAbstraction();  // memory leak is intended here to avoid disposing of TLS container
+     static TlsAbstractionReleaseGuard g_tlsReleaseGuard(*g_tls);
 -#else
 -    static TlsAbstraction* volatile g_tls = NULL;
 -    if (g_tls == NULL)
 -    {
 -        cv::AutoLock lock(cv::getInitializationMutex());
 -        if (g_tls == NULL)
 -        {
 -            g_tls = new TlsAbstraction();
 -            static TlsAbstractionReleaseGuard g_tlsReleaseGuard(*g_tls);
 -        }
 -    }
 -#endif
+     return g_tls;
  }
  
  
@@@ -1790,115 -1869,8 +1813,115 @@@ static TlsStorage* const g_force_initia
  #if defined __GNUC__
      __attribute__((unused))
  #endif
-     = getTlsAbstraction();
+     = &getTlsStorage();
  
 +
 +#else  // OPENCV_DISABLE_THREAD_SUPPORT
 +
 +// no threading (OPENCV_DISABLE_THREAD_SUPPORT=ON)
 +class TlsStorage
 +{
 +public:
 +    TlsStorage()
 +    {
 +        slots.reserve(32);
 +    }
 +    ~TlsStorage()
 +    {
 +        for (size_t slotIdx = 0; slotIdx < slots.size(); slotIdx++)
 +        {
 +            SlotInfo& s = slots[slotIdx];
 +            TLSDataContainer* container = s.container;
 +            if (container && s.data)
 +            {
 +                container->deleteDataInstance(s.data);  // Can't use from SlotInfo destructor
 +                s.data = nullptr;
 +            }
 +        }
 +    }
 +
 +    // Reserve TLS storage index
 +    size_t reserveSlot(TLSDataContainer* container)
 +    {
 +        size_t slotsSize = slots.size();
 +        for (size_t slot = 0; slot < slotsSize; slot++)
 +        {
 +            SlotInfo& s = slots[slot];
 +            if (s.container == NULL)
 +            {
 +                CV_Assert(!s.data);
 +                s.container = container;
 +                return slot;
 +            }
 +        }
 +
 +        // create new slot
 +        slots.push_back(SlotInfo(container));
 +        return slotsSize;
 +    }
 +
 +    // Release TLS storage index and pass associated data to caller
 +    void releaseSlot(size_t slotIdx, std::vector<void*> &dataVec, bool keepSlot = false)
 +    {
 +        CV_Assert(slotIdx < slots.size());
 +        SlotInfo& s = slots[slotIdx];
 +        void* data = s.data;
 +        if (data)
 +        {
 +            dataVec.push_back(data);
 +            s.data = nullptr;
 +        }
 +        if (!keepSlot)
 +        {
 +            s.container = NULL;  // mark slot as free (see reserveSlot() implementation)
 +        }
 +    }
 +
 +    // Get data by TLS storage index
 +    void* getData(size_t slotIdx) const
 +    {
 +        CV_Assert(slotIdx < slots.size());
 +        const SlotInfo& s = slots[slotIdx];
 +        return s.data;
 +    }
 +
 +    // Gather data from threads by TLS storage index
 +    void gather(size_t slotIdx, std::vector<void*> &dataVec)
 +    {
 +        CV_Assert(slotIdx < slots.size());
 +        SlotInfo& s = slots[slotIdx];
 +        void* data = s.data;
 +        if (data)
 +            dataVec.push_back(data);
 +        return;
 +    }
 +
 +    // Set data to storage index
 +    void setData(size_t slotIdx, void* pData)
 +    {
 +        CV_Assert(slotIdx < slots.size());
 +        SlotInfo& s = slots[slotIdx];
 +        s.data = pData;
 +    }
 +
 +private:
 +    struct SlotInfo
 +    {
 +        SlotInfo(TLSDataContainer* _container) : container(_container), data(nullptr) {}
 +        TLSDataContainer* container;  // attached container (to dispose data)
 +        void* data;
 +    };
 +    std::vector<struct SlotInfo> slots;
 +};
 +
 +static TlsStorage& getTlsStorage()
 +{
 +    static TlsStorage g_storage;  // no threading
 +    return g_storage;
 +}
 +
 +#endif  // OPENCV_DISABLE_THREAD_SUPPORT
 +
  } // namespace details
  using namespace details;
  

diff --cc modules/dnn/src/layers/convolution_layer.cpp
index ec2904e,1236ff5..bb6fd5f
--- 1/modules/dnn/src/layers/convolution_layer.cpp
--- 2/modules/dnn/src/layers/convolution_layer.cpp
+++ b/modules/dnn/src/layers/convolution_layer.cpp
@@@ -46,8 -45,8 +46,9 @@@
  #include "../op_halide.hpp"
  #include "../op_inf_engine.hpp"
  #include "../ie_ngraph.hpp"
 +#include "../op_vkcom.hpp"
  
+ #include <opencv2/core/utils/configuration.private.hpp>
  #include <opencv2/core/utils/logger.hpp>
  
  #include "opencv2/core/hal/hal.hpp"

diff --cc modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp
Simple merge

diff --cc modules/features2d/src/orb.cpp
Simple merge

diff --cc modules/features2d/test/test_orb.cpp
Simple merge

diff --cc modules/videoio/src/cap_gstreamer.cpp
Simple merge

diff --cc platforms/scripts/valgrind.supp
Simple merge