[{"id":28915,"web_url":"https://patchwork.libcamera.org/comment/28915/","msgid":"<171016675863.252503.6030371802053813213@ping.linuxembedded.co.uk>","date":"2024-03-11T14:19:18","subject":"Re: [PATCH v2 3/3] libcamera: framebuffer_allocator: Remove entry if\n\tallocation fails","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 (2024-03-10 14:30:43)\n> Remove the entry from the `buffers_` mapping if\n> `Camera::exportFrameBuffers()` fails, otherwise\n> there would be a stale entry in the map.\n> \n> Signed-off-by: Barnabás Pőcze \n> ---\n> src/libcamera/framebuffer_allocator.cpp | 4 ++++\n> 1 file changed, 4 insertions(+)\n> \n> diff --git a/src/libcamera/framebuffer_allocator.cpp b/src/libcamera/framebuffer_allocator.cpp\n> index fc19a33a..dbd0db19 100644\n> --- a/src/libcamera/framebuffer_allocator.cpp\n> +++ b/src/libcamera/framebuffer_allocator.cpp\n> @@ -97,6 +97,10 @@ int FrameBufferAllocator::allocate(Stream *stream)\n> LOG(Allocator, Error)\n> << \"Stream is not part of \" << camera_->id()\n> << \" active configuration\";\n> +\n> + if (ret < 0)\n> + buffers_.erase(it);\n> +\n\nReviewed-by: Kieran Bingham \n\n> return ret;\n> }\n> \n> -- \n> 2.44.0\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 C1B0CBD1F1\n\tfor ;\n\tMon, 11 Mar 2024 14:19:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4449362C8C;\n\tMon, 11 Mar 2024 15:19:23 +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 8092261C7C\n\tfor ;\n\tMon, 11 Mar 2024 15:19:21 +0100 (CET)","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 4B532F0A;\n\tMon, 11 Mar 2024 15:19:00 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Oy31898c\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1710166740;\n\tbh=HpnwvnG5nfOwd/vrBczWqzyn6+x0ZTgH2F7ZsmTE/xo=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=Oy31898cUprn4LphMrteZH3U1fpt88YfT2ka42tQ2t1oiAWnXKJuW9oZ1zl9thMo1\n\tqg0H1T2vYPdXSMQ/+qH5JBaMdehyEg/FYd87Xe8KHYs/J705b2FQ/KuXdL5SVhG1ON\n\tCzu+5cRrn39IhFrE0cahrc6Z2z1qlh5J+e5QGvxI=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20240310143023.752559-4-pobrn@protonmail.com>","References":"<20240310143023.752559-1-pobrn@protonmail.com>\n\t<20240310143023.752559-4-pobrn@protonmail.com>","Subject":"Re: [PATCH v2 3/3] libcamera: framebuffer_allocator: Remove entry if\n\tallocation fails","From":"Kieran Bingham ","To":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Mon, 11 Mar 2024 14:19:18 +0000","Message-ID":"<171016675863.252503.6030371802053813213@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":28922,"web_url":"https://patchwork.libcamera.org/comment/28922/","msgid":"","date":"2024-03-11T17:03:06","subject":"Re: [PATCH v2 3/3] libcamera: framebuffer_allocator: Remove entry if\n\tallocation fails","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/people/143/","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"content":"Hi Barnabás\n\nOn Sun, Mar 10, 2024 at 02:30:43PM +0000, Barnabás Pőcze wrote:\n> Remove the entry from the `buffers_` mapping if\n> `Camera::exportFrameBuffers()` fails, otherwise\n> there would be a stale entry in the map.\n>\n> Signed-off-by: Barnabás Pőcze \n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> ---\n> src/libcamera/framebuffer_allocator.cpp | 4 ++++\n> 1 file changed, 4 insertions(+)\n>\n> diff --git a/src/libcamera/framebuffer_allocator.cpp b/src/libcamera/framebuffer_allocator.cpp\n> index fc19a33a..dbd0db19 100644\n> --- a/src/libcamera/framebuffer_allocator.cpp\n> +++ b/src/libcamera/framebuffer_allocator.cpp\n> @@ -97,6 +97,10 @@ int FrameBufferAllocator::allocate(Stream *stream)\n> \t\tLOG(Allocator, Error)\n> \t\t\t<< \"Stream is not part of \" << camera_->id()\n> \t\t\t<< \" active configuration\";\n> +\n> +\tif (ret < 0)\n> +\t\tbuffers_.erase(it);\n> +\n> \treturn ret;\n> }\n>\n> --\n> 2.44.0\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 18C7DBD1F1\n\tfor ;\n\tMon, 11 Mar 2024 17:03:11 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C4AFD62C85;\n\tMon, 11 Mar 2024 18:03:10 +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 EF6D762868\n\tfor ;\n\tMon, 11 Mar 2024 18:03:08 +0100 (CET)","from ideasonboard.com (unknown\n\t[IPv6:2001:b07:5d2e:52c9:cc1e:e404:491f:e6ea])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B4A026BE;\n\tMon, 11 Mar 2024 18:02:47 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"HwEWaS65\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1710176567;\n\tbh=hNTKJ7hf2cJumhvyp9OQcXf80wiGcyA14PQqYb3JYu4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=HwEWaS65SSdBycyQK1H8JrOO+zk61nzKPYTdWNaRcC/s/Bi90+qCahLC7LjTqxcjx\n\tKR+TXHcr/cdGL5G5+MCR8knM1sKmq0XIJ/J3w7CHJ32ZUNJsjqHyYox8ZwoR6MNKOt\n\tdT0/hQZ6Mexq9lq3eZfo4KQOd1BeMmYOE/jsJxI8=","Date":"Mon, 11 Mar 2024 18:03:06 +0100","From":"Jacopo Mondi ","To":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","Subject":"Re: [PATCH v2 3/3] libcamera: framebuffer_allocator: Remove entry if\n\tallocation fails","Message-ID":"","References":"<20240310143023.752559-1-pobrn@protonmail.com>\n\t<20240310143023.752559-4-pobrn@protonmail.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20240310143023.752559-4-pobrn@protonmail.com>","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\" "}}]