Patch Detail
Show a patch.
GET /api/patches/18623/?format=api
{ "id": 18623, "url": "https://patchwork.libcamera.org/api/patches/18623/?format=api", "web_url": "https://patchwork.libcamera.org/patch/18623/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20230511225833.361699-3-kieran.bingham@ideasonboard.com>", "date": "2023-05-11T22:58:31", "name": "[libcamera-devel,v2,2/4] libcamera: camera_manager: Move {add, remove}Camera to internal", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "1b78295d408f3301deca5f7a14cdab577ee13c06", "submitter": { "id": 4, "url": "https://patchwork.libcamera.org/api/people/4/?format=api", "name": "Kieran Bingham", "email": "kieran.bingham@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/18623/mbox/", "series": [ { "id": 3876, "url": "https://patchwork.libcamera.org/api/series/3876/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3876", "date": "2023-05-11T22:58:29", "name": "libcamera: Add new Camera devices property", "version": 2, "mbox": "https://patchwork.libcamera.org/series/3876/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/18623/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/18623/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 881FBBD16B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 11 May 2023 22:58:43 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 81CC8633C2;\n\tFri, 12 May 2023 00:58:42 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 60D83633B6\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 12 May 2023 00:58:39 +0200 (CEST)", "from Monstersaurus.local\n\t(aztw-30-b2-v4wan-166917-cust845.vm26.cable.virginm.net\n\t[82.37.23.78])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E28B8CF9;\n\tFri, 12 May 2023 00:58:30 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1683845922;\n\tbh=3ExVC91FmGtc9FklNc+yXz0Wp0KSHyqL3SC0ExEt0S0=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=FcIHktMStt7CQzE5/aNl0rmPwlCUSecT1RQZWgNlW3int7cVNVE/QfAu7V9CC/mxq\n\tPLqQYvpmtNMLjhjOer78eTtgcUmtw+ruETbFAjfoqGkp4RHPjPWxFdZF+0S5xdaVHl\n\tB1eJ6mm5uHrW53I14nPA/mJSNomVdi/92gyOvfkU+PcEdOJXVf169dhpC9rsklukSD\n\tDX+1fo9g2VQmZO6f8+dahawcYFf9fZ9U4Wb16T1Y+gpyjNK8CKoNkJCYSYbmneePcY\n\twyHDVbMCSHHTaUNwVQc4ieh5Wqx1pL+z1VAwMus1cwtZYmSvsqT8I+OxDHvQZXaq04\n\tro4AzCjxlUX3Q==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1683845911;\n\tbh=3ExVC91FmGtc9FklNc+yXz0Wp0KSHyqL3SC0ExEt0S0=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=L2bc/HElpoDIzZz0BVWvei0qsC3EAEpC8W8mWCTE3XQNYOoUlRCUNdDhdKJjWNqop\n\tSJtmdi5PGS/KBkRCn4QxKNI9NJ3Hn/7UJsxVNibGucZT//XkuEt0TBkWUfXCIexbsr\n\trVxZrjJoEyOUIfcaJWHeREy/wllCeBCHe0U9N3v4=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"L2bc/HEl\"; dkim-atps=neutral", "To": "libcamera devel <libcamera-devel@lists.libcamera.org>", "Date": "Thu, 11 May 2023 23:58:31 +0100", "Message-Id": "<20230511225833.361699-3-kieran.bingham@ideasonboard.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20230511225833.361699-1-kieran.bingham@ideasonboard.com>", "References": "<20230511225833.361699-1-kieran.bingham@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 2/4] libcamera: camera_manager: Move\n\t{add, remove}Camera to internal", "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>", "From": "Kieran Bingham via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Kieran Bingham <kieran.bingham@ideasonboard.com>", "Cc": "George Kiagiadakis <george.kiagiadakis@collabora.com>,\n\tRobert Mader <robert.mader@collabora.com>,\n\tWim Taymans <wtaymans@redhat.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "The CameraManager exposes addCamera and removeCamera as public API\ncalls, while they should never be called from an application. These\ncalls are only expected to be used by PipelineHandlers to update the\nCameraManager that a new Camera has been created and allow the Camera\nManager to expose it to applications.\n\nRemove the public calls and update the private implementations such that\nthey can be used directly by the PipelineHandler through the internal\nCameraManager::Private provided by the Extensible class.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n include/libcamera/camera_manager.h | 4 -\n include/libcamera/internal/camera_manager.h | 2 +-\n src/libcamera/camera_manager.cpp | 87 +++++++++------------\n src/libcamera/pipeline_handler.cpp | 6 +-\n 4 files changed, 43 insertions(+), 56 deletions(-)", "diff": "diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h\nindex 4b1fb7568e83..9767acc42c89 100644\n--- a/include/libcamera/camera_manager.h\n+++ b/include/libcamera/camera_manager.h\n@@ -34,10 +34,6 @@ public:\n \tstd::shared_ptr<Camera> get(const std::string &id);\n \tstd::shared_ptr<Camera> get(dev_t devnum);\n \n-\tvoid addCamera(std::shared_ptr<Camera> camera,\n-\t\t const std::vector<dev_t> &devnums);\n-\tvoid removeCamera(std::shared_ptr<Camera> camera);\n-\n \tstatic const std::string &version() { return version_; }\n \n \tSignal<std::shared_ptr<Camera>> cameraAdded;\ndiff --git a/include/libcamera/internal/camera_manager.h b/include/libcamera/internal/camera_manager.h\nindex 4bba3ac2eb29..8386e90e0f60 100644\n--- a/include/libcamera/internal/camera_manager.h\n+++ b/include/libcamera/internal/camera_manager.h\n@@ -31,7 +31,7 @@ public:\n \tint start();\n \tvoid addCamera(std::shared_ptr<Camera> camera,\n \t\t const std::vector<dev_t> &devnums) LIBCAMERA_TSA_EXCLUDES(mutex_);\n-\tvoid removeCamera(Camera *camera) LIBCAMERA_TSA_EXCLUDES(mutex_);\n+\tvoid removeCamera(std::shared_ptr<Camera> camera) LIBCAMERA_TSA_EXCLUDES(mutex_);\n \n \t/*\n \t * This mutex protects\ndiff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex b95284ba5a80..34f09a4d181b 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -148,9 +148,25 @@ void CameraManager::Private::cleanup()\n \tenumerator_.reset(nullptr);\n }\n \n+/**\n+ * \\brief Add a camera to the camera manager\n+ * \\param[in] camera The camera to be added\n+ * \\param[in] devnums The device numbers to associate with \\a camera\n+ *\n+ * This function is called by pipeline handlers to register the cameras they\n+ * handle with the camera manager. Registered cameras are immediately made\n+ * available to the system.\n+ *\n+ * \\a devnums are used by the V4L2 compatibility layer to map V4L2 device nodes\n+ * to Camera instances.\n+ *\n+ * \\context This function shall be called from the CameraManager thread.\n+ */\n void CameraManager::Private::addCamera(std::shared_ptr<Camera> camera,\n \t\t\t\t const std::vector<dev_t> &devnums)\n {\n+\tASSERT(Thread::current() == this);\n+\n \tMutexLocker locker(mutex_);\n \n \tfor (const std::shared_ptr<Camera> &c : cameras_) {\n@@ -167,15 +183,31 @@ void CameraManager::Private::addCamera(std::shared_ptr<Camera> camera,\n \tunsigned int index = cameras_.size() - 1;\n \tfor (dev_t devnum : devnums)\n \t\tcamerasByDevnum_[devnum] = cameras_[index];\n+\n+\t/* Report the addition to the public signal */\n+\tCameraManager *const o = LIBCAMERA_O_PTR();\n+\to->cameraAdded.emit(cameras_[index]);\n }\n \n-void CameraManager::Private::removeCamera(Camera *camera)\n+/**\n+ * \\brief Remove a camera from the camera manager\n+ * \\param[in] camera The camera to be removed\n+ *\n+ * This function is called by pipeline handlers to unregister cameras from the\n+ * camera manager. Unregistered cameras won't be reported anymore by the\n+ * cameras() and get() calls, but references may still exist in applications.\n+ *\n+ * \\context This function shall be called from the CameraManager thread.\n+ */\n+void CameraManager::Private::removeCamera(std::shared_ptr<Camera> camera)\n {\n+\tASSERT(Thread::current() == this);\n+\n \tMutexLocker locker(mutex_);\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\t return c.get() == camera.get();\n \t\t\t\t });\n \tif (iter == cameras_.end())\n \t\treturn;\n@@ -185,12 +217,16 @@ void CameraManager::Private::removeCamera(Camera *camera)\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\t return p.second.lock().get() == camera.get();\n \t\t\t\t });\n \tif (iter_d != camerasByDevnum_.end())\n \t\tcamerasByDevnum_.erase(iter_d);\n \n \tcameras_.erase(iter);\n+\n+\t/* Report the removal to the public signal */\n+\tCameraManager *const o = LIBCAMERA_O_PTR();\n+\to->cameraRemoved.emit(camera);\n }\n \n /**\n@@ -383,51 +419,6 @@ std::shared_ptr<Camera> CameraManager::get(dev_t devnum)\n * perform any blocking operation.\n */\n \n-/**\n- * \\brief Add a camera to the camera manager\n- * \\param[in] camera The camera to be added\n- * \\param[in] devnums The device numbers to associate with \\a camera\n- *\n- * This function is called by pipeline handlers to register the cameras they\n- * handle with the camera manager. Registered cameras are immediately made\n- * available to the system.\n- *\n- * \\a devnums are used by the V4L2 compatibility layer to map V4L2 device nodes\n- * to Camera instances.\n- *\n- * \\context This function shall be called from the CameraManager thread.\n- */\n-void CameraManager::addCamera(std::shared_ptr<Camera> camera,\n-\t\t\t const std::vector<dev_t> &devnums)\n-{\n-\tPrivate *const d = _d();\n-\n-\tASSERT(Thread::current() == d);\n-\n-\td->addCamera(camera, devnums);\n-\tcameraAdded.emit(camera);\n-}\n-\n-/**\n- * \\brief Remove a camera from the camera manager\n- * \\param[in] camera The camera to be removed\n- *\n- * This function is called by pipeline handlers to unregister cameras from the\n- * camera manager. Unregistered cameras won't be reported anymore by the\n- * cameras() and get() calls, but references may still exist in applications.\n- *\n- * \\context This function shall be called from the CameraManager thread.\n- */\n-void CameraManager::removeCamera(std::shared_ptr<Camera> camera)\n-{\n-\tPrivate *const d = _d();\n-\n-\tASSERT(Thread::current() == d);\n-\n-\td->removeCamera(camera.get());\n-\tcameraRemoved.emit(camera);\n-}\n-\n /**\n * \\fn const std::string &CameraManager::version()\n * \\brief Retrieve the libcamera version string\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex f72613b8e515..49092ea88a58 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -16,10 +16,10 @@\n #include <libcamera/base/utils.h>\n \n #include <libcamera/camera.h>\n-#include <libcamera/camera_manager.h>\n #include <libcamera/framebuffer.h>\n \n #include \"libcamera/internal/camera.h\"\n+#include \"libcamera/internal/camera_manager.h\"\n #include \"libcamera/internal/device_enumerator.h\"\n #include \"libcamera/internal/framebuffer.h\"\n #include \"libcamera/internal/media_device.h\"\n@@ -624,7 +624,7 @@ void PipelineHandler::registerCamera(std::shared_ptr<Camera> camera)\n \t\t}\n \t}\n \n-\tmanager_->addCamera(std::move(camera), devnums);\n+\tmanager_->_d()->addCamera(std::move(camera), devnums);\n }\n \n /**\n@@ -691,7 +691,7 @@ void PipelineHandler::disconnect()\n \t\t\tcontinue;\n \n \t\tcamera->disconnect();\n-\t\tmanager_->removeCamera(camera);\n+\t\tmanager_->_d()->removeCamera(camera);\n \t}\n }\n \n", "prefixes": [ "libcamera-devel", "v2", "2/4" ] }