{"id":10315,"url":"https://patchwork.libcamera.org/api/patches/10315/?format=json","web_url":"https://patchwork.libcamera.org/patch/10315/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20201103010251.14689-4-laurent.pinchart@ideasonboard.com>","date":"2020-11-03T01:02:50","name":"[libcamera-devel,v3,3/4] libcamera: camera_manager: Inherit from Extensible","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"03bff71388740c06dedfbe43bf99606c3e6d6188","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10315/mbox/","series":[{"id":1437,"url":"https://patchwork.libcamera.org/api/series/1437/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1437","date":"2020-11-03T01:02:47","name":"libcamera: Implement d-pointer design pattern","version":3,"mbox":"https://patchwork.libcamera.org/series/1437/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10315/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10315/checks/","tags":{},"headers":{"Return-Path":"","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 BE1FDBDB1E\n\tfor ;\n\tTue, 3 Nov 2020 01:03:47 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7839162BA4;\n\tTue, 3 Nov 2020 02:03:47 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9985362B92\n\tfor ;\n\tTue, 3 Nov 2020 02:03:44 +0100 (CET)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 42EAC51D\n\tfor ;\n\tTue, 3 Nov 2020 02:03:44 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"iJYgdXXT\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1604365424;\n\tbh=S/+oWbwzDQ+yEKTn9LIKmMPBFty3wiN/sxWSzI88K2E=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=iJYgdXXTvrHvbIDccH2KyWgI7VZyHVuLzT+HbatDvD+jnMZr7M9AFTNyPa4WJkp4o\n\thiufyEfJkfQqZ8yRtwOl+JWWFgggdqLg/wAmY/EEn7PdVHNROrTtbgMPbGGQ88+mYT\n\tuJIiLdVtiHE12ADNOM/r/5hmKiSKQ6dKhZTSQcAM=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 3 Nov 2020 03:02:50 +0200","Message-Id":"<20201103010251.14689-4-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20201103010251.14689-1-laurent.pinchart@ideasonboard.com>","References":"<20201103010251.14689-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 3/4] libcamera: camera_manager: Inherit\n\tfrom Extensible","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Use the d-pointer infrastructure offered by the Extensible class to\nreplace the custom implementation.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Niklas Söderlund \n---\nChanges since v1:\n\n- Declare variables explicitly\n---\n include/libcamera/camera_manager.h | 7 ++--\n src/libcamera/camera_manager.cpp | 55 +++++++++++++++++++-----------\n 2 files changed, 38 insertions(+), 24 deletions(-)","diff":"diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h\nindex 9eb2b6f5a5f5..6d5341c76412 100644\n--- a/include/libcamera/camera_manager.h\n+++ b/include/libcamera/camera_manager.h\n@@ -12,6 +12,7 @@\n #include \n #include \n \n+#include \n #include \n #include \n \n@@ -20,8 +21,9 @@ namespace libcamera {\n class Camera;\n class EventDispatcher;\n \n-class CameraManager : public Object\n+class CameraManager : public Object, public Extensible\n {\n+\tLIBCAMERA_DECLARE_PRIVATE(CameraManager)\n public:\n \tCameraManager();\n \tCameraManager(const CameraManager &) = delete;\n@@ -50,9 +52,6 @@ public:\n private:\n \tstatic const std::string version_;\n \tstatic CameraManager *self_;\n-\n-\tclass Private;\n-\tstd::unique_ptr p_;\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex 3fef69633028..427ea5daf671 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -34,8 +34,10 @@ namespace libcamera {\n \n LOG_DEFINE_CATEGORY(Camera)\n \n-class CameraManager::Private : public Thread\n+class CameraManager::Private : public Extensible::Private, public Thread\n {\n+\tLIBCAMERA_DECLARE_PUBLIC(CameraManager)\n+\n public:\n \tPrivate(CameraManager *cm);\n \n@@ -62,8 +64,6 @@ private:\n \tvoid createPipelineHandlers();\n \tvoid cleanup();\n \n-\tCameraManager *cm_;\n-\n \tstd::condition_variable cv_;\n \tbool initialized_;\n \tint status_;\n@@ -75,7 +75,7 @@ private:\n };\n \n CameraManager::Private::Private(CameraManager *cm)\n-\t: cm_(cm), initialized_(false)\n+\t: Extensible::Private(cm), initialized_(false)\n {\n }\n \n@@ -136,6 +136,8 @@ int CameraManager::Private::init()\n \n void CameraManager::Private::createPipelineHandlers()\n {\n+\tCameraManager *const o = LIBCAMERA_O_PTR();\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@@ -153,7 +155,7 @@ void CameraManager::Private::createPipelineHandlers()\n \t\t * all pipelines it can provide.\n \t\t */\n \t\twhile (1) {\n-\t\t\tstd::shared_ptr pipe = factory->create(cm_);\n+\t\t\tstd::shared_ptr pipe = factory->create(o);\n \t\t\tif (!pipe->match(enumerator_.get()))\n \t\t\t\tbreak;\n \n@@ -264,7 +266,7 @@ void CameraManager::Private::removeCamera(Camera *camera)\n CameraManager *CameraManager::self_ = nullptr;\n \n CameraManager::CameraManager()\n-\t: p_(new CameraManager::Private(this))\n+\t: Extensible(new CameraManager::Private(this))\n {\n \tif (self_)\n \t\tLOG(Camera, Fatal)\n@@ -292,9 +294,11 @@ CameraManager::~CameraManager()\n */\n int CameraManager::start()\n {\n+\tPrivate *const d = LIBCAMERA_D_PTR();\n+\n \tLOG(Camera, Info) << \"libcamera \" << version_;\n \n-\tint ret = p_->start();\n+\tint ret = d->start();\n \tif (ret)\n \t\tLOG(Camera, Error) << \"Failed to start camera manager: \"\n \t\t\t\t << strerror(-ret);\n@@ -314,8 +318,9 @@ int CameraManager::start()\n */\n void CameraManager::stop()\n {\n-\tp_->exit();\n-\tp_->wait();\n+\tPrivate *const d = LIBCAMERA_D_PTR();\n+\td->exit();\n+\td->wait();\n }\n \n /**\n@@ -331,9 +336,11 @@ void CameraManager::stop()\n */\n std::vector> CameraManager::cameras() const\n {\n-\tMutexLocker locker(p_->mutex_);\n+\tconst Private *const d = LIBCAMERA_D_PTR();\n \n-\treturn p_->cameras_;\n+\tMutexLocker locker(d->mutex_);\n+\n+\treturn d->cameras_;\n }\n \n /**\n@@ -349,9 +356,11 @@ std::vector> CameraManager::cameras() const\n */\n std::shared_ptr CameraManager::get(const std::string &id)\n {\n-\tMutexLocker locker(p_->mutex_);\n+\tPrivate *const d = LIBCAMERA_D_PTR();\n \n-\tfor (std::shared_ptr camera : p_->cameras_) {\n+\tMutexLocker locker(d->mutex_);\n+\n+\tfor (std::shared_ptr camera : d->cameras_) {\n \t\tif (camera->id() == id)\n \t\t\treturn camera;\n \t}\n@@ -377,10 +386,12 @@ std::shared_ptr CameraManager::get(const std::string &id)\n */\n std::shared_ptr CameraManager::get(dev_t devnum)\n {\n-\tMutexLocker locker(p_->mutex_);\n+\tPrivate *const d = LIBCAMERA_D_PTR();\n \n-\tauto iter = p_->camerasByDevnum_.find(devnum);\n-\tif (iter == p_->camerasByDevnum_.end())\n+\tMutexLocker locker(d->mutex_);\n+\n+\tauto iter = d->camerasByDevnum_.find(devnum);\n+\tif (iter == d->camerasByDevnum_.end())\n \t\treturn nullptr;\n \n \treturn iter->second.lock();\n@@ -431,9 +442,11 @@ std::shared_ptr CameraManager::get(dev_t devnum)\n void CameraManager::addCamera(std::shared_ptr camera,\n \t\t\t const std::vector &devnums)\n {\n-\tASSERT(Thread::current() == p_.get());\n+\tPrivate *const d = LIBCAMERA_D_PTR();\n \n-\tp_->addCamera(camera, devnums);\n+\tASSERT(Thread::current() == d);\n+\n+\td->addCamera(camera, devnums);\n \tcameraAdded.emit(camera);\n }\n \n@@ -449,9 +462,11 @@ void CameraManager::addCamera(std::shared_ptr camera,\n */\n void CameraManager::removeCamera(std::shared_ptr camera)\n {\n-\tASSERT(Thread::current() == p_.get());\n+\tPrivate *const d = LIBCAMERA_D_PTR();\n \n-\tp_->removeCamera(camera.get());\n+\tASSERT(Thread::current() == d);\n+\n+\td->removeCamera(camera.get());\n \tcameraRemoved.emit(camera);\n }\n \n","prefixes":["libcamera-devel","v3","3/4"]}