[{"id":33805,"web_url":"https://patchwork.libcamera.org/comment/33805/","msgid":"<174344400891.3394313.11842019573019619799@ping.linuxembedded.co.uk>","date":"2025-03-31T18:00:08","subject":"Re: [PATCH v2 2/3] libcamera: request: Avoid double map lookup","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:13)\n> Use `try_emplace()` that more or less combines `find()` and `operator[]`\n> in one function.\n> \n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Barnabás Pőcze \n> ---\n> src/libcamera/request.cpp | 5 ++---\n> 1 file changed, 2 insertions(+), 3 deletions(-)\n> \n> diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\n> index e7eb1c0c8..fc364441a 100644\n> --- a/src/libcamera/request.cpp\n> +++ b/src/libcamera/request.cpp\n> @@ -475,15 +475,14 @@ int Request::addBuffer(const Stream *stream, FrameBuffer *buffer,\n> return -EEXIST;\n> }\n> \n> - auto it = bufferMap_.find(stream);\n> - if (it != bufferMap_.end()) {\n> + auto [it, inserted] = bufferMap_.try_emplace(stream, buffer);\n> + if (!inserted) {\n> LOG(Request, Error) << \"FrameBuffer already set for stream\";\n> return -EEXIST;\n> }\n> \n> buffer->_d()->setRequest(this);\n> _d()->pending_.insert(buffer);\n> - bufferMap_[stream] = buffer;\n> \n> if (fence && fence->isValid())\n> buffer->_d()->setFence(std::move(fence));\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 7C95CC3213\n\tfor ;\n\tMon, 31 Mar 2025 18:00:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3A1D368986;\n\tMon, 31 Mar 2025 20:00:12 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9115E68967\n\tfor ;\n\tMon, 31 Mar 2025 20:00:11 +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 0B420703;\n\tMon, 31 Mar 2025 19:58: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=\"wEttB13a\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1743443900;\n\tbh=gppMlj44aZuLZWt4RxUb78Ao0FvXDinP9FgxVJ0URHo=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=wEttB13aSnz3t2m8LzP9UNXHKpnQ496oyX6DPWS8BuSt3XHXKeVzRzu3BMuKghSV9\n\tcLGFXz3ASEC1uWkJf5vHk5ZZNQj4GtE/MIK8a0zPfmnzKOY+i7x4M6kjwJI9osupjQ\n\tOMBWqoiMzG+Nmih//5MtWw8FSizFLEi13IzLCa5Y=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20250331141714.512538-2-barnabas.pocze@ideasonboard.com>","References":"<20250331141714.512538-1-barnabas.pocze@ideasonboard.com>\n\t<20250331141714.512538-2-barnabas.pocze@ideasonboard.com>","Subject":"Re: [PATCH v2 2/3] libcamera: request: Avoid double map lookup","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:00:08 +0100","Message-ID":"<174344400891.3394313.11842019573019619799@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":33873,"web_url":"https://patchwork.libcamera.org/comment/33873/","msgid":"<20250401223719.GM3494@pendragon.ideasonboard.com>","date":"2025-04-01T22:37:19","subject":"Re: [PATCH v2 2/3] libcamera: request: Avoid double map lookup","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Barnabás,\n\nThank you for the patch.\n\nOn Mon, Mar 31, 2025 at 07:00:08PM +0100, Kieran Bingham wrote:\n> Quoting Barnabás Pőcze (2025-03-31 15:17:13)\n> > Use `try_emplace()` that more or less combines `find()` and `operator[]`\n> > in one function.\n> \n> Reviewed-by: Kieran Bingham \n> \n> > Signed-off-by: Barnabás Pőcze \n\nReviewed-by: Laurent Pinchart \n\n> > ---\n> > src/libcamera/request.cpp | 5 ++---\n> > 1 file changed, 2 insertions(+), 3 deletions(-)\n> > \n> > diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\n> > index e7eb1c0c8..fc364441a 100644\n> > --- a/src/libcamera/request.cpp\n> > +++ b/src/libcamera/request.cpp\n> > @@ -475,15 +475,14 @@ int Request::addBuffer(const Stream *stream, FrameBuffer *buffer,\n> > return -EEXIST;\n> > }\n> > \n> > - auto it = bufferMap_.find(stream);\n> > - if (it != bufferMap_.end()) {\n> > + auto [it, inserted] = bufferMap_.try_emplace(stream, buffer);\n> > + if (!inserted) {\n> > LOG(Request, Error) << \"FrameBuffer already set for stream\";\n> > return -EEXIST;\n> > }\n> > \n> > buffer->_d()->setRequest(this);\n> > _d()->pending_.insert(buffer);\n> > - bufferMap_[stream] = buffer;\n> > \n> > if (fence && fence->isValid())\n> > buffer->_d()->setFence(std::move(fence));","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 D093BC323E\n\tfor ;\n\tTue, 1 Apr 2025 22:37:48 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9B70C68985;\n\tWed, 2 Apr 2025 00:37:48 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 71C3968981\n\tfor ;\n\tWed, 2 Apr 2025 00:37:46 +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 8ADE3D21;\n\tWed, 2 Apr 2025 00:35:53 +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=\"njiUKnwn\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1743546954;\n\tbh=hoXkyGxMllJt4LM85FcGz5jlZqOU6i1fVig0EiQLHR4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=njiUKnwnzEkj+arMeTamRdf+u7lPWO1qA1vDB75o2QCduK7b5yJgPnod7JxyYqeYW\n\t6l81/m3OJ+7EzBRMj7tlsOp/GoZjdyJCri+g7xZdB42X9h/NxvjuuSNP5GC6doum7h\n\taJysXPSSSCqFe1B/fXdenUi66KqJ5YOmmEMFEv5c=","Date":"Wed, 2 Apr 2025 01:37:19 +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 2/3] libcamera: request: Avoid double map lookup","Message-ID":"<20250401223719.GM3494@pendragon.ideasonboard.com>","References":"<20250331141714.512538-1-barnabas.pocze@ideasonboard.com>\n\t<20250331141714.512538-2-barnabas.pocze@ideasonboard.com>\n\t<174344400891.3394313.11842019573019619799@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":"<174344400891.3394313.11842019573019619799@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\" "}}]