From 8293ed7f9b9cbae0c585f191bc80f1910e92b8f8 Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Wed, 5 Aug 2015 17:27:18 +0300
Subject: [PATCH 1/2] add tests from issue 4468 (#5062)

---
 modules/core/test/test_umat.cpp | 68 +++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/modules/core/test/test_umat.cpp b/modules/core/test/test_umat.cpp
index 3640d930f5..4b2b7c1a6d 100644
--- a/modules/core/test/test_umat.cpp
+++ b/modules/core/test/test_umat.cpp
@@ -1026,6 +1026,74 @@ TEST(UMat, map_unmap_counting)
 }
 
 
+///////////// oclCleanupCallback threadsafe check (#5062) /////////////////////
+
+// Case 1: reuse of old src Mat in OCL pipe. Hard to catch!
+OCL_TEST(UMat, OCL_ThreadSafe_CleanupCallback_1_VeryLongTest)
+{
+    if (!cv::ocl::useOpenCL())
+    {
+        std::cout << "OpenCL is not enabled. Skip test" << std::endl;
+        return;
+    }
+    for (int j = 0; j < test_loop_times; j++)
+    {
+        const Size srcSize(320, 240);
+        const int type = CV_8UC1;
+        const int dtype = CV_16UC1;
+
+        Mat src(srcSize, type);
+        Mat dst_ref(srcSize, dtype);
+
+        // Generate reference data as additional check
+        OCL_OFF(src.convertTo(dst_ref, dtype));
+        cv::ocl::setUseOpenCL(true); // restore OpenCL state
+
+        UMat dst(srcSize, dtype);
+
+        // Use multiple iterations to increase chance of data race catching
+        for(int k = 0; k < 10000; k++)
+        {
+            UMat tmpUMat = src.getUMat(ACCESS_RW);
+            tmpUMat.convertTo(dst, dtype);
+            ::cv::ocl::finish(); // force kernel to complete to start cleanup sooner
+        }
+
+        EXPECT_MAT_NEAR(dst_ref, dst, 1);
+    }
+}
+
+// Case 2: concurent deallocation of UMatData between UMat and Mat deallocators. Hard to catch!
+OCL_TEST(UMat, OCL_ThreadSafe_CleanupCallback_2_VeryLongTest)
+{
+    if (!cv::ocl::useOpenCL())
+    {
+        std::cout << "OpenCL is not enabled. Skip test" << std::endl;
+        return;
+    }
+    for (int j = 0; j < test_loop_times; j++)
+    {
+        const Size srcSize(320, 240);
+        const int type = CV_8UC1;
+        const int dtype = CV_16UC1;
+
+        // This test is only relevant for OCL
+        UMat dst(srcSize, dtype);
+
+        // Use multiple iterations to increase chance of data race catching
+        for(int k = 0; k < 10000; k++)
+        {
+            Mat src(srcSize, type); // Declare src inside loop now to catch its destruction on stack
+            {
+                UMat tmpUMat = src.getUMat(ACCESS_RW);
+                tmpUMat.convertTo(dst, dtype);
+            }
+            ::cv::ocl::finish(); // force kernel to complete to start cleanup sooner
+        }
+    }
+}
+
+
 
 TEST(UMat, DISABLED_Test_same_behaviour_read_and_read)
 {

From 3316e5831414c61a89263470d9a615f9394da5cf Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Thu, 6 Aug 2015 13:52:35 +0300
Subject: [PATCH 2/2] more test loops (and disable tests - tests pass but
 require a lot of time)

---
 modules/core/test/test_umat.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/core/test/test_umat.cpp b/modules/core/test/test_umat.cpp
index 4b2b7c1a6d..98cb755a58 100644
--- a/modules/core/test/test_umat.cpp
+++ b/modules/core/test/test_umat.cpp
@@ -1029,14 +1029,14 @@ TEST(UMat, map_unmap_counting)
 ///////////// oclCleanupCallback threadsafe check (#5062) /////////////////////
 
 // Case 1: reuse of old src Mat in OCL pipe. Hard to catch!
-OCL_TEST(UMat, OCL_ThreadSafe_CleanupCallback_1_VeryLongTest)
+OCL_TEST(UMat, DISABLED_OCL_ThreadSafe_CleanupCallback_1_VeryLongTest)
 {
     if (!cv::ocl::useOpenCL())
     {
         std::cout << "OpenCL is not enabled. Skip test" << std::endl;
         return;
     }
-    for (int j = 0; j < test_loop_times; j++)
+    for (int j = 0; j < 100; j++)
     {
         const Size srcSize(320, 240);
         const int type = CV_8UC1;
@@ -1060,18 +1060,19 @@ OCL_TEST(UMat, OCL_ThreadSafe_CleanupCallback_1_VeryLongTest)
         }
 
         EXPECT_MAT_NEAR(dst_ref, dst, 1);
+        printf(".\n"); fflush(stdout);
     }
 }
 
 // Case 2: concurent deallocation of UMatData between UMat and Mat deallocators. Hard to catch!
-OCL_TEST(UMat, OCL_ThreadSafe_CleanupCallback_2_VeryLongTest)
+OCL_TEST(UMat, DISABLED_OCL_ThreadSafe_CleanupCallback_2_VeryLongTest)
 {
     if (!cv::ocl::useOpenCL())
     {
         std::cout << "OpenCL is not enabled. Skip test" << std::endl;
         return;
     }
-    for (int j = 0; j < test_loop_times; j++)
+    for (int j = 0; j < 100; j++)
     {
         const Size srcSize(320, 240);
         const int type = CV_8UC1;
@@ -1090,6 +1091,7 @@ OCL_TEST(UMat, OCL_ThreadSafe_CleanupCallback_2_VeryLongTest)
             }
             ::cv::ocl::finish(); // force kernel to complete to start cleanup sooner
         }
+        printf(".\n"); fflush(stdout);
     }
 }