[{"id":14156,"web_url":"https://patchwork.libcamera.org/comment/14156/","msgid":"<624a13cc-0183-f2a7-8cc9-29a41468254d@ideasonboard.com>","date":"2020-12-08T22:13:54","subject":"Re: [libcamera-devel] [PATCH 1/2] libcamera: v4l2_subdevice: Return\n\ta unique pointer from fromEntityName()","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 08/12/2020 01:49, Laurent Pinchart wrote:\n> The fromEntityName() function returns a pointer to a newly allocated\n> V4L2Subdevice instance, which must be deleted by the caller. This opens\n> the door to memory leaks. Return a unique pointer instead, which conveys\n> the API semantics better than a sentence in the documentation.\n> \n> Signed-off-by: Laurent Pinchart \n> ---\n> include/libcamera/internal/v4l2_subdevice.h | 5 +++--\n> src/libcamera/pipeline/ipu3/imgu.cpp | 2 +-\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 6 ++----\n> src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 3 +--\n> src/libcamera/pipeline/rkisp1/rkisp1_path.h | 3 ++-\n> src/libcamera/v4l2_subdevice.cpp | 10 ++++------\n> 6 files changed, 13 insertions(+), 16 deletions(-)\n> \n> diff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h\n> index 02ee3e914a8b..eb25fa2fd01b 100644\n> --- a/include/libcamera/internal/v4l2_subdevice.h\n> +++ b/include/libcamera/internal/v4l2_subdevice.h\n> @@ -7,6 +7,7 @@\n> #ifndef __LIBCAMERA_INTERNAL_V4L2_SUBDEVICE_H__\n> #define __LIBCAMERA_INTERNAL_V4L2_SUBDEVICE_H__\n> \n> +#include \n> #include \n> #include \n> \n> @@ -60,8 +61,8 @@ public:\n> \tint setFormat(unsigned int pad, V4L2SubdeviceFormat *format,\n> \t\t Whence whence = ActiveFormat);\n> \n> -\tstatic V4L2Subdevice *fromEntityName(const MediaDevice *media,\n> -\t\t\t\t\t const std::string &entity);\n> +\tstatic std::unique_ptr\n> +\tfromEntityName(const MediaDevice *media, const std::string &entity);\n> \n> protected:\n> \tstd::string logPrefix() const override;\n> diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp\n> index a4d74a62f69a..bfe9624c7797 100644\n> --- a/src/libcamera/pipeline/ipu3/imgu.cpp\n> +++ b/src/libcamera/pipeline/ipu3/imgu.cpp\n> @@ -343,7 +343,7 @@ int ImgUDevice::init(MediaDevice *media, unsigned int index)\n> \t * by the match() function: no need to check for newly created\n> \t * video devices and subdevice validity here.\n> \t */\n> -\timgu_.reset(V4L2Subdevice::fromEntityName(media, name_));\n> +\timgu_ = V4L2Subdevice::fromEntityName(media, name_);\n\nI like this,\n\n> \tret = imgu_->open();\n> \tif (ret)\n> \t\treturn ret;\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 6e74a49abfda..bcfe6c0514ab 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -217,7 +217,7 @@ private:\n> \tint freeBuffers(Camera *camera);\n> \n> \tMediaDevice *media_;\n> -\tV4L2Subdevice *isp_;\n> +\tstd::unique_ptr isp_;\n> \tV4L2VideoDevice *param_;\n> \tV4L2VideoDevice *stat_;\n> \n> @@ -599,8 +599,7 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n> }\n> \n> PipelineHandlerRkISP1::PipelineHandlerRkISP1(CameraManager *manager)\n> -\t: PipelineHandler(manager), isp_(nullptr), param_(nullptr),\n> -\t stat_(nullptr)\n> +\t: PipelineHandler(manager), param_(nullptr), stat_(nullptr)\n> {\n> }\n> \n> @@ -608,7 +607,6 @@ PipelineHandlerRkISP1::~PipelineHandlerRkISP1()\n> {\n> \tdelete param_;\n> \tdelete stat_;\n> -\tdelete isp_;\n\nAnd I like this.\n\n\n> }\n> \n> /* -----------------------------------------------------------------------------\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n> index 3f77b1c12f9d..e05d9dd657cd 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n> @@ -24,14 +24,13 @@ RkISP1Path::RkISP1Path(const char *name, const Span &formats,\n> \t\t const Size &minResolution, const Size &maxResolution)\n> \t: name_(name), running_(false), formats_(formats),\n> \t minResolution_(minResolution), maxResolution_(maxResolution),\n> -\t resizer_(nullptr), video_(nullptr), link_(nullptr)\n> +\t video_(nullptr), link_(nullptr)\n\nand this.\n\nThis makes a lot of sense as far as I can see.\n\nReviewed-by: Kieran Bingham \n\n> {\n> }\n> \n> RkISP1Path::~RkISP1Path()\n> {\n> \tdelete video_;\n> -\tdelete resizer_;\n> }\n> \n> bool RkISP1Path::init(MediaDevice *media)\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.h b/src/libcamera/pipeline/rkisp1/rkisp1_path.h\n> index 8f443e5179f6..f06ac5a731cc 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1_path.h\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.h\n> @@ -7,6 +7,7 @@\n> #ifndef __LIBCAMERA_PIPELINE_RKISP1_PATH_H__\n> #define __LIBCAMERA_PIPELINE_RKISP1_PATH_H__\n> \n> +#include \n> #include \n> \n> #include \n> @@ -65,7 +66,7 @@ private:\n> \tconst Size minResolution_;\n> \tconst Size maxResolution_;\n> \n> -\tV4L2Subdevice *resizer_;\n> +\tstd::unique_ptr resizer_;\n> \tV4L2VideoDevice *video_;\n> \tMediaLink *link_;\n> };\n> diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\n> index 85d00c246f5e..721ff5a92a2b 100644\n> --- a/src/libcamera/v4l2_subdevice.cpp\n> +++ b/src/libcamera/v4l2_subdevice.cpp\n> @@ -446,19 +446,17 @@ int V4L2Subdevice::setFormat(unsigned int pad, V4L2SubdeviceFormat *format,\n> * \\param[in] media The media device where the entity is registered\n> * \\param[in] entity The media entity name\n> *\n> - * Releasing memory of the newly created instance is responsibility of the\n> - * caller of this function.\n> - *\n> * \\return A newly created V4L2Subdevice on success, nullptr otherwise\n> */\n> -V4L2Subdevice *V4L2Subdevice::fromEntityName(const MediaDevice *media,\n> -\t\t\t\t\t const std::string &entity)\n> +std::unique_ptr\n> +V4L2Subdevice::fromEntityName(const MediaDevice *media,\n> +\t\t\t const std::string &entity)\n> {\n> \tMediaEntity *mediaEntity = media->getEntityByName(entity);\n> \tif (!mediaEntity)\n> \t\treturn nullptr;\n> \n> -\treturn new V4L2Subdevice(mediaEntity);\n> +\treturn std::make_unique(mediaEntity);\n> }\n> \n> std::string V4L2Subdevice::logPrefix() const\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 BAA80BDB20\n\tfor ;\n\tTue, 8 Dec 2020 22:14:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3974467F10;\n\tTue, 8 Dec 2020 23:14:00 +0100 (CET)","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 35DBA67F0C\n\tfor ;\n\tTue, 8 Dec 2020 23:13:58 +0100 (CET)","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 A4642DD;\n\tTue, 8 Dec 2020 23:13:57 +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=\"TQ7twHgC\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1607465637;\n\tbh=T5lv8a6XM/Ux8MdhMKQJ6J0hFI5FKRBcjgQqpwnkfFs=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=TQ7twHgCtS+Az1+zPrAYP2IFglq+9EPL/ovxH7YlQhNV7rwIVHGqEX1odJpvTQKxL\n\tl7UliVbCtNy0Oob/wL6P7qkLzDNKE7etlmvN6VOMd1Hp2OQfHM0MSOgc6VOmhsE9lz\n\tV4E+/sNSoKO/KcKpix7lFBcBbrZ6SOeZ8dS98bVM=","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20201208014951.30989-1-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<624a13cc-0183-f2a7-8cc9-29a41468254d@ideasonboard.com>","Date":"Tue, 8 Dec 2020 22:13:54 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20201208014951.30989-1-laurent.pinchart@ideasonboard.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH 1/2] libcamera: v4l2_subdevice: Return\n\ta unique pointer from fromEntityName()","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","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":14162,"web_url":"https://patchwork.libcamera.org/comment/14162/","msgid":"<20201209091544.ugosexjuda67i56l@uno.localdomain>","date":"2020-12-09T09:15:44","subject":"Re: [libcamera-devel] [PATCH 1/2] libcamera: v4l2_subdevice: Return\n\ta unique pointer from fromEntityName()","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n\nOn Tue, Dec 08, 2020 at 03:49:50AM +0200, Laurent Pinchart wrote:\n> The fromEntityName() function returns a pointer to a newly allocated\n> V4L2Subdevice instance, which must be deleted by the caller. This opens\n> the door to memory leaks. Return a unique pointer instead, which conveys\n> the API semantics better than a sentence in the documentation.\n>\n> Signed-off-by: Laurent Pinchart \n\nLooks good!\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> ---\n> include/libcamera/internal/v4l2_subdevice.h | 5 +++--\n> src/libcamera/pipeline/ipu3/imgu.cpp | 2 +-\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 6 ++----\n> src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 3 +--\n> src/libcamera/pipeline/rkisp1/rkisp1_path.h | 3 ++-\n> src/libcamera/v4l2_subdevice.cpp | 10 ++++------\n> 6 files changed, 13 insertions(+), 16 deletions(-)\n>\n> diff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h\n> index 02ee3e914a8b..eb25fa2fd01b 100644\n> --- a/include/libcamera/internal/v4l2_subdevice.h\n> +++ b/include/libcamera/internal/v4l2_subdevice.h\n> @@ -7,6 +7,7 @@\n> #ifndef __LIBCAMERA_INTERNAL_V4L2_SUBDEVICE_H__\n> #define __LIBCAMERA_INTERNAL_V4L2_SUBDEVICE_H__\n>\n> +#include \n> #include \n> #include \n>\n> @@ -60,8 +61,8 @@ public:\n> \tint setFormat(unsigned int pad, V4L2SubdeviceFormat *format,\n> \t\t Whence whence = ActiveFormat);\n>\n> -\tstatic V4L2Subdevice *fromEntityName(const MediaDevice *media,\n> -\t\t\t\t\t const std::string &entity);\n> +\tstatic std::unique_ptr\n> +\tfromEntityName(const MediaDevice *media, const std::string &entity);\n>\n> protected:\n> \tstd::string logPrefix() const override;\n> diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp\n> index a4d74a62f69a..bfe9624c7797 100644\n> --- a/src/libcamera/pipeline/ipu3/imgu.cpp\n> +++ b/src/libcamera/pipeline/ipu3/imgu.cpp\n> @@ -343,7 +343,7 @@ int ImgUDevice::init(MediaDevice *media, unsigned int index)\n> \t * by the match() function: no need to check for newly created\n> \t * video devices and subdevice validity here.\n> \t */\n> -\timgu_.reset(V4L2Subdevice::fromEntityName(media, name_));\n> +\timgu_ = V4L2Subdevice::fromEntityName(media, name_);\n> \tret = imgu_->open();\n> \tif (ret)\n> \t\treturn ret;\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 6e74a49abfda..bcfe6c0514ab 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -217,7 +217,7 @@ private:\n> \tint freeBuffers(Camera *camera);\n>\n> \tMediaDevice *media_;\n> -\tV4L2Subdevice *isp_;\n> +\tstd::unique_ptr isp_;\n> \tV4L2VideoDevice *param_;\n> \tV4L2VideoDevice *stat_;\n>\n> @@ -599,8 +599,7 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n> }\n>\n> PipelineHandlerRkISP1::PipelineHandlerRkISP1(CameraManager *manager)\n> -\t: PipelineHandler(manager), isp_(nullptr), param_(nullptr),\n> -\t stat_(nullptr)\n> +\t: PipelineHandler(manager), param_(nullptr), stat_(nullptr)\n> {\n> }\n>\n> @@ -608,7 +607,6 @@ PipelineHandlerRkISP1::~PipelineHandlerRkISP1()\n> {\n> \tdelete param_;\n> \tdelete stat_;\n> -\tdelete isp_;\n> }\n>\n> /* -----------------------------------------------------------------------------\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n> index 3f77b1c12f9d..e05d9dd657cd 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n> @@ -24,14 +24,13 @@ RkISP1Path::RkISP1Path(const char *name, const Span &formats,\n> \t\t const Size &minResolution, const Size &maxResolution)\n> \t: name_(name), running_(false), formats_(formats),\n> \t minResolution_(minResolution), maxResolution_(maxResolution),\n> -\t resizer_(nullptr), video_(nullptr), link_(nullptr)\n> +\t video_(nullptr), link_(nullptr)\n> {\n> }\n>\n> RkISP1Path::~RkISP1Path()\n> {\n> \tdelete video_;\n> -\tdelete resizer_;\n> }\n>\n> bool RkISP1Path::init(MediaDevice *media)\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.h b/src/libcamera/pipeline/rkisp1/rkisp1_path.h\n> index 8f443e5179f6..f06ac5a731cc 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1_path.h\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.h\n> @@ -7,6 +7,7 @@\n> #ifndef __LIBCAMERA_PIPELINE_RKISP1_PATH_H__\n> #define __LIBCAMERA_PIPELINE_RKISP1_PATH_H__\n>\n> +#include \n> #include \n>\n> #include \n> @@ -65,7 +66,7 @@ private:\n> \tconst Size minResolution_;\n> \tconst Size maxResolution_;\n>\n> -\tV4L2Subdevice *resizer_;\n> +\tstd::unique_ptr resizer_;\n> \tV4L2VideoDevice *video_;\n> \tMediaLink *link_;\n> };\n> diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\n> index 85d00c246f5e..721ff5a92a2b 100644\n> --- a/src/libcamera/v4l2_subdevice.cpp\n> +++ b/src/libcamera/v4l2_subdevice.cpp\n> @@ -446,19 +446,17 @@ int V4L2Subdevice::setFormat(unsigned int pad, V4L2SubdeviceFormat *format,\n> * \\param[in] media The media device where the entity is registered\n> * \\param[in] entity The media entity name\n> *\n> - * Releasing memory of the newly created instance is responsibility of the\n> - * caller of this function.\n> - *\n> * \\return A newly created V4L2Subdevice on success, nullptr otherwise\n> */\n> -V4L2Subdevice *V4L2Subdevice::fromEntityName(const MediaDevice *media,\n> -\t\t\t\t\t const std::string &entity)\n> +std::unique_ptr\n> +V4L2Subdevice::fromEntityName(const MediaDevice *media,\n> +\t\t\t const std::string &entity)\n> {\n> \tMediaEntity *mediaEntity = media->getEntityByName(entity);\n> \tif (!mediaEntity)\n> \t\treturn nullptr;\n>\n> -\treturn new V4L2Subdevice(mediaEntity);\n> +\treturn std::make_unique(mediaEntity);\n> }\n>\n> std::string V4L2Subdevice::logPrefix() const\n> --\n> Regards,\n>\n> Laurent Pinchart\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","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 45482BDE1E\n\tfor ;\n\tWed, 9 Dec 2020 09:15:37 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 23294635D3;\n\tWed, 9 Dec 2020 10:15:37 +0100 (CET)","from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net\n\t[217.70.183.195])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9B560635C4\n\tfor ;\n\tWed, 9 Dec 2020 10:15:35 +0100 (CET)","from uno.localdomain (93-34-118-233.ip49.fastwebnet.it\n\t[93.34.118.233]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 1A45960005;\n\tWed, 9 Dec 2020 09:15:34 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","Date":"Wed, 9 Dec 2020 10:15:44 +0100","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Message-ID":"<20201209091544.ugosexjuda67i56l@uno.localdomain>","References":"<20201208014951.30989-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201208014951.30989-1-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 1/2] libcamera: v4l2_subdevice: Return\n\ta unique pointer from fromEntityName()","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]