[libcamera-devel] [PATCH 5/7] libcamera: camera_manager: Apply clang thread safety annotation
Hirokazu Honda
hiroh at chromium.org
Fri Dec 3 17:46:17 CET 2021
This annotates member functions and variables of
CameraManager::Private by clang thread safety annotations.
Signed-off-by: Hirokazu Honda <hiroh at chromium.org>
---
src/libcamera/camera_manager.cpp | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp
index 4492edc3..507f68f5 100644
--- a/src/libcamera/camera_manager.cpp
+++ b/src/libcamera/camera_manager.cpp
@@ -42,8 +42,8 @@ public:
int start();
void addCamera(std::shared_ptr<Camera> camera,
- const std::vector<dev_t> &devnums);
- void removeCamera(Camera *camera);
+ const std::vector<dev_t> &devnums) LIBCAMERA_TSA_EXCLUDES(mutex_);
+ void removeCamera(Camera *camera) LIBCAMERA_TSA_EXCLUDES(mutex_);
/*
* This mutex protects
@@ -52,8 +52,8 @@ public:
* - cameras_ and camerasByDevnum_ after initialization
*/
mutable Mutex mutex_;
- std::vector<std::shared_ptr<Camera>> cameras_;
- std::map<dev_t, std::weak_ptr<Camera>> camerasByDevnum_;
+ std::vector<std::shared_ptr<Camera>> cameras_ LIBCAMERA_TSA_GUARDED_BY(mutex_);
+ std::map<dev_t, std::weak_ptr<Camera>> camerasByDevnum_ LIBCAMERA_TSA_GUARDED_BY(mutex_);
protected:
void run() override;
@@ -61,11 +61,11 @@ protected:
private:
int init();
void createPipelineHandlers();
- void cleanup();
+ void cleanup() LIBCAMERA_TSA_EXCLUDES(mutex_);
ConditionVariable cv_;
- bool initialized_;
- int status_;
+ bool initialized_ LIBCAMERA_TSA_GUARDED_BY(mutex_);
+ int status_ LIBCAMERA_TSA_GUARDED_BY(mutex_);
std::unique_ptr<DeviceEnumerator> enumerator_;
@@ -87,7 +87,8 @@ int CameraManager::Private::start()
{
MutexLocker locker(mutex_);
- cv_.wait(locker, [&] { return initialized_; });
+ cv_.wait(locker,
+ [&]() LIBCAMERA_TSA_REQUIRES(mutex_) { return initialized_; });
status = status_;
}
--
2.34.0.384.gca35af8252-goog
More information about the libcamera-devel
mailing list