[{"id":33806,"web_url":"https://patchwork.libcamera.org/comment/33806/","msgid":"<174344409893.3394313.15389367723012409822@ping.linuxembedded.co.uk>","date":"2025-03-31T18:01:38","subject":"Re: [PATCH v2 1/3] libcamera: request: Make `controls_`/`metadata_`\n\tmembers","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Barnabás Pőcze (2025-03-31 15:17:12)\n> The lifetimes of these two `ControlList`s are tied entirely to the request\n> object, so simplify the code by making them member variables instead of\n> manually managing their dynamic lifetime.\n> \n\nFixing the lifetimes makes sense.\n\nLater patches move this anyway, but I think that's ok here.\n\n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Barnabás Pőcze \n> ---\n> include/libcamera/request.h | 8 ++++----\n> src/libcamera/request.cpp | 17 ++++-------------\n> 2 files changed, 8 insertions(+), 17 deletions(-)\n> \n> diff --git a/include/libcamera/request.h b/include/libcamera/request.h\n> index e214a9d13..3061e2fb0 100644\n> --- a/include/libcamera/request.h\n> +++ b/include/libcamera/request.h\n> @@ -49,8 +49,8 @@ public:\n> \n> void reuse(ReuseFlag flags = Default);\n> \n> - ControlList &controls() { return *controls_; }\n> - ControlList &metadata() { return *metadata_; }\n> + ControlList &controls() { return controls_; }\n> + ControlList &metadata() { return metadata_; }\n> const BufferMap &buffers() const { return bufferMap_; }\n> int addBuffer(const Stream *stream, FrameBuffer *buffer,\n> std::unique_ptr fence = nullptr);\n> @@ -67,8 +67,8 @@ public:\n> private:\n> LIBCAMERA_DISABLE_COPY(Request)\n> \n> - ControlList *controls_;\n> - ControlList *metadata_;\n> + ControlList controls_;\n> + ControlList metadata_;\n> BufferMap bufferMap_;\n> \n> const uint64_t cookie_;\n> diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\n> index b206ac132..e7eb1c0c8 100644\n> --- a/src/libcamera/request.cpp\n> +++ b/src/libcamera/request.cpp\n> @@ -354,16 +354,10 @@ void Request::Private::timeout()\n> */\n> Request::Request(Camera *camera, uint64_t cookie)\n> : Extensible(std::make_unique(camera)),\n> + controls_(controls::controls, camera->_d()->validator()),\n> + metadata_(controls::controls), /* \\todo Add a validator for metadata controls. */\n> cookie_(cookie), status_(RequestPending)\n> {\n> - controls_ = new ControlList(controls::controls,\n> - camera->_d()->validator());\n> -\n> - /**\n> - * \\todo Add a validator for metadata controls.\n> - */\n> - metadata_ = new ControlList(controls::controls);\n> -\n> LIBCAMERA_TRACEPOINT(request_construct, this);\n> \n> LOG(Request, Debug) << \"Created request - cookie: \" << cookie_;\n> @@ -372,9 +366,6 @@ Request::Request(Camera *camera, uint64_t cookie)\n> Request::~Request()\n> {\n> LIBCAMERA_TRACEPOINT(request_destroy, this);\n> -\n> - delete metadata_;\n> - delete controls_;\n> }\n> \n> /**\n> @@ -405,8 +396,8 @@ void Request::reuse(ReuseFlag flags)\n> \n> status_ = RequestPending;\n> \n> - controls_->clear();\n> - metadata_->clear();\n> + controls_.clear();\n> + metadata_.clear();\n> }\n> \n> /**\n> -- \n> 2.49.0\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 1BCBFC3213\n\tfor ;\n\tMon, 31 Mar 2025 18:01:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C919F68989;\n\tMon, 31 Mar 2025 20:01:42 +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 A851368967\n\tfor ;\n\tMon, 31 Mar 2025 20:01:41 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1B510703;\n\tMon, 31 Mar 2025 19:59:50 +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=\"fnptPFxo\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1743443990;\n\tbh=N2NFP25E8w6YUNEIMROdDqpeGQ84/OY9OiJRp1aYtJg=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=fnptPFxoHET5aONMdfqW5a0bKGXX0CVIyufxav3Ff4axUrk3vbvTnXPBx/aIKQ1/N\n\t2zPe2xBszxKSOp/XhJlVM606lqvBzgOrAS3xpJqebFPwDSU/KHx/wCUI0QvWxnjYsJ\n\tzc9bEG3id8kmZ5Dn/nR8yFa7X+UhBEfFSi7oIx+k=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20250331141714.512538-1-barnabas.pocze@ideasonboard.com>","References":"<20250331141714.512538-1-barnabas.pocze@ideasonboard.com>","Subject":"Re: [PATCH v2 1/3] libcamera: request: Make `controls_`/`metadata_`\n\tmembers","From":"Kieran Bingham ","To":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Mon, 31 Mar 2025 19:01:38 +0100","Message-ID":"<174344409893.3394313.15389367723012409822@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","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":33872,"web_url":"https://patchwork.libcamera.org/comment/33872/","msgid":"<20250401223648.GL3494@pendragon.ideasonboard.com>","date":"2025-04-01T22:36:48","subject":"Re: [PATCH v2 1/3] libcamera: request: Make `controls_`/`metadata_`\n\tmembers","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Mon, Mar 31, 2025 at 07:01:38PM +0100, Kieran Bingham wrote:\n> Quoting Barnabás Pőcze (2025-03-31 15:17:12)\n> > The lifetimes of these two `ControlList`s are tied entirely to the request\n> > object, so simplify the code by making them member variables instead of\n> > manually managing their dynamic lifetime.\n> \n> Fixing the lifetimes makes sense.\n> \n> Later patches move this anyway, but I think that's ok here.\n> \n> Reviewed-by: Kieran Bingham \n\nReviewed-by: Laurent Pinchart \n\n> > Signed-off-by: Barnabás Pőcze \n> > ---\n> > include/libcamera/request.h | 8 ++++----\n> > src/libcamera/request.cpp | 17 ++++-------------\n> > 2 files changed, 8 insertions(+), 17 deletions(-)\n> > \n> > diff --git a/include/libcamera/request.h b/include/libcamera/request.h\n> > index e214a9d13..3061e2fb0 100644\n> > --- a/include/libcamera/request.h\n> > +++ b/include/libcamera/request.h\n> > @@ -49,8 +49,8 @@ public:\n> > \n> > void reuse(ReuseFlag flags = Default);\n> > \n> > - ControlList &controls() { return *controls_; }\n> > - ControlList &metadata() { return *metadata_; }\n> > + ControlList &controls() { return controls_; }\n> > + ControlList &metadata() { return metadata_; }\n> > const BufferMap &buffers() const { return bufferMap_; }\n> > int addBuffer(const Stream *stream, FrameBuffer *buffer,\n> > std::unique_ptr fence = nullptr);\n> > @@ -67,8 +67,8 @@ public:\n> > private:\n> > LIBCAMERA_DISABLE_COPY(Request)\n> > \n> > - ControlList *controls_;\n> > - ControlList *metadata_;\n> > + ControlList controls_;\n> > + ControlList metadata_;\n> > BufferMap bufferMap_;\n> > \n> > const uint64_t cookie_;\n> > diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\n> > index b206ac132..e7eb1c0c8 100644\n> > --- a/src/libcamera/request.cpp\n> > +++ b/src/libcamera/request.cpp\n> > @@ -354,16 +354,10 @@ void Request::Private::timeout()\n> > */\n> > Request::Request(Camera *camera, uint64_t cookie)\n> > : Extensible(std::make_unique(camera)),\n> > + controls_(controls::controls, camera->_d()->validator()),\n> > + metadata_(controls::controls), /* \\todo Add a validator for metadata controls. */\n> > cookie_(cookie), status_(RequestPending)\n> > {\n> > - controls_ = new ControlList(controls::controls,\n> > - camera->_d()->validator());\n> > -\n> > - /**\n> > - * \\todo Add a validator for metadata controls.\n> > - */\n> > - metadata_ = new ControlList(controls::controls);\n> > -\n> > LIBCAMERA_TRACEPOINT(request_construct, this);\n> > \n> > LOG(Request, Debug) << \"Created request - cookie: \" << cookie_;\n> > @@ -372,9 +366,6 @@ Request::Request(Camera *camera, uint64_t cookie)\n> > Request::~Request()\n> > {\n> > LIBCAMERA_TRACEPOINT(request_destroy, this);\n> > -\n> > - delete metadata_;\n> > - delete controls_;\n> > }\n> > \n> > /**\n> > @@ -405,8 +396,8 @@ void Request::reuse(ReuseFlag flags)\n> > \n> > status_ = RequestPending;\n> > \n> > - controls_->clear();\n> > - metadata_->clear();\n> > + controls_.clear();\n> > + metadata_.clear();\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 F0F8BC323E\n\tfor ;\n\tTue, 1 Apr 2025 22:37:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AC56D68981;\n\tWed, 2 Apr 2025 00:37:16 +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 130ED6894F\n\tfor ;\n\tWed, 2 Apr 2025 00:37:14 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0E2B5D21;\n\tWed, 2 Apr 2025 00:35:20 +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=\"SP6Cu1vB\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1743546921;\n\tbh=qG1QW75PXtxVT50TO7Q5g5NeyGWWjDeLlVP5dubRyJc=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=SP6Cu1vB8yrVlAFe+7IhH+tRMOqq5qJpgipMOBcqRcIUYjGPHqckVfPWOtG1QhthS\n\t2frS9u1j3I9XD5ExP2IyNzmdA6Lxzh8kecqRwtildOn+h0rKnqps8THj4XKF+q75wF\n\tQgjJTX4chUHvF2gI+d/9VP1iTxAtDD5oXwRomxfo=","Date":"Wed, 2 Apr 2025 01:36:48 +0300","From":"Laurent Pinchart ","To":"Kieran Bingham ","Cc":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ,\n\tlibcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH v2 1/3] libcamera: request: Make `controls_`/`metadata_`\n\tmembers","Message-ID":"<20250401223648.GL3494@pendragon.ideasonboard.com>","References":"<20250331141714.512538-1-barnabas.pocze@ideasonboard.com>\n\t<174344409893.3394313.15389367723012409822@ping.linuxembedded.co.uk>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<174344409893.3394313.15389367723012409822@ping.linuxembedded.co.uk>","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\" "}}]