Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
34046ec6
Commit
34046ec6
authored
Jul 07, 2017
by
Maksim Shabunin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9105 from alalek:ocl_update_event_callback
parents
f670a992
daee9821
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
12 deletions
+24
-12
ocl.cpp
modules/core/src/ocl.cpp
+24
-12
No files found.
modules/core/src/ocl.cpp
View file @
34046ec6
...
...
@@ -1962,7 +1962,7 @@ KernelArg KernelArg::Constant(const Mat& m)
struct
Kernel
::
Impl
{
Impl
(
const
char
*
kname
,
const
Program
&
prog
)
:
refcount
(
1
),
e
(
0
),
nu
(
0
)
refcount
(
1
),
isInProgress
(
false
),
nu
(
0
)
{
cl_program
ph
=
(
cl_program
)
prog
.
ptr
();
cl_int
retval
=
0
;
...
...
@@ -2005,11 +2005,15 @@ struct Kernel::Impl
images
.
push_back
(
image
);
}
void
finit
()
void
finit
(
cl_event
e
)
{
CV_UNUSED
(
e
);
#if 0
printf("event::callback(%p)\n", e); fflush(stdout);
#endif
cleanupUMats
();
images
.
clear
();
i
f
(
e
)
{
clReleaseEvent
(
e
);
e
=
0
;
}
i
sInProgress
=
false
;
release
();
}
...
...
@@ -2025,9 +2029,9 @@ struct Kernel::Impl
cv
::
String
name
;
#endif
cl_kernel
handle
;
cl_event
e
;
enum
{
MAX_ARRS
=
16
};
UMatData
*
u
[
MAX_ARRS
];
bool
isInProgress
;
int
nu
;
std
::
list
<
Image2D
>
images
;
bool
haveTempDstUMats
;
...
...
@@ -2037,9 +2041,9 @@ struct Kernel::Impl
extern
"C"
{
static
void
CL_CALLBACK
oclCleanupCallback
(
cl_event
,
cl_int
,
void
*
p
)
static
void
CL_CALLBACK
oclCleanupCallback
(
cl_event
e
,
cl_int
,
void
*
p
)
{
((
cv
::
ocl
::
Kernel
::
Impl
*
)
p
)
->
finit
();
((
cv
::
ocl
::
Kernel
::
Impl
*
)
p
)
->
finit
(
e
);
}
}
...
...
@@ -2246,7 +2250,7 @@ bool Kernel::run(int dims, size_t _globalsize[], size_t _localsize[],
{
CV_INSTRUMENT_REGION_OPENCL_RUN
(
p
->
name
.
c_str
());
if
(
!
p
||
!
p
->
handle
||
p
->
e
!=
0
)
if
(
!
p
||
!
p
->
handle
||
p
->
isInProgress
)
return
false
;
cl_command_queue
qq
=
getQueue
(
q
);
...
...
@@ -2265,9 +2269,10 @@ bool Kernel::run(int dims, size_t _globalsize[], size_t _localsize[],
return
true
;
if
(
p
->
haveTempDstUMats
)
sync
=
true
;
cl_event
asyncEvent
=
0
;
cl_int
retval
=
clEnqueueNDRangeKernel
(
qq
,
p
->
handle
,
(
cl_uint
)
dims
,
offset
,
globalsize
,
_localsize
,
0
,
0
,
sync
?
0
:
&
p
->
e
);
sync
?
0
:
&
asyncEvent
);
#if CV_OPENCL_SHOW_RUN_ERRORS
if
(
retval
!=
CL_SUCCESS
)
{
...
...
@@ -2283,18 +2288,22 @@ bool Kernel::run(int dims, size_t _globalsize[], size_t _localsize[],
else
{
p
->
addref
();
CV_OclDbgAssert
(
clSetEventCallback
(
p
->
e
,
CL_COMPLETE
,
oclCleanupCallback
,
p
)
==
CL_SUCCESS
);
p
->
isInProgress
=
true
;
CV_OclDbgAssert
(
clSetEventCallback
(
asyncEvent
,
CL_COMPLETE
,
oclCleanupCallback
,
p
)
==
CL_SUCCESS
);
}
if
(
asyncEvent
)
clReleaseEvent
(
asyncEvent
);
return
retval
==
CL_SUCCESS
;
}
bool
Kernel
::
runTask
(
bool
sync
,
const
Queue
&
q
)
{
if
(
!
p
||
!
p
->
handle
||
p
->
e
!=
0
)
if
(
!
p
||
!
p
->
handle
||
p
->
isInProgress
)
return
false
;
cl_command_queue
qq
=
getQueue
(
q
);
cl_int
retval
=
clEnqueueTask
(
qq
,
p
->
handle
,
0
,
0
,
sync
?
0
:
&
p
->
e
);
cl_event
asyncEvent
=
0
;
cl_int
retval
=
clEnqueueTask
(
qq
,
p
->
handle
,
0
,
0
,
sync
?
0
:
&
asyncEvent
);
if
(
sync
||
retval
!=
CL_SUCCESS
)
{
CV_OclDbgAssert
(
clFinish
(
qq
)
==
CL_SUCCESS
);
...
...
@@ -2303,8 +2312,11 @@ bool Kernel::runTask(bool sync, const Queue& q)
else
{
p
->
addref
();
CV_OclDbgAssert
(
clSetEventCallback
(
p
->
e
,
CL_COMPLETE
,
oclCleanupCallback
,
p
)
==
CL_SUCCESS
);
p
->
isInProgress
=
true
;
CV_OclDbgAssert
(
clSetEventCallback
(
asyncEvent
,
CL_COMPLETE
,
oclCleanupCallback
,
p
)
==
CL_SUCCESS
);
}
if
(
asyncEvent
)
clReleaseEvent
(
asyncEvent
);
return
retval
==
CL_SUCCESS
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment