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

Merge pull request #5242 from apavlenko:fix_releasing_temp_umat

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-08-27 14:29:52 +00:00
commit a78da45fec
2 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4571,17 +4571,13 @@ public:
} }
else else
{ {
// CL_MEM_USE_HOST_PTR (nothing is required) and OTHER cases cl_int retval = 0;
if (u->flags & UMatData::USER_ALLOCATED) void* data = clEnqueueMapBuffer(q, (cl_mem)u->handle, CL_TRUE,
{ (CL_MAP_READ | CL_MAP_WRITE),
cl_int retval = 0; 0, u->size, 0, 0, 0, &retval);
void* data = clEnqueueMapBuffer(q, (cl_mem)u->handle, CL_TRUE, CV_OclDbgAssert(retval == CL_SUCCESS);
(CL_MAP_READ | CL_MAP_WRITE), CV_OclDbgAssert(clEnqueueUnmapMemObject(q, (cl_mem)u->handle, data, 0, 0, 0) == CL_SUCCESS);
0, u->size, 0, 0, 0, &retval); CV_OclDbgAssert(clFinish(q) == CL_SUCCESS);
CV_OclDbgAssert(retval == CL_SUCCESS);
CV_OclDbgAssert(clEnqueueUnmapMemObject(q, (cl_mem)u->handle, data, 0, 0, 0) == CL_SUCCESS);
CV_OclDbgAssert(clFinish(q) == CL_SUCCESS);
}
} }
} }
u->markHostCopyObsolete(false); u->markHostCopyObsolete(false);
@ -4686,8 +4682,6 @@ public:
cl_command_queue q = (cl_command_queue)Queue::getDefault().ptr(); cl_command_queue q = (cl_command_queue)Queue::getDefault().ptr();
// FIXIT Workaround for UMat synchronization issue
// if( u->refcount == 0 )
{ {
if( !u->copyOnMap() ) if( !u->copyOnMap() )
{ {
@ -4720,11 +4714,6 @@ public:
return; return;
} }
#endif #endif
if (!u->hostCopyObsolete()) // FIXIT Workaround for UMat synchronization issue
{
CV_Assert(u->data);
return;
}
cl_int retval = 0; cl_int retval = 0;
u->data = (uchar*)clEnqueueMapBuffer(q, (cl_mem)u->handle, CL_TRUE, u->data = (uchar*)clEnqueueMapBuffer(q, (cl_mem)u->handle, CL_TRUE,
@ -4771,10 +4760,6 @@ public:
UMatDataAutoLock autolock(u); UMatDataAutoLock autolock(u);
// FIXIT Workaround for UMat synchronization issue
if(u->refcount > 0)
return;
cl_command_queue q = (cl_command_queue)Queue::getDefault().ptr(); cl_command_queue q = (cl_command_queue)Queue::getDefault().ptr();
cl_int retval = 0; cl_int retval = 0;
if( !u->copyOnMap() && u->deviceMemMapped() ) if( !u->copyOnMap() && u->deviceMemMapped() )
@ -4800,7 +4785,8 @@ public:
u->allocatorFlags_ &= ~svm::OPENCL_SVM_BUFFER_MAP; u->allocatorFlags_ &= ~svm::OPENCL_SVM_BUFFER_MAP;
} }
} }
u->data = 0; if (u->refcount == 0)
u->data = 0;
u->markDeviceCopyObsolete(false); u->markDeviceCopyObsolete(false);
u->markHostCopyObsolete(true); u->markHostCopyObsolete(true);
return; return;
@ -4813,7 +4799,9 @@ public:
// required for multithreaded applications (see stitching test) // required for multithreaded applications (see stitching test)
CV_OclDbgAssert(clFinish(q) == CL_SUCCESS); CV_OclDbgAssert(clFinish(q) == CL_SUCCESS);
} }
u->data = 0;
if (u->refcount == 0)
u->data = 0;
} }
else if( u->copyOnMap() && u->deviceCopyObsolete() ) else if( u->copyOnMap() && u->deviceCopyObsolete() )
{ {

5
modules/core/test/test_umat.cpp
View File

@ -1102,8 +1102,9 @@ TEST(UMat, map_unmap_counting)
Mat m(Size(10, 10), CV_8UC1); Mat m(Size(10, 10), CV_8UC1);
UMat um = m.getUMat(ACCESS_RW); UMat um = m.getUMat(ACCESS_RW);
{ {
Mat d = um.getMat(ACCESS_RW); Mat d1 = um.getMat(ACCESS_RW);
d.release(); Mat d2 = um.getMat(ACCESS_RW);
d1.release();
} }
void* h = NULL; void* h = NULL;
EXPECT_NO_THROW(h = um.handle(ACCESS_RW)); EXPECT_NO_THROW(h = um.handle(ACCESS_RW));