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

py: Use libcamera's Mutex classes

Browse source 
Use libcamera's Mutex and MutexLocker instead of the std versions to get
thread safety annotations.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Tomi Valkeinen 2022-08-19 14:16:14 +03:00 • committed by Laurent Pinchart
parent dfa86000a6
commit de7f1aa591
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/py/libcamera/py_camera_manager.cpp
View file

@ -106,14 +106,14 @@ void PyCameraManager::readFd()
void PyCameraManager::pushRequest(Request *req) void PyCameraManager::pushRequest(Request *req)
{ {
std::lock_guard guard(completedRequestsMutex_); MutexLocker guard(completedRequestsMutex_);
completedRequests_.push_back(req); completedRequests_.push_back(req);
} }
std::vector<Request *> PyCameraManager::getCompletedRequests() std::vector<Request *> PyCameraManager::getCompletedRequests()
{ {
std::vector<Request *> v; std::vector<Request *> v;
std::lock_guard guard(completedRequestsMutex_); MutexLocker guard(completedRequestsMutex_);
swap(v, completedRequests_); swap(v, completedRequests_);
return v; return v;
} }

7
src/py/libcamera/py_camera_manager.h
View file

@ -5,7 +5,7 @@
#pragma once #pragma once
#include <mutex> #include <libcamera/base/mutex.h>
#include <libcamera/libcamera.h> #include <libcamera/libcamera.h>
@ -34,8 +34,9 @@ private:
std::unique_ptr<CameraManager> cameraManager_; std::unique_ptr<CameraManager> cameraManager_;
UniqueFD eventFd_; UniqueFD eventFd_;
std::mutex completedRequestsMutex_; libcamera::Mutex completedRequestsMutex_;
std::vector<Request *> completedRequests_; std::vector<Request *> completedRequests_
LIBCAMERA_TSA_GUARDED_BY(completedRequestsMutex_);
void writeFd(); void writeFd();
void readFd(); void readFd();