diff options
| author | Hirokazu Honda <hiroh@chromium.org> | 2022-11-03 18:50:38 +0530 |
|---|---|---|
| committer | Umang Jain <umang.jain@ideasonboard.com> | 2022-11-11 16:25:46 +0530 |
| commit | c39885ed9bd25b55dd1619c1755a55f6edeec7c4 (patch) | |
| tree | 2969ea1e608a74f02150dfbb537253e6b976c348 | |
| parent | b5d26eab4dfba37f188ce66ba356e2cc30a4000a (diff) | |
libcamera: base: thread: Apply clang thread safety annotation
This annotates member variables of ThreadData by clang thread
safety annotations.
Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
| -rw-r--r-- | src/libcamera/base/thread.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/libcamera/base/thread.cpp b/src/libcamera/base/thread.cpp index 6bda9d14..b96951ac 100644 --- a/src/libcamera/base/thread.cpp +++ b/src/libcamera/base/thread.cpp @@ -151,7 +151,7 @@ private: friend class ThreadMain; Thread *thread_; - bool running_; + bool running_ LIBCAMERA_TSA_GUARDED_BY(mutex_); pid_t tid_; Mutex mutex_; @@ -422,11 +422,15 @@ bool Thread::wait(utils::duration duration) { MutexLocker locker(data_->mutex_); + auto isRunning = ([&]() LIBCAMERA_TSA_REQUIRES(data_->mutex_) { + return !data_->running_; + }); + if (duration == utils::duration::max()) - data_->cv_.wait(locker, [&]() { return !data_->running_; }); + data_->cv_.wait(locker, isRunning); else hasFinished = data_->cv_.wait_for(locker, duration, - [&]() { return !data_->running_; }); + isRunning); } if (thread_.joinable()) |