fixed ocl.cpp data races without requiring additional locking #27638
+10
−14
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
not ready for review |
|
@opencv-alalek could you take a look? |
882cbc5 to
dc0bfd0
Compare
|
Improved, ready for review. |
| @@ -6602,17 +6599,16 @@ class OpenCLAllocator CV_FINAL : public MatAllocator | |||
|
|
|||
| void flushCleanupQueue() const | |||
| { | |||
| if (!cleanupQueue.empty()) | |||
There was a problem hiding this comment.
Forcing mutex usage is a performance degradation.
| @@ -3500,7 +3500,7 @@ struct Kernel::Impl | |||
|
|
|||
| void addUMat(const UMat& m, bool dst) | |||
| { | |||
| CV_Assert(nu < MAX_ARRS && m.u && m.u->urefcount > 0); | |||
There was a problem hiding this comment.
We should not drop sanity checks.
We don't need exact values of refcount, we just check that object is still alive (any value > 0).
| @@ -5670,9 +5670,6 @@ class OpenCLAllocator CV_FINAL : public MatAllocator | |||
| if(!u) | |||
| return; | |||
|
|
|||
| CV_Assert(u->urefcount == 0); | |||
| CV_Assert(u->refcount == 0 && "UMat deallocation error: some derived Mat is still alive"); | |||
There was a problem hiding this comment.
We should not drop sanity checks.
We don't need exact values of refcount, we just check that object is still alive (any value > 0) or not.
|
Ok, i understand. i will write source comments for those false positives so others can quickly discard them. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See: #27637
Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
Patch to opencv_extra has the same branch name.