mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 06:26:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

core(ocl): do not split refcount operations / compare

Browse Source 
- check result from CV_XADD() directly
- decrease urefcount after unmap() call only
This commit is contained in:
Alexander Alekhin 2018-07-30 14:09:50 +03:00
parent 2f0fc920dd
commit e90e398e7a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,14 +84,11 @@ UMatData::~UMatData()
allocatorFlags_ = 0; allocatorFlags_ = 0;
if (originalUMatData) if (originalUMatData)
{ {
UMatData* u = originalUMatData;
CV_XADD(&(u->urefcount), -1);
CV_XADD(&(u->refcount), -1);
bool showWarn = false; bool showWarn = false;
if (u->refcount == 0) UMatData* u = originalUMatData;
bool zero_Ref = CV_XADD(&(u->refcount), -1) == 1;
if (zero_Ref)
{ {
if (u->urefcount > 0)
showWarn = true;
// simulate Mat::deallocate // simulate Mat::deallocate
if (u->mapcount != 0) if (u->mapcount != 0)
{ {
@ -102,7 +99,10 @@ UMatData::~UMatData()
// we don't do "map", so we can't do "unmap" // we don't do "map", so we can't do "unmap"
} }
} }
if (u->refcount == 0 && u->urefcount == 0) // oops, we need to free resources bool zero_URef = CV_XADD(&(u->urefcount), -1) == 1;
if (zero_Ref && !zero_URef)
showWarn = true;
if (zero_Ref && zero_URef) // oops, we need to free resources
{ {
showWarn = true; showWarn = true;
// simulate UMat::deallocate // simulate UMat::deallocate