[{"id":18720,"web_url":"https://patchwork.libcamera.org/comment/18720/","msgid":"<92943d80-a8d0-6e85-71de-20d69b98d2ee@ideasonboard.com>","date":"2021-08-12T07:21:05","subject":"Re: [libcamera-devel] [PATCH v3 01/14] libcamera: base: extensible:\n\tPass private pointer as unique_ptr<>","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 12/08/2021 00:26, Laurent Pinchart wrote:\n> The Extensible constructor takes a pointer to a Private instance, whose\n> lifetime it then manages. Make this explicit in the API by passing the\n> pointer as a std::unique_ptr.\n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Laurent Pinchart \n> ---\n> include/libcamera/base/class.h | 2 +-\n> src/android/camera_buffer.h | 2 +-\n> src/android/camera_hal_config.cpp | 2 +-\n> src/libcamera/base/class.cpp | 11 +++++++++--\n> src/libcamera/camera.cpp | 2 +-\n> src/libcamera/camera_manager.cpp | 2 +-\n> src/libcamera/framebuffer.cpp | 3 ++-\n> 7 files changed, 16 insertions(+), 8 deletions(-)\n> \n> diff --git a/include/libcamera/base/class.h b/include/libcamera/base/class.h\n> index a5946836d2b9..9a82d61472c1 100644\n> --- a/include/libcamera/base/class.h\n> +++ b/include/libcamera/base/class.h\n> @@ -87,7 +87,7 @@ public:\n> \t\tExtensible *const o_;\n> \t};\n> \n> -\tExtensible(Private *d);\n> +\tExtensible(std::unique_ptr d);\n> \n> protected:\n> \ttemplate\n> diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h\n> index 21373fa25bf8..c4e3a9e7b912 100644\n> --- a/src/android/camera_buffer.h\n> +++ b/src/android/camera_buffer.h\n> @@ -32,7 +32,7 @@ public:\n> \n> #define PUBLIC_CAMERA_BUFFER_IMPLEMENTATION\t\t\t\t\\\n> CameraBuffer::CameraBuffer(buffer_handle_t camera3Buffer, int flags)\t\\\n> -\t: Extensible(new Private(this, camera3Buffer, flags))\t\t\\\n> +\t: Extensible(std::make_unique(this, camera3Buffer, flags)) \\\n> {\t\t\t\t\t\t\t\t\t\\\n> }\t\t\t\t\t\t\t\t\t\\\n> CameraBuffer::~CameraBuffer()\t\t\t\t\t\t\\\n> diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp\n> index 14549083a97a..aa90dac78075 100644\n> --- a/src/android/camera_hal_config.cpp\n> +++ b/src/android/camera_hal_config.cpp\n> @@ -341,7 +341,7 @@ int CameraHalConfig::Private::parseConfigFile(FILE *fh,\n> }\n> \n> CameraHalConfig::CameraHalConfig()\n> -\t: Extensible(new Private()), exists_(false), valid_(false)\n> +\t: Extensible(std::make_unique()), exists_(false), valid_(false)\n> {\n> \tparseConfigurationFile();\n> }\n> diff --git a/src/libcamera/base/class.cpp b/src/libcamera/base/class.cpp\n> index d24043c20e55..9c2d9f218bd4 100644\n> --- a/src/libcamera/base/class.cpp\n> +++ b/src/libcamera/base/class.cpp\n> @@ -147,9 +147,12 @@ namespace libcamera {\n> /**\n> * \\brief Construct an instance of an Extensible class\n> * \\param[in] d Pointer to the private data instance\n> + *\n> + * The private data lifetime is managed by the Extensible class, which destroys\n> + * it when the Extensible instance is destroyed.\n> */\n> -Extensible::Extensible(Extensible::Private *d)\n> -\t: d_(d)\n> +Extensible::Extensible(std::unique_ptr d)\n> +\t: d_(std::move(d))\n> {\n> \t*const_cast(&d_->o_) = this;\n> }\n> @@ -163,6 +166,10 @@ Extensible::Extensible(Extensible::Private *d)\n> * overriden _d() functions that return the correct pointer type to the\n> * corresponding derived Private class.\n> *\n> + * The lifetime of the private data is tied to the Extensible class. The caller\n> + * shall not retain any reference to the returned pointer for longer than it\n> + * holds a reference to the Extensible instance.\n> + *\n> * \\return A pointer to the private data instance\n> */\n> \n> diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\n> index 6281e92057e4..8e99e2a96eaf 100644\n> --- a/src/libcamera/camera.cpp\n> +++ b/src/libcamera/camera.cpp\n> @@ -596,7 +596,7 @@ const std::string &Camera::id() const\n> \n> Camera::Camera(PipelineHandler *pipe, const std::string &id,\n> \t const std::set &streams)\n> -\t: Extensible(new Private(pipe, id, streams))\n> +\t: Extensible(std::make_unique(pipe, id, streams))\n> {\n> }\n> \n> diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\n> index 893aa6067171..fe80a46f5d20 100644\n> --- a/src/libcamera/camera_manager.cpp\n> +++ b/src/libcamera/camera_manager.cpp\n> @@ -258,7 +258,7 @@ void CameraManager::Private::removeCamera(Camera *camera)\n> CameraManager *CameraManager::self_ = nullptr;\n> \n> CameraManager::CameraManager()\n> -\t: Extensible(new CameraManager::Private())\n> +\t: Extensible(std::make_unique())\n> {\n> \tif (self_)\n> \t\tLOG(Camera, Fatal)\n> diff --git a/src/libcamera/framebuffer.cpp b/src/libcamera/framebuffer.cpp\n> index 42c73134152b..b401c50efd53 100644\n> --- a/src/libcamera/framebuffer.cpp\n> +++ b/src/libcamera/framebuffer.cpp\n> @@ -181,7 +181,8 @@ FrameBuffer::Private::Private()\n> * \\param[in] cookie Cookie\n> */\n> FrameBuffer::FrameBuffer(const std::vector &planes, unsigned int cookie)\n> -\t: Extensible(new Private()), planes_(planes), cookie_(cookie)\n> +\t: Extensible(std::make_unique()), planes_(planes),\n> +\t cookie_(cookie)\n> {\n> }\n> \n>","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 612E1C3240\n\tfor ;\n\tThu, 12 Aug 2021 07:21:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A6F7B6884D;\n\tThu, 12 Aug 2021 09:21:09 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4E6CB60264\n\tfor ;\n\tThu, 12 Aug 2021 09:21:08 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C88B0EE;\n\tThu, 12 Aug 2021 09:21:07 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"aXc1imgh\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628752867;\n\tbh=0qX7yzfGlCpvHh5/mBVkduPXTAUifn/F2PP2pIkCLHI=;\n\th=Subject:To:References:From:Date:In-Reply-To:From;\n\tb=aXc1imghe4eldY7QdlWWqSRmZ3b0SA4xnHt38PLVBHbG09TjtBXukk8ZaPiFq3Omo\n\ttljC6WCtTanDKVl1VUKWFDDB+qqYiGbYLgrDKW0atPQ3ZbbSlKA36hizPf5E2OifSf\n\tBuHnkdIKYYgET+jW7GgN6N+I3u459fR7QnqaVO4c=","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210811232625.17280-1-laurent.pinchart@ideasonboard.com>\n\t<20210811232625.17280-2-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Message-ID":"<92943d80-a8d0-6e85-71de-20d69b98d2ee@ideasonboard.com>","Date":"Thu, 12 Aug 2021 08:21:05 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.11.0","MIME-Version":"1.0","In-Reply-To":"<20210811232625.17280-2-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH v3 01/14] libcamera: base: extensible:\n\tPass private pointer as unique_ptr<>","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":18723,"web_url":"https://patchwork.libcamera.org/comment/18723/","msgid":"<20210812074725.gucgl333rcoc3u7c@uno.localdomain>","date":"2021-08-12T07:47:25","subject":"Re: [libcamera-devel] [PATCH v3 01/14] libcamera: base: extensible:\n\tPass private pointer as unique_ptr<>","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"On Thu, Aug 12, 2021 at 02:26:12AM +0300, Laurent Pinchart wrote:\n> The Extensible constructor takes a pointer to a Private instance, whose\n> lifetime it then manages. Make this explicit in the API by passing the\n> pointer as a std::unique_ptr.\n>\n> Signed-off-by: Laurent Pinchart \n> ---\n> include/libcamera/base/class.h | 2 +-\n> src/android/camera_buffer.h | 2 +-\n> src/android/camera_hal_config.cpp | 2 +-\n> src/libcamera/base/class.cpp | 11 +++++++++--\n> src/libcamera/camera.cpp | 2 +-\n> src/libcamera/camera_manager.cpp | 2 +-\n> src/libcamera/framebuffer.cpp | 3 ++-\n> 7 files changed, 16 insertions(+), 8 deletions(-)\n>\n> diff --git a/include/libcamera/base/class.h b/include/libcamera/base/class.h\n> index a5946836d2b9..9a82d61472c1 100644\n> --- a/include/libcamera/base/class.h\n> +++ b/include/libcamera/base/class.h\n> @@ -87,7 +87,7 @@ public:\n> \t\tExtensible *const o_;\n> \t};\n>\n> -\tExtensible(Private *d);\n> +\tExtensible(std::unique_ptr d);\n>\n> protected:\n> \ttemplate\n> diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h\n> index 21373fa25bf8..c4e3a9e7b912 100644\n> --- a/src/android/camera_buffer.h\n> +++ b/src/android/camera_buffer.h\n> @@ -32,7 +32,7 @@ public:\n>\n> #define PUBLIC_CAMERA_BUFFER_IMPLEMENTATION\t\t\t\t\\\n> CameraBuffer::CameraBuffer(buffer_handle_t camera3Buffer, int flags)\t\\\n> -\t: Extensible(new Private(this, camera3Buffer, flags))\t\t\\\n> +\t: Extensible(std::make_unique(this, camera3Buffer, flags)) \\\n> {\t\t\t\t\t\t\t\t\t\\\n> }\t\t\t\t\t\t\t\t\t\\\n> CameraBuffer::~CameraBuffer()\t\t\t\t\t\t\\\n> diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp\n> index 14549083a97a..aa90dac78075 100644\n> --- a/src/android/camera_hal_config.cpp\n> +++ b/src/android/camera_hal_config.cpp\n> @@ -341,7 +341,7 @@ int CameraHalConfig::Private::parseConfigFile(FILE *fh,\n> }\n>\n> CameraHalConfig::CameraHalConfig()\n> -\t: Extensible(new Private()), exists_(false), valid_(false)\n> +\t: Extensible(std::make_unique()), exists_(false), valid_(false)\n> {\n> \tparseConfigurationFile();\n> }\n> diff --git a/src/libcamera/base/class.cpp b/src/libcamera/base/class.cpp\n> index d24043c20e55..9c2d9f218bd4 100644\n> --- a/src/libcamera/base/class.cpp\n> +++ b/src/libcamera/base/class.cpp\n> @@ -147,9 +147,12 @@ namespace libcamera {\n> /**\n> * \\brief Construct an instance of an Extensible class\n> * \\param[in] d Pointer to the private data instance\n> + *\n> + * The private data lifetime is managed by the Extensible class, which destroys\n> + * it when the Extensible instance is destroyed.\n> */\n> -Extensible::Extensible(Extensible::Private *d)\n> -\t: d_(d)\n> +Extensible::Extensible(std::unique_ptr d)\n> +\t: d_(std::move(d))\n> {\n> \t*const_cast(&d_->o_) = this;\n> }\n> @@ -163,6 +166,10 @@ Extensible::Extensible(Extensible::Private *d)\n> * overriden _d() functions that return the correct pointer type to the\n> * corresponding derived Private class.\n> *\n> + * The lifetime of the private data is tied to the Extensible class. The caller\n> + * shall not retain any reference to the returned pointer for longer than it\n\nis \"returned pointer\" intentional ?\n\nThis apart\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n\n> + * holds a reference to the Extensible instance.\n> + *\n> * \\return A pointer to the private data instance\n> */\n>\n> diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\n> index 6281e92057e4..8e99e2a96eaf 100644\n> --- a/src/libcamera/camera.cpp\n> +++ b/src/libcamera/camera.cpp\n> @@ -596,7 +596,7 @@ const std::string &Camera::id() const\n>\n> Camera::Camera(PipelineHandler *pipe, const std::string &id,\n> \t const std::set &streams)\n> -\t: Extensible(new Private(pipe, id, streams))\n> +\t: Extensible(std::make_unique(pipe, id, streams))\n> {\n> }\n>\n> diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\n> index 893aa6067171..fe80a46f5d20 100644\n> --- a/src/libcamera/camera_manager.cpp\n> +++ b/src/libcamera/camera_manager.cpp\n> @@ -258,7 +258,7 @@ void CameraManager::Private::removeCamera(Camera *camera)\n> CameraManager *CameraManager::self_ = nullptr;\n>\n> CameraManager::CameraManager()\n> -\t: Extensible(new CameraManager::Private())\n> +\t: Extensible(std::make_unique())\n> {\n> \tif (self_)\n> \t\tLOG(Camera, Fatal)\n> diff --git a/src/libcamera/framebuffer.cpp b/src/libcamera/framebuffer.cpp\n> index 42c73134152b..b401c50efd53 100644\n> --- a/src/libcamera/framebuffer.cpp\n> +++ b/src/libcamera/framebuffer.cpp\n> @@ -181,7 +181,8 @@ FrameBuffer::Private::Private()\n> * \\param[in] cookie Cookie\n> */\n> FrameBuffer::FrameBuffer(const std::vector &planes, unsigned int cookie)\n> -\t: Extensible(new Private()), planes_(planes), cookie_(cookie)\n> +\t: Extensible(std::make_unique()), planes_(planes),\n> +\t cookie_(cookie)\n> {\n> }\n>\n> --\n> Regards,\n>\n> Laurent Pinchart\n>","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 2098CBD87D\n\tfor ;\n\tThu, 12 Aug 2021 07:46:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A17E36884F;\n\tThu, 12 Aug 2021 09:46:40 +0200 (CEST)","from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net\n\t[217.70.183.198])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8FF9F60264\n\tfor ;\n\tThu, 12 Aug 2021 09:46:39 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 6EF4FC000B;\n\tThu, 12 Aug 2021 07:46:37 +0000 (UTC)"],"Date":"Thu, 12 Aug 2021 09:47:25 +0200","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Message-ID":"<20210812074725.gucgl333rcoc3u7c@uno.localdomain>","References":"<20210811232625.17280-1-laurent.pinchart@ideasonboard.com>\n\t<20210811232625.17280-2-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210811232625.17280-2-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v3 01/14] libcamera: base: extensible:\n\tPass private pointer as unique_ptr<>","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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":18733,"web_url":"https://patchwork.libcamera.org/comment/18733/","msgid":"","date":"2021-08-12T12:39:04","subject":"Re: [libcamera-devel] [PATCH v3 01/14] libcamera: base: extensible:\n\tPass private pointer as unique_ptr<>","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn Thu, Aug 12, 2021 at 09:47:25AM +0200, Jacopo Mondi wrote:\n> On Thu, Aug 12, 2021 at 02:26:12AM +0300, Laurent Pinchart wrote:\n> > The Extensible constructor takes a pointer to a Private instance, whose\n> > lifetime it then manages. Make this explicit in the API by passing the\n> > pointer as a std::unique_ptr.\n> >\n> > Signed-off-by: Laurent Pinchart \n> > ---\n> > include/libcamera/base/class.h | 2 +-\n> > src/android/camera_buffer.h | 2 +-\n> > src/android/camera_hal_config.cpp | 2 +-\n> > src/libcamera/base/class.cpp | 11 +++++++++--\n> > src/libcamera/camera.cpp | 2 +-\n> > src/libcamera/camera_manager.cpp | 2 +-\n> > src/libcamera/framebuffer.cpp | 3 ++-\n> > 7 files changed, 16 insertions(+), 8 deletions(-)\n> >\n> > diff --git a/include/libcamera/base/class.h b/include/libcamera/base/class.h\n> > index a5946836d2b9..9a82d61472c1 100644\n> > --- a/include/libcamera/base/class.h\n> > +++ b/include/libcamera/base/class.h\n> > @@ -87,7 +87,7 @@ public:\n> > \t\tExtensible *const o_;\n> > \t};\n> >\n> > -\tExtensible(Private *d);\n> > +\tExtensible(std::unique_ptr d);\n> >\n> > protected:\n> > \ttemplate\n> > diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h\n> > index 21373fa25bf8..c4e3a9e7b912 100644\n> > --- a/src/android/camera_buffer.h\n> > +++ b/src/android/camera_buffer.h\n> > @@ -32,7 +32,7 @@ public:\n> >\n> > #define PUBLIC_CAMERA_BUFFER_IMPLEMENTATION\t\t\t\t\\\n> > CameraBuffer::CameraBuffer(buffer_handle_t camera3Buffer, int flags)\t\\\n> > -\t: Extensible(new Private(this, camera3Buffer, flags))\t\t\\\n> > +\t: Extensible(std::make_unique(this, camera3Buffer, flags)) \\\n> > {\t\t\t\t\t\t\t\t\t\\\n> > }\t\t\t\t\t\t\t\t\t\\\n> > CameraBuffer::~CameraBuffer()\t\t\t\t\t\t\\\n> > diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp\n> > index 14549083a97a..aa90dac78075 100644\n> > --- a/src/android/camera_hal_config.cpp\n> > +++ b/src/android/camera_hal_config.cpp\n> > @@ -341,7 +341,7 @@ int CameraHalConfig::Private::parseConfigFile(FILE *fh,\n> > }\n> >\n> > CameraHalConfig::CameraHalConfig()\n> > -\t: Extensible(new Private()), exists_(false), valid_(false)\n> > +\t: Extensible(std::make_unique()), exists_(false), valid_(false)\n> > {\n> > \tparseConfigurationFile();\n> > }\n> > diff --git a/src/libcamera/base/class.cpp b/src/libcamera/base/class.cpp\n> > index d24043c20e55..9c2d9f218bd4 100644\n> > --- a/src/libcamera/base/class.cpp\n> > +++ b/src/libcamera/base/class.cpp\n> > @@ -147,9 +147,12 @@ namespace libcamera {\n> > /**\n> > * \\brief Construct an instance of an Extensible class\n> > * \\param[in] d Pointer to the private data instance\n> > + *\n> > + * The private data lifetime is managed by the Extensible class, which destroys\n> > + * it when the Extensible instance is destroyed.\n> > */\n> > -Extensible::Extensible(Extensible::Private *d)\n> > -\t: d_(d)\n> > +Extensible::Extensible(std::unique_ptr d)\n> > +\t: d_(std::move(d))\n> > {\n> > \t*const_cast(&d_->o_) = this;\n> > }\n> > @@ -163,6 +166,10 @@ Extensible::Extensible(Extensible::Private *d)\n> > * overriden _d() functions that return the correct pointer type to the\n> > * corresponding derived Private class.\n> > *\n> > + * The lifetime of the private data is tied to the Extensible class. The caller\n> > + * shall not retain any reference to the returned pointer for longer than it\n> \n> is \"returned pointer\" intentional ?\n\nYes it is, it's the pointer returned by this function. I'll write \"to\nthe pointer returned by this function\".\n\n> This apart\n> Reviewed-by: Jacopo Mondi \n> \n> > + * holds a reference to the Extensible instance.\n> > + *\n> > * \\return A pointer to the private data instance\n> > */\n> >\n> > diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\n> > index 6281e92057e4..8e99e2a96eaf 100644\n> > --- a/src/libcamera/camera.cpp\n> > +++ b/src/libcamera/camera.cpp\n> > @@ -596,7 +596,7 @@ const std::string &Camera::id() const\n> >\n> > Camera::Camera(PipelineHandler *pipe, const std::string &id,\n> > \t const std::set &streams)\n> > -\t: Extensible(new Private(pipe, id, streams))\n> > +\t: Extensible(std::make_unique(pipe, id, streams))\n> > {\n> > }\n> >\n> > diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\n> > index 893aa6067171..fe80a46f5d20 100644\n> > --- a/src/libcamera/camera_manager.cpp\n> > +++ b/src/libcamera/camera_manager.cpp\n> > @@ -258,7 +258,7 @@ void CameraManager::Private::removeCamera(Camera *camera)\n> > CameraManager *CameraManager::self_ = nullptr;\n> >\n> > CameraManager::CameraManager()\n> > -\t: Extensible(new CameraManager::Private())\n> > +\t: Extensible(std::make_unique())\n> > {\n> > \tif (self_)\n> > \t\tLOG(Camera, Fatal)\n> > diff --git a/src/libcamera/framebuffer.cpp b/src/libcamera/framebuffer.cpp\n> > index 42c73134152b..b401c50efd53 100644\n> > --- a/src/libcamera/framebuffer.cpp\n> > +++ b/src/libcamera/framebuffer.cpp\n> > @@ -181,7 +181,8 @@ FrameBuffer::Private::Private()\n> > * \\param[in] cookie Cookie\n> > */\n> > FrameBuffer::FrameBuffer(const std::vector &planes, unsigned int cookie)\n> > -\t: Extensible(new Private()), planes_(planes), cookie_(cookie)\n> > +\t: Extensible(std::make_unique()), planes_(planes),\n> > +\t cookie_(cookie)\n> > {\n> > }\n> >","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 CA378C3240\n\tfor ;\n\tThu, 12 Aug 2021 12:39:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4B72D6884F;\n\tThu, 12 Aug 2021 14:39:10 +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 D6F0560264\n\tfor ;\n\tThu, 12 Aug 2021 14:39:08 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 51123EE;\n\tThu, 12 Aug 2021 14:39:08 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"waVV/hj6\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628771948;\n\tbh=PixAUfhxsfg9rysm2k2KFkGj1yK1tJl8TsWTKreUC6M=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=waVV/hj63ukay1h4FH6XV/tJinYm1qG3T2kNN5Mj199bBCuOQ4PYAIwmWW14CH2Lh\n\tWY8asS+6DGnrAZNKstkQtqhDVZoau5An6fiRzzTWFkX9LN25Hzl1ZFvP/URepnFFKD\n\t9zg9To4OLwFdbQTfbttx9G1sqx4Wjbd484WYfTHc=","Date":"Thu, 12 Aug 2021 15:39:04 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"","References":"<20210811232625.17280-1-laurent.pinchart@ideasonboard.com>\n\t<20210811232625.17280-2-laurent.pinchart@ideasonboard.com>\n\t<20210812074725.gucgl333rcoc3u7c@uno.localdomain>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210812074725.gucgl333rcoc3u7c@uno.localdomain>","Subject":"Re: [libcamera-devel] [PATCH v3 01/14] libcamera: base: extensible:\n\tPass private pointer as unique_ptr<>","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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":18734,"web_url":"https://patchwork.libcamera.org/comment/18734/","msgid":"<20210812124728.44wkdyslhspknhwt@uno.localdomain>","date":"2021-08-12T12:47:28","subject":"Re: [libcamera-devel] [PATCH v3 01/14] libcamera: base: extensible:\n\tPass private pointer as unique_ptr<>","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent\n\nOn Thu, Aug 12, 2021 at 03:39:04PM +0300, Laurent Pinchart wrote:\n> Hi Jacopo,\n>\n> On Thu, Aug 12, 2021 at 09:47:25AM +0200, Jacopo Mondi wrote:\n> > On Thu, Aug 12, 2021 at 02:26:12AM +0300, Laurent Pinchart wrote:\n> > > The Extensible constructor takes a pointer to a Private instance, whose\n> > > lifetime it then manages. Make this explicit in the API by passing the\n> > > pointer as a std::unique_ptr.\n> > >\n> > > Signed-off-by: Laurent Pinchart \n> > > ---\n> > > include/libcamera/base/class.h | 2 +-\n> > > src/android/camera_buffer.h | 2 +-\n> > > src/android/camera_hal_config.cpp | 2 +-\n> > > src/libcamera/base/class.cpp | 11 +++++++++--\n> > > src/libcamera/camera.cpp | 2 +-\n> > > src/libcamera/camera_manager.cpp | 2 +-\n> > > src/libcamera/framebuffer.cpp | 3 ++-\n> > > 7 files changed, 16 insertions(+), 8 deletions(-)\n> > >\n> > > diff --git a/include/libcamera/base/class.h b/include/libcamera/base/class.h\n> > > index a5946836d2b9..9a82d61472c1 100644\n> > > --- a/include/libcamera/base/class.h\n> > > +++ b/include/libcamera/base/class.h\n> > > @@ -87,7 +87,7 @@ public:\n> > > \t\tExtensible *const o_;\n> > > \t};\n> > >\n> > > -\tExtensible(Private *d);\n> > > +\tExtensible(std::unique_ptr d);\n> > >\n> > > protected:\n> > > \ttemplate\n> > > diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h\n> > > index 21373fa25bf8..c4e3a9e7b912 100644\n> > > --- a/src/android/camera_buffer.h\n> > > +++ b/src/android/camera_buffer.h\n> > > @@ -32,7 +32,7 @@ public:\n> > >\n> > > #define PUBLIC_CAMERA_BUFFER_IMPLEMENTATION\t\t\t\t\\\n> > > CameraBuffer::CameraBuffer(buffer_handle_t camera3Buffer, int flags)\t\\\n> > > -\t: Extensible(new Private(this, camera3Buffer, flags))\t\t\\\n> > > +\t: Extensible(std::make_unique(this, camera3Buffer, flags)) \\\n> > > {\t\t\t\t\t\t\t\t\t\\\n> > > }\t\t\t\t\t\t\t\t\t\\\n> > > CameraBuffer::~CameraBuffer()\t\t\t\t\t\t\\\n> > > diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp\n> > > index 14549083a97a..aa90dac78075 100644\n> > > --- a/src/android/camera_hal_config.cpp\n> > > +++ b/src/android/camera_hal_config.cpp\n> > > @@ -341,7 +341,7 @@ int CameraHalConfig::Private::parseConfigFile(FILE *fh,\n> > > }\n> > >\n> > > CameraHalConfig::CameraHalConfig()\n> > > -\t: Extensible(new Private()), exists_(false), valid_(false)\n> > > +\t: Extensible(std::make_unique()), exists_(false), valid_(false)\n> > > {\n> > > \tparseConfigurationFile();\n> > > }\n> > > diff --git a/src/libcamera/base/class.cpp b/src/libcamera/base/class.cpp\n> > > index d24043c20e55..9c2d9f218bd4 100644\n> > > --- a/src/libcamera/base/class.cpp\n> > > +++ b/src/libcamera/base/class.cpp\n> > > @@ -147,9 +147,12 @@ namespace libcamera {\n> > > /**\n> > > * \\brief Construct an instance of an Extensible class\n> > > * \\param[in] d Pointer to the private data instance\n> > > + *\n> > > + * The private data lifetime is managed by the Extensible class, which destroys\n> > > + * it when the Extensible instance is destroyed.\n> > > */\n> > > -Extensible::Extensible(Extensible::Private *d)\n> > > -\t: d_(d)\n> > > +Extensible::Extensible(std::unique_ptr d)\n> > > +\t: d_(std::move(d))\n> > > {\n> > > \t*const_cast(&d_->o_) = this;\n> > > }\n> > > @@ -163,6 +166,10 @@ Extensible::Extensible(Extensible::Private *d)\n> > > * overriden _d() functions that return the correct pointer type to the\n> > > * corresponding derived Private class.\n> > > *\n> > > + * The lifetime of the private data is tied to the Extensible class. The caller\n> > > + * shall not retain any reference to the returned pointer for longer than it\n> >\n> > is \"returned pointer\" intentional ?\n>\n> Yes it is, it's the pointer returned by this function. I'll write \"to\n> the pointer returned by this function\".\n>\n\nNah, don't worry, the diff fooled me, I thought this was the\nconstructor documentation.","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 A6ABEBD87D\n\tfor ;\n\tThu, 12 Aug 2021 12:46:42 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1C9E16884F;\n\tThu, 12 Aug 2021 14:46:42 +0200 (CEST)","from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C0BB160264\n\tfor ;\n\tThu, 12 Aug 2021 14:46:40 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id 36F34100004;\n\tThu, 12 Aug 2021 12:46:39 +0000 (UTC)"],"Date":"Thu, 12 Aug 2021 14:47:28 +0200","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Message-ID":"<20210812124728.44wkdyslhspknhwt@uno.localdomain>","References":"<20210811232625.17280-1-laurent.pinchart@ideasonboard.com>\n\t<20210811232625.17280-2-laurent.pinchart@ideasonboard.com>\n\t<20210812074725.gucgl333rcoc3u7c@uno.localdomain>\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"","Subject":"Re: [libcamera-devel] [PATCH v3 01/14] libcamera: base: extensible:\n\tPass private pointer as unique_ptr<>","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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]