Merge pull request opencv#5177 from lupustr3:pvlasov/tls_fixes

alalek · alalek · commit 887d8d091bb1 · 2015-08-19T14:18:19.000Z
diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h
@@ -58,6 +58,8 @@
 
 #include "opencv2/hal/defs.h"
 
+#define OPENCV_ABI_COMPATIBILITY 300
+
 #ifdef __OPENCV_BUILD
 #  define DISABLE_OPENCV_24_COMPATIBILITY
 #endif
diff --git a/modules/core/include/opencv2/core/utility.hpp b/modules/core/include/opencv2/core/utility.hpp
@@ -513,30 +513,42 @@ class CV_EXPORTS AutoLock
     AutoLock& operator = (const AutoLock&);
 };
 
+// TLS interface
 class CV_EXPORTS TLSDataContainer
 {
-private:
-    int key_;
 protected:
     TLSDataContainer();
     virtual ~TLSDataContainer();
+
+#if OPENCV_ABI_COMPATIBILITY > 300
+    void* getData() const;
+    void  release();
+
+private:
+#else
+    void  release();
+
 public:
+    void* getData() const;
+#endif
     virtual void* createDataInstance() const = 0;
-    virtual void deleteDataInstance(void* data) const = 0;
+    virtual void  deleteDataInstance(void* pData) const = 0;
 
-    void* getData() const;
+    int key_;
 };
 
+// Main TLS data class
 template <typename T>
 class TLSData : protected TLSDataContainer
 {
 public:
-    inline TLSData() {}
-    inline ~TLSData() {}
-    inline T* get() const { return (T*)getData(); }
+    inline TLSData()        {}
+    inline ~TLSData()       { release();            } // Release key and delete associated data
+    inline T* get() const   { return (T*)getData(); } // Get data assosiated with key
+
 private:
-    virtual void* createDataInstance() const { return new T; }
-    virtual void deleteDataInstance(void* data) const { delete (T*)data; }
+    virtual void* createDataInstance() const {return new T;}                // Wrapper to allocate data by template
+    virtual void  deleteDataInstance(void* pData) const {delete (T*)pData;} // Wrapper to release data by template
 };
 
 /** @brief Designed for command line parsing
diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
