From 96a4a7b339f7ba2d3a634fc8ca8e9f5fd80e0d41 Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Fri, 22 Nov 2013 14:31:54 +0400
Subject: [PATCH] ocl: multi-threading: fix bug in intialization

---
 modules/ocl/src/cl_context.cpp | 45 ++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/modules/ocl/src/cl_context.cpp b/modules/ocl/src/cl_context.cpp
index f9111edf1..ee541ce07 100644
--- a/modules/ocl/src/cl_context.cpp
+++ b/modules/ocl/src/cl_context.cpp
@@ -187,11 +187,8 @@ static bool parseOpenCLDeviceConfiguration(const std::string& configurationStr,
     return true;
 }
 
-static bool __deviceSelected = false;
 static bool selectOpenCLDevice()
 {
-    __deviceSelected = true;
-
     std::string platform;
     std::vector<std::string> deviceTypes;
     std::string deviceName;
@@ -526,26 +523,38 @@ private:
 
 static ContextImpl* currentContext = NULL;
 
+static bool __deviceSelected = false;
+
 Context* Context::getContext()
 {
     if (currentContext == NULL)
     {
-        if (!__initialized || !__deviceSelected)
+        static bool defaultInitiaization = false;
+        if (!defaultInitiaization)
         {
             cv::AutoLock lock(getInitializationMutex());
-            if (!__initialized)
+            try
             {
-                if (initializeOpenCLDevices() == 0)
+                if (!__initialized)
                 {
-                    CV_Error(CV_OpenCLInitError, "OpenCL not available");
+                    if (initializeOpenCLDevices() == 0)
+                    {
+                        CV_Error(CV_OpenCLInitError, "OpenCL not available");
+                    }
                 }
+                if (!__deviceSelected)
+                {
+                    if (!selectOpenCLDevice())
+                    {
+                        CV_Error(CV_OpenCLInitError, "Can't select OpenCL device");
+                    }
+                }
+                defaultInitiaization = true;
             }
-            if (!__deviceSelected)
+            catch (...)
             {
-                if (!selectOpenCLDevice())
-                {
-                    CV_Error(CV_OpenCLInitError, "Can't select OpenCL device");
-                }
+                defaultInitiaization = true;
+                throw;
             }
         }
         CV_Assert(currentContext != NULL);
@@ -739,10 +748,16 @@ int getOpenCLDevices(std::vector<const DeviceInfo*> &devices, int deviceType, co
 
 void setDevice(const DeviceInfo* info)
 {
-    if (!__deviceSelected)
+    try
+    {
+        ContextImpl::setContext(info);
         __deviceSelected = true;
-
-    ContextImpl::setContext(info);
+    }
+    catch (...)
+    {
+        __deviceSelected = true;
+        throw;
+    }
 }
 
 bool supportsFeature(FEATURE_TYPE featureType)