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

libcamera: camera_manager: Construct CameraManager instances manually

Browse source 
The CameraManager class is not supposed to be instantiated multiple
times, which led to a singleton implementation. This requires a global
instance of the CameraManager, which is destroyed when the global
destructors are executed.

Relying on global instances causes issues with cleanup, as the order in
which the global destructors are run can't be controlled. In particular,
the Android camera HAL implementation ends up destroying the
CameraHalManager after the CameraManager, which leads to use-after-free
problems.

To solve this, remove the CameraManager::instance() method and make the
CameraManager class instantiable directly. Multiple instances are still
not allowed, and this is enforced by storing the instance pointer
internally to be checked when an instance is created.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Laurent Pinchart 2019-08-18 03:24:56 +03:00
parent 3e4672f159
commit 53704ac3f4
9 changed files with 48 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/camera/camera_test.cpp
View file

@ -14,7 +14,7 @@ using namespace std;
int CameraTest::init()
{
cm_ = CameraManager::instance();
cm_ = new CameraManager();
if (cm_->start()) {
cout << "Failed to start camera manager" << endl;
@ -44,4 +44,5 @@ void CameraTest::cleanup()
}
cm_->stop();
delete cm_;
};