NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: base: semaphore: Apply clang thread safety annotation

Browse source 
This annotates member functions and variables of Semaphore 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>
This commit is contained in:
Hirokazu Honda 2022-11-03 18:50:37 +05:30 • committed by Umang Jain
parent 056da47e2d
commit b5d26eab4d
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/libcamera/base/semaphore.h
View file

@ -18,15 +18,15 @@ class Semaphore
public: public:
Semaphore(unsigned int n = 0); Semaphore(unsigned int n = 0);
unsigned int available(); unsigned int available() LIBCAMERA_TSA_EXCLUDES(mutex_);
void acquire(unsigned int n = 1); void acquire(unsigned int n = 1) LIBCAMERA_TSA_EXCLUDES(mutex_);
bool tryAcquire(unsigned int n = 1); bool tryAcquire(unsigned int n = 1) LIBCAMERA_TSA_EXCLUDES(mutex_);
void release(unsigned int n = 1); void release(unsigned int n = 1) LIBCAMERA_TSA_EXCLUDES(mutex_);
private: private:
Mutex mutex_; Mutex mutex_;
ConditionVariable cv_; ConditionVariable cv_;
unsigned int available_; unsigned int available_ LIBCAMERA_TSA_GUARDED_BY(mutex_);
}; };
} /* namespace libcamera */ } /* namespace libcamera */

4
src/libcamera/base/semaphore.cpp
View file

@ -56,7 +56,9 @@ unsigned int Semaphore::available()
void Semaphore::acquire(unsigned int n) void Semaphore::acquire(unsigned int n)
{ {
MutexLocker locker(mutex_); MutexLocker locker(mutex_);
cv_.wait(locker, [&] { return available_ >= n; }); cv_.wait(locker, [&]() LIBCAMERA_TSA_REQUIRES(mutex_) {
return available_ >= n;
});
available_ -= n; available_ -= n;
} }