[{"id":27086,"web_url":"https://patchwork.libcamera.org/comment/27086/","msgid":"<20230513145745.pvucshizdpymceef@lati>","date":"2023-05-13T14:57:45","subject":"Re: [libcamera-devel] [PATCH v2 2/4] libcamera: camera_manager:\n\tMove {add, remove}Camera to internal","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/people/143/","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"content":"Hi Kieran\n\nOn Thu, May 11, 2023 at 11:58:31PM +0100, Kieran Bingham via libcamera-devel wrote:\n> The CameraManager exposes addCamera and removeCamera as public API\n> calls, while they should never be called from an application. These\n> calls are only expected to be used by PipelineHandlers to update the\n> CameraManager that a new Camera has been created and allow the Camera\n> Manager to expose it to applications.\n>\n> Remove the public calls and update the private implementations such that\n> they can be used directly by the PipelineHandler through the internal\n> CameraManager::Private provided by the Extensible class.\n>\n> Signed-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(-)\n>\n> diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h\n> index 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;\n> diff --git a/include/libcamera/internal/camera_manager.h b/include/libcamera/internal/camera_manager.h\n> index 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\n> diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\n> index 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\nIs this still needed now that this function is only available to the\ninternal library componentes ?\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\nditto as per above\n\n> + */\n> +void CameraManager::Private::removeCamera(std::shared_ptr<Camera> camera)\n>  {\n> +\tASSERT(Thread::current() == this);\n> +\n\nsame here\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\n> diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\n> index 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\nAll minors as well\nReviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n\nThanks\n   j\n\n>  \t}\n>  }\n>\n> --\n> 2.34.1\n>","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 9BEF5BE08B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 13 May 2023 14:57:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0ED37633B4;\n\tSat, 13 May 2023 16:57:51 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D94F560539\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 13 May 2023 16:57:49 +0200 (CEST)","from ideasonboard.com (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5340D6C8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 13 May 2023 16:57:40 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1683989871;\n\tbh=KMndU+uEHmaX/mQETf3/Rg+AS8xCteVTiVk1kYGefvo=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=bj+MrKrqfuw2OC/uXLEihJiGtsrBwMMOLJpCHXX2TcIHEW0W9oKBvMPj1de5BFpFF\n\tj1p5sLYpr6ckJLY0/DdJgHwuO1+w9NHffxLNQP7xZ3ZTjHBE1JzLvKrKZY+ZjCACp/\n\tsQR1E0kcmtGaR9D7U7QwSsU0A4dRuIrabjyFjyO73uEtpnp2TNNpnnjTrngXGx3CTx\n\txfUrhy7HiPy/tX6psuw47pG7PHzvWgNYX12WkXCS+BrW6vWydwcKK7heyyD8GeRycV\n\tGvPLCR51ohIXf4fpv1MdTdoKQMXTPzqXQL6fciV+Y3x3UJ3ACoddz+T+M+kgUPMb8A\n\tj1BGKRX/vqWMg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1683989860;\n\tbh=KMndU+uEHmaX/mQETf3/Rg+AS8xCteVTiVk1kYGefvo=;\n\th=Date:From:To:Subject:References:In-Reply-To:From;\n\tb=ETf4nb9gJYIzdA9GzJiqiwmfN8fMwNgl3TEhY7z+fJ9VJFzm5rE6BemDfBeaM/ely\n\tIzByYE3Ud7HOVkxhMggYW6sUFfWo1sqCrsRrgtneXQCRB0YhID6+T5D240yamrYiyd\n\tbl318WOiEwEMgQgDrLwnna8R1GwiMIiUFlXr9ZkE="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"ETf4nb9g\"; dkim-atps=neutral","Date":"Sat, 13 May 2023 16:57:45 +0200","To":"Kieran Bingham via libcamera-devel <libcamera-devel@lists.libcamera.org>","Message-ID":"<20230513145745.pvucshizdpymceef@lati>","References":"<20230511225833.361699-1-kieran.bingham@ideasonboard.com>\n\t<20230511225833.361699-3-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20230511225833.361699-3-kieran.bingham@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 2/4] libcamera: camera_manager:\n\tMove {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":"Jacopo Mondi via libcamera-devel <libcamera-devel@lists.libcamera.org>","Reply-To":"Jacopo Mondi <jacopo.mondi@ideasonboard.com>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":27090,"web_url":"https://patchwork.libcamera.org/comment/27090/","msgid":"<168399222426.1830511.15109077204287739434@Monstersaurus>","date":"2023-05-13T15:37:04","subject":"Re: [libcamera-devel] [PATCH v2 2/4] libcamera: camera_manager:\n\tMove {add, remove}Camera to internal","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Jacopo Mondi via libcamera-devel (2023-05-13 15:57:45)\n> Hi Kieran\n> \n> On Thu, May 11, 2023 at 11:58:31PM +0100, Kieran Bingham via libcamera-devel wrote:\n> > The CameraManager exposes addCamera and removeCamera as public API\n> > calls, while they should never be called from an application. These\n> > calls are only expected to be used by PipelineHandlers to update the\n> > CameraManager that a new Camera has been created and allow the Camera\n> > Manager to expose it to applications.\n> >\n> > Remove the public calls and update the private implementations such that\n> > they can be used directly by the PipelineHandler through the internal\n> > CameraManager::Private provided by the Extensible class.\n> >\n> > Signed-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(-)\n> >\n> > diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h\n> > index 4b1fb7568e83..9767acc42c89 100644\n> > --- a/include/libcamera/camera_manager.h\n> > +++ b/include/libcamera/camera_manager.h\n> > @@ -34,10 +34,6 @@ public:\n> >       std::shared_ptr<Camera> get(const std::string &id);\n> >       std::shared_ptr<Camera> get(dev_t devnum);\n> >\n> > -     void addCamera(std::shared_ptr<Camera> camera,\n> > -                    const std::vector<dev_t> &devnums);\n> > -     void removeCamera(std::shared_ptr<Camera> camera);\n> > -\n> >       static const std::string &version() { return version_; }\n> >\n> >       Signal<std::shared_ptr<Camera>> cameraAdded;\n> > diff --git a/include/libcamera/internal/camera_manager.h b/include/libcamera/internal/camera_manager.h\n> > index 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> >       int start();\n> >       void addCamera(std::shared_ptr<Camera> camera,\n> >                      const std::vector<dev_t> &devnums) LIBCAMERA_TSA_EXCLUDES(mutex_);\n> > -     void removeCamera(Camera *camera) LIBCAMERA_TSA_EXCLUDES(mutex_);\n> > +     void removeCamera(std::shared_ptr<Camera> camera) LIBCAMERA_TSA_EXCLUDES(mutex_);\n> >\n> >       /*\n> >        * This mutex protects\n> > diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\n> > index 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> >       enumerator_.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> >                                      const std::vector<dev_t> &devnums)\n> >  {\n> > +     ASSERT(Thread::current() == this);\n> > +\n> \n> Is this still needed now that this function is only available to the\n> internal library componentes ?\n\nIt was there before, and will be compiled out for release so I don't\nthink it hurts. If anything it ensures the same guarantee for new\npipeline handlers that get developed, so I'd keep it, (and the others).\n\n\n> \n> >       MutexLocker locker(mutex_);\n> >\n> >       for (const std::shared_ptr<Camera> &c : cameras_) {\n> > @@ -167,15 +183,31 @@ void CameraManager::Private::addCamera(std::shared_ptr<Camera> camera,\n> >       unsigned int index = cameras_.size() - 1;\n> >       for (dev_t devnum : devnums)\n> >               camerasByDevnum_[devnum] = cameras_[index];\n> > +\n> > +     /* Report the addition to the public signal */\n> > +     CameraManager *const o = LIBCAMERA_O_PTR();\n> > +     o->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> ditto as per above\n> \n> > + */\n> > +void CameraManager::Private::removeCamera(std::shared_ptr<Camera> camera)\n> >  {\n> > +     ASSERT(Thread::current() == this);\n> > +\n> \n> same here\n> \n> >       MutexLocker locker(mutex_);\n> >\n> >       auto iter = std::find_if(cameras_.begin(), cameras_.end(),\n> >                                [camera](std::shared_ptr<Camera> &c) {\n> > -                                      return c.get() == camera;\n> > +                                      return c.get() == camera.get();\n> >                                });\n> >       if (iter == cameras_.end())\n> >               return;\n> > @@ -185,12 +217,16 @@ void CameraManager::Private::removeCamera(Camera *camera)\n> >\n> >       auto iter_d = std::find_if(camerasByDevnum_.begin(), camerasByDevnum_.end(),\n> >                                  [camera](const std::pair<dev_t, std::weak_ptr<Camera>> &p) {\n> > -                                        return p.second.lock().get() == camera;\n> > +                                        return p.second.lock().get() == camera.get();\n> >                                  });\n> >       if (iter_d != camerasByDevnum_.end())\n> >               camerasByDevnum_.erase(iter_d);\n> >\n> >       cameras_.erase(iter);\n> > +\n> > +     /* Report the removal to the public signal */\n> > +     CameraManager *const o = LIBCAMERA_O_PTR();\n> > +     o->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> > -                           const std::vector<dev_t> &devnums)\n> > -{\n> > -     Private *const d = _d();\n> > -\n> > -     ASSERT(Thread::current() == d);\n> > -\n> > -     d->addCamera(camera, devnums);\n> > -     cameraAdded.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> > -     Private *const d = _d();\n> > -\n> > -     ASSERT(Thread::current() == d);\n> > -\n> > -     d->removeCamera(camera.get());\n> > -     cameraRemoved.emit(camera);\n> > -}\n> > -\n> >  /**\n> >   * \\fn const std::string &CameraManager::version()\n> >   * \\brief Retrieve the libcamera version string\n> > diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\n> > index 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> >               }\n> >       }\n> >\n> > -     manager_->addCamera(std::move(camera), devnums);\n> > +     manager_->_d()->addCamera(std::move(camera), devnums);\n> >  }\n> >\n> >  /**\n> > @@ -691,7 +691,7 @@ void PipelineHandler::disconnect()\n> >                       continue;\n> >\n> >               camera->disconnect();\n> > -             manager_->removeCamera(camera);\n> > +             manager_->_d()->removeCamera(camera);\n> \n> All minors as well\n> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n> \n> Thanks\n>    j\n> \n> >       }\n> >  }\n> >\n> > --\n> > 2.34.1\n> >","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 CA49CBE08B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 13 May 2023 15:37:08 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8A279627DE;\n\tSat, 13 May 2023 17:37:08 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B567660539\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 13 May 2023 17:37:06 +0200 (CEST)","from pendragon.ideasonboard.com\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 524266CA;\n\tSat, 13 May 2023 17:36:57 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1683992228;\n\tbh=uguwcSfvo8en6vfiLsW/9xoKXzY0mpKzQ2LQ0hOsNxM=;\n\th=In-Reply-To:References:To:Date:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=FFUzEBfc3+tHj3nXpcll4iJVeWJYwdE1c8G8waoqBV7mHjKYek+e2/JpChJi4Ph5B\n\tregmL/LdUKiLumyxz41gW6eJMTHEMlys5Pbrhe+S4fUuvgirJfVJMegzi/If0YPJ0x\n\tCfakkurajFp3u1kFPaD3N7sVNehFQwsugyRN0WMGY8gMM1EZBLef85zS90zv3hRtsu\n\tec2tFFk/WH3rezbex4idhPomfDO6tn2XG92GVxxKfG0LxEit8DSYZXu6aPMzpMBCYH\n\t/M+RW/uSn5XJOVKWnwZ0G1whtoORQu7ctGkAG/lT3ZtXZx1F5SS8xB39VjH7dvcttr\n\tslYb70MnSlOnQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1683992217;\n\tbh=uguwcSfvo8en6vfiLsW/9xoKXzY0mpKzQ2LQ0hOsNxM=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=ED83QrAq0U5UhmL49YqI+cLcOt1wACumCbhiDpxFNn4GDjfPJA3TcHt9lcoZ5dIRo\n\tN0/n23JcCUEAs7SZWKp6DdpWzbI+0WxZV4/hNOrydjGdxKAsNcrNm8zT4+yk94/f5+\n\tDFh0zuw97UNsMeuPk/g9aplSGk0H5r1ktKiQEzc4="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"ED83QrAq\"; dkim-atps=neutral","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20230513145745.pvucshizdpymceef@lati>","References":"<20230511225833.361699-1-kieran.bingham@ideasonboard.com>\n\t<20230511225833.361699-3-kieran.bingham@ideasonboard.com>\n\t<20230513145745.pvucshizdpymceef@lati>","To":"Jacopo Mondi <jacopo.mondi@ideasonboard.com>,\n\tKieran Bingham via libcamera-devel <libcamera-devel@lists.libcamera.org>","Date":"Sat, 13 May 2023 16:37:04 +0100","Message-ID":"<168399222426.1830511.15109077204287739434@Monstersaurus>","User-Agent":"alot/0.10","Subject":"Re: [libcamera-devel] [PATCH v2 2/4] libcamera: camera_manager:\n\tMove {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>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]