py: Create PyCameraManager

Wrap the CameraManager with a PyCameraManager class and move the related
code inside the new class.

This helps understanding the life times of the used-to-be global
variables, gets rid of static handleRequestCompleted function, and
allows us to simplify the binding code as the more complex pieces are
inside the class.

There should be no user visible functional changes.

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 15:44:18 +03:00
committed by Laurent Pinchart
parent 418cbde04b
commit f814b1b6a9
4 changed files with 198 additions and 94 deletions
+127
View File
@@ -0,0 +1,127 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
* Copyright (C) 2022, Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
*/
#include "py_camera_manager.h"
#include <errno.h>
#include <memory>
#include <sys/eventfd.h>
#include <system_error>
#include <unistd.h>
#include <vector>
#include "py_main.h"
namespace py = pybind11;
using namespace libcamera;
PyCameraManager::PyCameraManager()
{
LOG(Python, Debug) << "PyCameraManager()";
cameraManager_ = std::make_unique<CameraManager>();
int fd = eventfd(0, 0);
if (fd == -1)
throw std::system_error(errno, std::generic_category(),
"Failed to create eventfd");
eventFd_ = fd;
int ret = cameraManager_->start();
if (ret) {
close(fd);
eventFd_ = -1;
throw std::system_error(-ret, std::generic_category(),
"Failed to start CameraManager");
}
}
PyCameraManager::~PyCameraManager()
{
LOG(Python, Debug) << "~PyCameraManager()";
if (eventFd_ != -1) {
close(eventFd_);
eventFd_ = -1;
}
}
py::list PyCameraManager::cameras()
{
/*
* Create a list of Cameras, where each camera has a keep-alive to
* CameraManager.
*/
py::list l;
for (auto &camera : cameraManager_->cameras()) {
py::object py_cm = py::cast(this);
py::object py_cam = py::cast(camera);
py::detail::keep_alive_impl(py_cam, py_cm);
l.append(py_cam);
}
return l;
}
std::vector<py::object> PyCameraManager::getReadyRequests()
{
readFd();
std::vector<py::object> py_reqs;
for (Request *request : getCompletedRequests()) {
py::object o = py::cast(request);
/* Decrease the ref increased in Camera.queue_request() */
o.dec_ref();
py_reqs.push_back(o);
}
return py_reqs;
}
/* Note: Called from another thread */
void PyCameraManager::handleRequestCompleted(Request *req)
{
pushRequest(req);
writeFd();
}
void PyCameraManager::writeFd()
{
uint64_t v = 1;
size_t s = write(eventFd_, &v, 8);
/*
* We should never fail, and have no simple means to manage the error,
* so let's log a fatal error.
*/
if (s != 8)
LOG(Python, Fatal) << "Unable to write to eventfd";
}
void PyCameraManager::readFd()
{
uint8_t buf[8];
if (read(eventFd_, buf, 8) != 8)
throw std::system_error(errno, std::generic_category());
}
void PyCameraManager::pushRequest(Request *req)
{
std::lock_guard guard(completedRequestsMutex_);
completedRequests_.push_back(req);
}
std::vector<Request *> PyCameraManager::getCompletedRequests()
{
std::vector<Request *> v;
std::lock_guard guard(completedRequestsMutex_);
swap(v, completedRequests_);
return v;
}