53704ac3f4
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>
51 lines
713 B
C++
51 lines
713 B
C++
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/*
|
|
* Copyright (C) 2018, Google Inc.
|
|
*
|
|
* list.cpp - camera list tests
|
|
*/
|
|
|
|
#include <iostream>
|
|
|
|
#include <libcamera/camera.h>
|
|
#include <libcamera/camera_manager.h>
|
|
|
|
#include "test.h"
|
|
|
|
using namespace std;
|
|
using namespace libcamera;
|
|
|
|
class ListTest : public Test
|
|
{
|
|
protected:
|
|
int init()
|
|
{
|
|
cm_ = new CameraManager();
|
|
cm_->start();
|
|
|
|
return 0;
|
|
}
|
|
|
|
int run()
|
|
{
|
|
unsigned int count = 0;
|
|
|
|
for (const std::shared_ptr<Camera> &camera : cm_->cameras()) {
|
|
cout << "- " << camera->name() << endl;
|
|
count++;
|
|
}
|
|
|
|
return count ? 0 : -ENODEV;
|
|
}
|
|
|
|
void cleanup()
|
|
{
|
|
cm_->stop();
|
|
delete cm_;
|
|
}
|
|
|
|
private:
|
|
CameraManager *cm_;
|
|
};
|
|
|
|
TEST_REGISTER(ListTest)
|