core(TLS): add cleanup() method

alalek · alalek · commit ec7f74f7b451 · 2017-02-21T16:08:23.000+03:00
diff --git a/modules/core/include/opencv2/core/utility.hpp b/modules/core/include/opencv2/core/utility.hpp
@@ -627,6 +627,9 @@ class CV_EXPORTS TLSDataContainer
     virtual void  deleteDataInstance(void* pData) const = 0;
 
     int key_;
+
+public:
+    void cleanup(); //! Release created TLS data container objects. It is similar to release() call, but it keeps TLS container valid.
 };
 
 // Main TLS data class
@@ -638,13 +641,15 @@ class TLSData : protected TLSDataContainer
     inline ~TLSData()       { release();            } // Release key and delete associated data
     inline T* get() const   { return (T*)getData(); } // Get data associated with key
 
-     // Get data from all threads
+    // Get data from all threads
     inline void gather(std::vector<T*> &data) const
     {
         std::vector<void*> &dataVoid = reinterpret_cast<std::vector<void*>&>(data);
         gatherData(dataVoid);
     }
 
+    inline void cleanup() { TLSDataContainer::cleanup(); }
+
 private:
     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
diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
@@ -1086,7 +1086,7 @@ class TlsStorage
     }
 
     // Release TLS storage index and pass associated data to caller
-    void releaseSlot(size_t slotIdx, std::vector<void*> &dataVec)
+    void releaseSlot(size_t slotIdx, std::vector<void*> &dataVec, bool keepSlot = false)
     {
         AutoLock guard(mtxGlobalAccess);
         CV_Assert(tlsSlots.size() > slotIdx);
@@ -1099,12 +1099,13 @@ class TlsStorage
                 if (thread_slots.size() > slotIdx && thread_slots[slotIdx])
                 {
                     dataVec.push_back(thread_slots[slotIdx]);
-                    threads[i]->slots[slotIdx] = 0;
+                    thread_slots[slotIdx] = NULL;
                 }
             }
         }
 
-        tlsSlots[slotIdx] = 0;
+        if (!keepSlot)
+            tlsSlots[slotIdx] = 0;
     }
 
     // Get data by TLS storage index
@@ -1196,9 +1197,18 @@ void TLSDataContainer::release()
     std::vector<void*> data;
     data.reserve(32);
     getTlsStorage().releaseSlot(key_, data); // Release key and get stored data for proper destruction
+    key_ = -1;
+    for(size_t i = 0; i < data.size(); i++)  // Delete all associated data
+        deleteDataInstance(data[i]);
+}
+
+void TLSDataContainer::cleanup()
+{
+    std::vector<void*> data;
+    data.reserve(32);
+    getTlsStorage().releaseSlot(key_, data, true); // Extract stored data with removal from TLS tables
     for(size_t i = 0; i < data.size(); i++)  // Delete all associated data
         deleteDataInstance(data[i]);
-    key_ = -1;
 }
 
 void* TLSDataContainer::getData() const

Original file line number	Diff line number	Diff line change
`@@ -1086,7 +1086,7 @@ class TlsStorage`
`1086`	`1086`	`}`
`1087`	`1087`
`1088`	`1088`	`// Release TLS storage index and pass associated data to caller`
`1089`		`- void releaseSlot(size_t slotIdx, std::vector<void*> &dataVec)`
	`1089`	`+ void releaseSlot(size_t slotIdx, std::vector<void*> &dataVec, bool keepSlot = false)`
`1090`	`1090`	`{`
`1091`	`1091`	`AutoLock guard(mtxGlobalAccess);`
`1092`	`1092`	`CV_Assert(tlsSlots.size() > slotIdx);`
`@@ -1099,12 +1099,13 @@ class TlsStorage`
`1099`	`1099`	`if (thread_slots.size() > slotIdx && thread_slots[slotIdx])`
`1100`	`1100`	`{`
`1101`	`1101`	`dataVec.push_back(thread_slots[slotIdx]);`
`1102`		`- threads[i]->slots[slotIdx] = 0;`
	`1102`	`+ thread_slots[slotIdx] = NULL;`
`1103`	`1103`	`}`
`1104`	`1104`	`}`
`1105`	`1105`	`}`
`1106`	`1106`
`1107`		`- tlsSlots[slotIdx] = 0;`
	`1107`	`+ if (!keepSlot)`
	`1108`	`+ tlsSlots[slotIdx] = 0;`
`1108`	`1109`	`}`
`1109`	`1110`
`1110`	`1111`	`// Get data by TLS storage index`
`@@ -1196,9 +1197,18 @@ void TLSDataContainer::release()`
`1196`	`1197`	`std::vector<void*> data;`
`1197`	`1198`	`data.reserve(32);`
`1198`	`1199`	`getTlsStorage().releaseSlot(key_, data); // Release key and get stored data for proper destruction`
	`1200`	`+ key_ = -1;`
	`1201`	`+ for(size_t i = 0; i < data.size(); i++) // Delete all associated data`
	`1202`	`+ deleteDataInstance(data[i]);`
	`1203`	`+}`
	`1204`	`+`
	`1205`	`+void TLSDataContainer::cleanup()`
	`1206`	`+{`
	`1207`	`+ std::vector<void*> data;`
	`1208`	`+ data.reserve(32);`
	`1209`	`+ getTlsStorage().releaseSlot(key_, data, true); // Extract stored data with removal from TLS tables`
`1199`	`1210`	`for(size_t i = 0; i < data.size(); i++) // Delete all associated data`
`1200`	`1211`	`deleteDataInstance(data[i]);`
`1201`		`- key_ = -1;`
`1202`	`1212`	`}`
`1203`	`1213`
`1204`	`1214`	`void* TLSDataContainer::getData() const`