mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-25 22:57:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10819 from alalek:ocl_fix_dgpu_locks

Browse Source
This commit is contained in:
Alexander Alekhin 2018-02-09 15:24:33 +00:00
commit dd2fd39c05
1 changed files with 56 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
modules/core/src/umatrix.cpp
View File

@ -149,45 +149,80 @@ void UMatData::unlock()
} }
struct UMatDataAutoLockUsage // Do not allow several lock() calls with different UMatData objects.
struct UMatDataAutoLocker
{ {
int count; int usage_count;
UMatDataAutoLockUsage() : count(0) { } UMatData* locked_objects[2];
UMatDataAutoLocker() : usage_count(0) { locked_objects[0] = NULL; locked_objects[1] = NULL; }
void lock(UMatData*& u1)
{
bool locked_1 = (u1 == locked_objects[0] || u1 == locked_objects[1]);
if (locked_1)
{
u1 = NULL;
return;
}
CV_Assert(usage_count == 0); // UMatDataAutoLock can't be used multiple times from the same thread
usage_count = 1;
locked_objects[0] = u1;
u1->lock();
}
void lock(UMatData*& u1, UMatData*& u2)
{
bool locked_1 = (u1 == locked_objects[0] || u1 == locked_objects[1]);
bool locked_2 = (u2 == locked_objects[0] || u2 == locked_objects[1]);
if (locked_1)
u1 = NULL;
if (locked_2)
u2 = NULL;
if (locked_1 && locked_2)
return;
CV_Assert(usage_count == 0); // UMatDataAutoLock can't be used multiple times from the same thread
usage_count = 1;
locked_objects[0] = u1;
locked_objects[1] = u2;
if (u1)
u1->lock();
if (u2)
u2->lock();
}
void release(UMatData* u1, UMatData* u2)
{
if (u1 == NULL && u2 == NULL)
return;
CV_Assert(usage_count == 1);
usage_count = 0;
if (u1)
u1->unlock();
if (u2)
u2->unlock();
locked_objects[0] = NULL; locked_objects[1] = NULL;
}
}; };
static TLSData<UMatDataAutoLockUsage>& getUMatDataAutoLockUsageTLS() static TLSData<UMatDataAutoLocker>& getUMatDataAutoLockerTLS()
{ {
CV_SINGLETON_LAZY_INIT_REF(TLSData<UMatDataAutoLockUsage>, new TLSData<UMatDataAutoLockUsage>()); CV_SINGLETON_LAZY_INIT_REF(TLSData<UMatDataAutoLocker>, new TLSData<UMatDataAutoLocker>());
} }
static int& getUMatDataAutoLockUsage() { return getUMatDataAutoLockUsageTLS().get()->count; } static UMatDataAutoLocker& getUMatDataAutoLocker() { return getUMatDataAutoLockerTLS().getRef(); }
UMatDataAutoLock::UMatDataAutoLock(UMatData* u) : u1(u), u2(NULL) UMatDataAutoLock::UMatDataAutoLock(UMatData* u) : u1(u), u2(NULL)
{ {
int& usage_count = getUMatDataAutoLockUsage(); getUMatDataAutoLocker().lock(u1);
CV_Assert(usage_count == 0); // UMatDataAutoLock can't be used multiple times from the same thread
usage_count = 1;
u1->lock();
} }
UMatDataAutoLock::UMatDataAutoLock(UMatData* u1_, UMatData* u2_) : u1(u1_), u2(u2_) UMatDataAutoLock::UMatDataAutoLock(UMatData* u1_, UMatData* u2_) : u1(u1_), u2(u2_)
{ {
int& usage_count = getUMatDataAutoLockUsage();
CV_Assert(usage_count == 0); // UMatDataAutoLock can't be used multiple times from the same thread
usage_count = 1;
if (getUMatDataLockIndex(u1) > getUMatDataLockIndex(u2)) if (getUMatDataLockIndex(u1) > getUMatDataLockIndex(u2))
{ {
std::swap(u1, u2); std::swap(u1, u2);
} }
u1->lock(); getUMatDataAutoLocker().lock(u1, u2);
u2->lock();
} }
UMatDataAutoLock::~UMatDataAutoLock() UMatDataAutoLock::~UMatDataAutoLock()
{ {
int& usage_count = getUMatDataAutoLockUsage(); getUMatDataAutoLocker().release(u1, u2);
CV_Assert(usage_count == 1);
usage_count = 0;
u1->unlock();
if (u2)
u2->unlock();
} }