generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3675 from alalek:fix_coreTlsData

Browse Source
This commit is contained in:
Vadim Pisarevsky
2015-02-05 07:32:58 +00:00
parent 4c52dfc956 2054123890
commit 7854ef3840
4 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/core/src/ocl.cpp
View File

@@ -1471,7 +1471,7 @@ bool haveOpenCL()
bool useOpenCL() bool useOpenCL()
{ {
CoreTLSData* data = coreTlsData.get(); CoreTLSData* data = getCoreTlsData().get();
if( data->useOpenCL < 0 ) if( data->useOpenCL < 0 )
{ {
try try
@@ -1490,7 +1490,7 @@ void setUseOpenCL(bool flag)
{ {
if( haveOpenCL() ) if( haveOpenCL() )
{ {
CoreTLSData* data = coreTlsData.get(); CoreTLSData* data = getCoreTlsData().get();
data->useOpenCL = (flag && Device::getDefault().ptr() != NULL) ? 1 : 0; data->useOpenCL = (flag && Device::getDefault().ptr() != NULL) ? 1 : 0;
} }
} }
@@ -2161,7 +2161,7 @@ size_t Device::profilingTimerResolution() const
const Device& Device::getDefault() const Device& Device::getDefault()
{ {
const Context& ctx = Context::getDefault(); const Context& ctx = Context::getDefault();
int idx = coreTlsData.get()->device; int idx = getCoreTlsData().get()->device;
const Device& device = ctx.device(idx); const Device& device = ctx.device(idx);
return device; return device;
} }
@@ -3040,7 +3040,7 @@ void* Queue::ptr() const
Queue& Queue::getDefault() Queue& Queue::getDefault()
{ {
Queue& q = coreTlsData.get()->oclQueue; Queue& q = getCoreTlsData().get()->oclQueue;
if( !q.p && haveOpenCL() ) if( !q.p && haveOpenCL() )
q.create(Context::getDefault()); q.create(Context::getDefault());
return q; return q;

2
modules/core/src/precomp.hpp
View File

@@ -255,7 +255,7 @@ struct CoreTLSData
#endif #endif
}; };
extern TLSData<CoreTLSData> coreTlsData; TLSData<CoreTLSData>& getCoreTlsData();
#if defined(BUILD_SHARED_LIBS) #if defined(BUILD_SHARED_LIBS)
#if defined WIN32 || defined _WIN32 || defined WINCE #if defined WIN32 || defined _WIN32 || defined WINCE

2
modules/core/src/rand.cpp
View File

@@ -731,7 +731,7 @@ void RNG::fill( InputOutputArray _mat, int disttype,
cv::RNG& cv::theRNG() cv::RNG& cv::theRNG()
{ {
return coreTlsData.get()->rng; return getCoreTlsData().get()->rng;
} }
void cv::randu(InputOutputArray dst, InputArray low, InputArray high) void cv::randu(InputOutputArray dst, InputArray low, InputArray high)

24
modules/core/src/system.cpp
View File

@@ -1146,12 +1146,20 @@ TLSStorage::~TLSStorage()
tlsData_.clear(); tlsData_.clear();
} }
TLSData<CoreTLSData> coreTlsData;
TLSData<CoreTLSData>& getCoreTlsData()
{
static TLSData<CoreTLSData> *value = new TLSData<CoreTLSData>();
return *value;
}
#ifdef CV_COLLECT_IMPL_DATA #ifdef CV_COLLECT_IMPL_DATA
void setImpl(int flags) void setImpl(int flags)
{ {
CoreTLSData* data = coreTlsData.get(); CoreTLSData* data = getCoreTlsData().get();
data->implFlags = flags; data->implFlags = flags;
data->implCode.clear(); data->implCode.clear();
data->implFun.clear(); data->implFun.clear();
@@ -1159,7 +1167,7 @@ void setImpl(int flags)
void addImpl(int flag, const char* func) void addImpl(int flag, const char* func)
{ {
CoreTLSData* data = coreTlsData.get(); CoreTLSData* data = getCoreTlsData().get();
data->implFlags |= flag; data->implFlags |= flag;
if(func) // use lazy collection if name was not specified if(func) // use lazy collection if name was not specified
{ {
@@ -1174,7 +1182,7 @@ void addImpl(int flag, const char* func)
int getImpl(std::vector<int> &impl, std::vector<String> &funName) int getImpl(std::vector<int> &impl, std::vector<String> &funName)
{ {
CoreTLSData* data = coreTlsData.get(); CoreTLSData* data = getCoreTlsData().get();
impl = data->implCode; impl = data->implCode;
funName = data->implFun; funName = data->implFun;
return data->implFlags; // return actual flags for lazy collection return data->implFlags; // return actual flags for lazy collection
@@ -1182,13 +1190,13 @@ int getImpl(std::vector<int> &impl, std::vector<String> &funName)
bool useCollection() bool useCollection()
{ {
CoreTLSData* data = coreTlsData.get(); CoreTLSData* data = getCoreTlsData().get();
return data->useCollection; return data->useCollection;
} }
void setUseCollection(bool flag) void setUseCollection(bool flag)
{ {
CoreTLSData* data = coreTlsData.get(); CoreTLSData* data = getCoreTlsData().get();
data->useCollection = flag; data->useCollection = flag;
} }
#endif #endif
@@ -1221,7 +1229,7 @@ String getIppErrorLocation()
bool useIPP() bool useIPP()
{ {
#ifdef HAVE_IPP #ifdef HAVE_IPP
CoreTLSData* data = coreTlsData.get(); CoreTLSData* data = getCoreTlsData().get();
if(data->useIPP < 0) if(data->useIPP < 0)
{ {
const char* pIppEnv = getenv("OPENCV_IPP"); const char* pIppEnv = getenv("OPENCV_IPP");
@@ -1238,7 +1246,7 @@ bool useIPP()
void setUseIPP(bool flag) void setUseIPP(bool flag)
{ {
CoreTLSData* data = coreTlsData.get(); CoreTLSData* data = getCoreTlsData().get();
#ifdef HAVE_IPP #ifdef HAVE_IPP
data->useIPP = flag; data->useIPP = flag;
#else #else