mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-04 00:39:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20803 from alalek:core_parallel_workaround_tsan

Browse Source
This commit is contained in:
Alexander Alekhin 2021-10-04 19:16:27 +00:00
commit b1a772d194
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/src/parallel_impl.cpp
View File

@ -615,6 +615,11 @@ void ThreadPool::run(const Range& range, const ParallelLoopBody& body, double ns
{ {
WorkerThread& thread = *(threads[i].get()); WorkerThread& thread = *(threads[i].get());
if ( if (
#if defined(__clang__) && defined(__has_feature)
#if __has_feature(thread_sanitizer)
1 || // Robust workaround to avoid data race warning of `thread.job`
#endif
#endif
#if !defined(CV_USE_GLOBAL_WORKERS_COND_VAR) #if !defined(CV_USE_GLOBAL_WORKERS_COND_VAR)
thread.isActive || thread.isActive ||
#endif #endif