Patch Detail
Show a patch.
GET /api/1.1/patches/2718/?format=api
{ "id": 2718, "url": "https://patchwork.libcamera.org/api/1.1/patches/2718/?format=api", "web_url": "https://patchwork.libcamera.org/patch/2718/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20200122205723.8865-3-laurent.pinchart@ideasonboard.com>", "date": "2020-01-22T20:57:12", "name": "[libcamera-devel,v2,02/13] libcamera: camera_manager: Move private data members to private implementation", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f13ad04827eaaeb2cc864319acda94afe898f4e3", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/2718/mbox/", "series": [ { "id": 645, "url": "https://patchwork.libcamera.org/api/1.1/series/645/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=645", "date": "2020-01-22T20:57:10", "name": "Initial libcamera threading model", "version": 2, "mbox": "https://patchwork.libcamera.org/series/645/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/2718/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/2718/checks/", "tags": {}, "headers": { "Return-Path": "<laurent.pinchart@ideasonboard.com>", "Received": [ "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8C2BF60871\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 22 Jan 2020 21:57:43 +0100 (CET)", "from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 29A032E5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 22 Jan 2020 21:57:43 +0100 (CET)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1579726663;\n\tbh=7mNSt+sbbHv/Og5UrBBudy/mTdyR8YfL+pVx4+/3P6Y=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=efMRXlbb4Y45pWhtuJdqE54zvk6Z+X4lCWZpw3O7PKlQ8TbtKxk0tUg7aj2bsbcMi\n\tNEI2h7/BkvJIezjJ1sjVOaFIfNZUyeAX7Fp2Ne6Va4MrnPHSukTcAYqm/2yLMLh9J4\n\t+w4/QzJbYmiyHtJ06iT92+BcRnL/o6wPf26g61M8=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 22 Jan 2020 22:57:12 +0200", "Message-Id": "<20200122205723.8865-3-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.24.1", "In-Reply-To": "<20200122205723.8865-1-laurent.pinchart@ideasonboard.com>", "References": "<20200122205723.8865-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 02/13] libcamera: camera_manager: Move\n\tprivate data members to private implementation", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "X-List-Received-Date": "Wed, 22 Jan 2020 20:57:43 -0000" }, "content": "Use the d-pointer idiom ([1], [2]) to hide the private data members from\nthe CameraManager class interface. This will ease maintaining ABI\ncompatibility, and prepares for the implementation of the CameraManager\nclass threading model.\n\n[1] https://wiki.qt.io/D-Pointer\n[2] https://en.cppreference.com/w/cpp/language/pimpl\n\nlibcamera: camera_manager: Run the camera manager in a thread:q\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n Documentation/Doxyfile.in | 1 +\n include/libcamera/camera_manager.h | 13 +-\n src/libcamera/camera_manager.cpp | 218 ++++++++++++++++++-----------\n 3 files changed, 143 insertions(+), 89 deletions(-)", "diff": "diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in\nindex 8e6fbdbb92b6..1f746393568a 100644\n--- a/Documentation/Doxyfile.in\n+++ b/Documentation/Doxyfile.in\n@@ -877,6 +877,7 @@ EXCLUDE_SYMBOLS = libcamera::BoundMethodArgs \\\n libcamera::BoundMethodPackBase \\\n libcamera::BoundMethodStatic \\\n libcamera::SignalBase \\\n+ libcamera::*::Private \\\n std::*\n \n # The EXAMPLE_PATH tag can be used to specify one or more files or directories\ndiff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h\nindex 094197668698..068afd58762f 100644\n--- a/include/libcamera/camera_manager.h\n+++ b/include/libcamera/camera_manager.h\n@@ -7,7 +7,6 @@\n #ifndef __LIBCAMERA_CAMERA_MANAGER_H__\n #define __LIBCAMERA_CAMERA_MANAGER_H__\n \n-#include <map>\n #include <memory>\n #include <string>\n #include <sys/types.h>\n@@ -18,9 +17,7 @@\n namespace libcamera {\n \n class Camera;\n-class DeviceEnumerator;\n class EventDispatcher;\n-class PipelineHandler;\n \n class CameraManager : public Object\n {\n@@ -33,7 +30,7 @@ public:\n \tint start();\n \tvoid stop();\n \n-\tconst std::vector<std::shared_ptr<Camera>> &cameras() const { return cameras_; }\n+\tconst std::vector<std::shared_ptr<Camera>> &cameras() const;\n \tstd::shared_ptr<Camera> get(const std::string &name);\n \tstd::shared_ptr<Camera> get(dev_t devnum);\n \n@@ -46,13 +43,11 @@ public:\n \tEventDispatcher *eventDispatcher();\n \n private:\n-\tstd::unique_ptr<DeviceEnumerator> enumerator_;\n-\tstd::vector<std::shared_ptr<PipelineHandler>> pipes_;\n-\tstd::vector<std::shared_ptr<Camera>> cameras_;\n-\tstd::map<dev_t, std::weak_ptr<Camera>> camerasByDevnum_;\n-\n \tstatic const std::string version_;\n \tstatic CameraManager *self_;\n+\n+\tclass Private;\n+\tstd::unique_ptr<Private> p_;\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex a71caf8536bb..e0a07ec557d3 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -7,6 +7,8 @@\n \n #include <libcamera/camera_manager.h>\n \n+#include <map>\n+\n #include <libcamera/camera.h>\n #include <libcamera/event_dispatcher.h>\n \n@@ -26,6 +28,124 @@ namespace libcamera {\n \n LOG_DEFINE_CATEGORY(Camera)\n \n+class CameraManager::Private\n+{\n+public:\n+\tPrivate(CameraManager *cm);\n+\n+\tint start();\n+\tvoid stop();\n+\n+\tvoid addCamera(std::shared_ptr<Camera> &camera, dev_t devnum);\n+\tvoid removeCamera(Camera *camera);\n+\n+\tstd::vector<std::shared_ptr<Camera>> cameras_;\n+\tstd::map<dev_t, std::weak_ptr<Camera>> camerasByDevnum_;\n+\n+private:\n+\tCameraManager *cm_;\n+\n+\tstd::vector<std::shared_ptr<PipelineHandler>> pipes_;\n+\tstd::unique_ptr<DeviceEnumerator> enumerator_;\n+};\n+\n+CameraManager::Private::Private(CameraManager *cm)\n+\t: cm_(cm)\n+{\n+}\n+\n+int CameraManager::Private::start()\n+{\n+\tenumerator_ = DeviceEnumerator::create();\n+\tif (!enumerator_ || enumerator_->enumerate())\n+\t\treturn -ENODEV;\n+\n+\t/*\n+\t * TODO: Try to read handlers and order from configuration\n+\t * file and only fallback on all handlers if there is no\n+\t * configuration file.\n+\t */\n+\tstd::vector<PipelineHandlerFactory *> &factories = PipelineHandlerFactory::factories();\n+\n+\tfor (PipelineHandlerFactory *factory : factories) {\n+\t\t/*\n+\t\t * Try each pipeline handler until it exhaust\n+\t\t * all pipelines it can provide.\n+\t\t */\n+\t\twhile (1) {\n+\t\t\tstd::shared_ptr<PipelineHandler> pipe = factory->create(cm_);\n+\t\t\tif (!pipe->match(enumerator_.get()))\n+\t\t\t\tbreak;\n+\n+\t\t\tLOG(Camera, Debug)\n+\t\t\t\t<< \"Pipeline handler \\\"\" << factory->name()\n+\t\t\t\t<< \"\\\" matched\";\n+\t\t\tpipes_.push_back(std::move(pipe));\n+\t\t}\n+\t}\n+\n+\t/* TODO: register hot-plug callback here */\n+\n+\treturn 0;\n+}\n+\n+void CameraManager::Private::stop()\n+{\n+\t/* TODO: unregister hot-plug callback here */\n+\n+\t/*\n+\t * Release all references to cameras and pipeline handlers to ensure\n+\t * they all get destroyed before the device enumerator deletes the\n+\t * media devices.\n+\t */\n+\tpipes_.clear();\n+\tcameras_.clear();\n+\n+\tenumerator_.reset(nullptr);\n+}\n+\n+void CameraManager::Private::addCamera(std::shared_ptr<Camera> &camera,\n+\t\t\t\t dev_t devnum)\n+{\n+\tfor (std::shared_ptr<Camera> c : cameras_) {\n+\t\tif (c->name() == camera->name()) {\n+\t\t\tLOG(Camera, Warning)\n+\t\t\t\t<< \"Registering camera with duplicate name '\"\n+\t\t\t\t<< camera->name() << \"'\";\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\tcameras_.push_back(std::move(camera));\n+\n+\tif (devnum) {\n+\t\tunsigned int index = cameras_.size() - 1;\n+\t\tcamerasByDevnum_[devnum] = cameras_[index];\n+\t}\n+}\n+\n+void CameraManager::Private::removeCamera(Camera *camera)\n+{\n+\tauto iter = std::find_if(cameras_.begin(), cameras_.end(),\n+\t\t\t\t [camera](std::shared_ptr<Camera> &c) {\n+\t\t\t\t\t return c.get() == camera;\n+\t\t\t\t });\n+\tif (iter == cameras_.end())\n+\t\treturn;\n+\n+\tLOG(Camera, Debug)\n+\t\t<< \"Unregistering camera '\" << camera->name() << \"'\";\n+\n+\tauto iter_d = std::find_if(camerasByDevnum_.begin(), camerasByDevnum_.end(),\n+\t\t\t\t [camera](const std::pair<dev_t, std::weak_ptr<Camera>> &p) {\n+\t\t\t\t\t return p.second.lock().get() == camera;\n+\t\t\t\t });\n+\tif (iter_d != camerasByDevnum_.end())\n+\t\tcamerasByDevnum_.erase(iter_d);\n+\n+\tcameras_.erase(iter);\n+}\n+\n /**\n * \\class CameraManager\n * \\brief Provide access and manage all cameras in the system\n@@ -62,7 +182,7 @@ LOG_DEFINE_CATEGORY(Camera)\n CameraManager *CameraManager::self_ = nullptr;\n \n CameraManager::CameraManager()\n-\t: enumerator_(nullptr)\n+\t: p_(new CameraManager::Private(this))\n {\n \tif (self_)\n \t\tLOG(Camera, Fatal)\n@@ -73,6 +193,8 @@ CameraManager::CameraManager()\n \n CameraManager::~CameraManager()\n {\n+\tstop();\n+\n \tself_ = nullptr;\n }\n \n@@ -88,42 +210,14 @@ CameraManager::~CameraManager()\n */\n int CameraManager::start()\n {\n-\tif (enumerator_)\n-\t\treturn -EBUSY;\n-\n \tLOG(Camera, Info) << \"libcamera \" << version_;\n \n-\tenumerator_ = DeviceEnumerator::create();\n-\tif (!enumerator_ || enumerator_->enumerate())\n-\t\treturn -ENODEV;\n-\n-\t/*\n-\t * TODO: Try to read handlers and order from configuration\n-\t * file and only fallback on all handlers if there is no\n-\t * configuration file.\n-\t */\n-\tstd::vector<PipelineHandlerFactory *> &factories = PipelineHandlerFactory::factories();\n+\tint ret = p_->start();\n+\tif (ret)\n+\t\tLOG(Camera, Error) << \"Failed to start camera manager: \"\n+\t\t\t\t << strerror(-ret);\n \n-\tfor (PipelineHandlerFactory *factory : factories) {\n-\t\t/*\n-\t\t * Try each pipeline handler until it exhaust\n-\t\t * all pipelines it can provide.\n-\t\t */\n-\t\twhile (1) {\n-\t\t\tstd::shared_ptr<PipelineHandler> pipe = factory->create(this);\n-\t\t\tif (!pipe->match(enumerator_.get()))\n-\t\t\t\tbreak;\n-\n-\t\t\tLOG(Camera, Debug)\n-\t\t\t\t<< \"Pipeline handler \\\"\" << factory->name()\n-\t\t\t\t<< \"\\\" matched\";\n-\t\t\tpipes_.push_back(std::move(pipe));\n-\t\t}\n-\t}\n-\n-\t/* TODO: register hot-plug callback here */\n-\n-\treturn 0;\n+\treturn ret;\n }\n \n /**\n@@ -138,17 +232,7 @@ int CameraManager::start()\n */\n void CameraManager::stop()\n {\n-\t/* TODO: unregister hot-plug callback here */\n-\n-\t/*\n-\t * Release all references to cameras and pipeline handlers to ensure\n-\t * they all get destroyed before the device enumerator deletes the\n-\t * media devices.\n-\t */\n-\tpipes_.clear();\n-\tcameras_.clear();\n-\n-\tenumerator_.reset(nullptr);\n+\tp_->stop();\n }\n \n /**\n@@ -160,6 +244,10 @@ void CameraManager::stop()\n *\n * \\return List of all available cameras\n */\n+const std::vector<std::shared_ptr<Camera>> &CameraManager::cameras() const\n+{\n+\treturn p_->cameras_;\n+}\n \n /**\n * \\brief Get a camera based on name\n@@ -172,7 +260,7 @@ void CameraManager::stop()\n */\n std::shared_ptr<Camera> CameraManager::get(const std::string &name)\n {\n-\tfor (std::shared_ptr<Camera> camera : cameras_) {\n+\tfor (std::shared_ptr<Camera> camera : p_->cameras_) {\n \t\tif (camera->name() == name)\n \t\t\treturn camera;\n \t}\n@@ -196,8 +284,8 @@ std::shared_ptr<Camera> CameraManager::get(const std::string &name)\n */\n std::shared_ptr<Camera> CameraManager::get(dev_t devnum)\n {\n-\tauto iter = camerasByDevnum_.find(devnum);\n-\tif (iter == camerasByDevnum_.end())\n+\tauto iter = p_->camerasByDevnum_.find(devnum);\n+\tif (iter == p_->camerasByDevnum_.end())\n \t\treturn nullptr;\n \n \treturn iter->second.lock();\n@@ -217,21 +305,8 @@ std::shared_ptr<Camera> CameraManager::get(dev_t devnum)\n */\n void CameraManager::addCamera(std::shared_ptr<Camera> camera, dev_t devnum)\n {\n-\tfor (std::shared_ptr<Camera> c : cameras_) {\n-\t\tif (c->name() == camera->name()) {\n-\t\t\tLOG(Camera, Warning)\n-\t\t\t\t<< \"Registering camera with duplicate name '\"\n-\t\t\t\t<< camera->name() << \"'\";\n-\t\t\tbreak;\n-\t\t}\n-\t}\n \n-\tcameras_.push_back(std::move(camera));\n-\n-\tif (devnum) {\n-\t\tunsigned int index = cameras_.size() - 1;\n-\t\tcamerasByDevnum_[devnum] = cameras_[index];\n-\t}\n+\tp_->addCamera(camera, devnum);\n }\n \n /**\n@@ -244,24 +319,7 @@ void CameraManager::addCamera(std::shared_ptr<Camera> camera, dev_t devnum)\n */\n void CameraManager::removeCamera(Camera *camera)\n {\n-\tauto iter = std::find_if(cameras_.begin(), cameras_.end(),\n-\t\t\t\t [camera](std::shared_ptr<Camera> &c) {\n-\t\t\t\t\t return c.get() == camera;\n-\t\t\t\t });\n-\tif (iter == cameras_.end())\n-\t\treturn;\n-\n-\tLOG(Camera, Debug)\n-\t\t<< \"Unregistering camera '\" << camera->name() << \"'\";\n-\n-\tauto iter_d = std::find_if(camerasByDevnum_.begin(), camerasByDevnum_.end(),\n-\t\t\t\t [camera](const std::pair<dev_t, std::weak_ptr<Camera>> &p) {\n-\t\t\t\t\t return p.second.lock().get() == camera;\n-\t\t\t\t });\n-\tif (iter_d != camerasByDevnum_.end())\n-\t\tcamerasByDevnum_.erase(iter_d);\n-\n-\tcameras_.erase(iter);\n+\tp_->removeCamera(camera);\n }\n \n /**\n", "prefixes": [ "libcamera-devel", "v2", "02/13" ] }