From patchwork Mon Aug 4 23:31:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 24058 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 183A3BE086 for ; Mon, 4 Aug 2025 23:32:11 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 197E56921F; Tue, 5 Aug 2025 01:32:09 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="nPMV0v0x"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 46E1061466 for ; Tue, 5 Aug 2025 01:32:07 +0200 (CEST) Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id D804332FD for ; Tue, 5 Aug 2025 01:31:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1754350280; bh=PC79loi6tuM6S81Xde7CNaAGYlaYDb0e/KopDPB9vJ0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=nPMV0v0xgIKPzC93KMWg6ibparOcCyulJi3Qr4lU9mhmKKf8kY/WURhedmQtYsf4W 5NvJH09CaCMUOehenFStrS3cRbykadCnU/XYc4jIW22CKdcsOVnZBWi1Uqz39mKmA4 Y9BzXeQhnC3r3mtBmeMYraNm6D3kcwAYImjB/+a0= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [PATCH v4 1/2] libcamera: utils: Add scope_exit class Date: Tue, 5 Aug 2025 02:31:50 +0300 Message-ID: <20250804233152.11538-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.49.1 In-Reply-To: <20250804233152.11538-1-laurent.pinchart@ideasonboard.com> References: <20250804233152.11538-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The scope_exit class is an implementation of the identically named C++ library fundamentals TS v3 class, as documented in [1]. It is a simpler version of the libcamera-specific ScopeExitActions class and doesn't require dynamic heap memory allocation, making it more suitable for hot paths. The class is not documented as it implements a C++ standard (even if experimental) API. [1] https://en.cppreference.com/w/cpp/experimental/scope_exit/scope_exit.html Signed-off-by: Laurent Pinchart Reviewed-by: Barnabás Pőcze Reviewed-by: Stefan Klug --- Changes since v3: - Use LIBCAMERA_DISABLE_COPY_AND_MOVE() Changes since v2: - Drop lvalue reference constraint in constructor - Delete move constructor --- include/libcamera/base/utils.h | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/include/libcamera/base/utils.h b/include/libcamera/base/utils.h index 8d5c35782ee3..f21c6dc016ec 100644 --- a/include/libcamera/base/utils.h +++ b/include/libcamera/base/utils.h @@ -21,6 +21,7 @@ #include #include +#include #include #ifndef __DOXYGEN__ @@ -428,6 +429,43 @@ private: std::vector> actions_; }; +#ifndef __DOXYGEN__ +template +class scope_exit +{ +public: + template>, scope_exit> && + std::is_constructible_v> * = nullptr> + explicit scope_exit(Fn &&fn) + : exitFunction_(std::forward(fn)) + { + static_assert(std::is_nothrow_constructible_v); + } + + ~scope_exit() + { + if (active_) + exitFunction_(); + } + + void release() + { + active_ = false; + } + +private: + LIBCAMERA_DISABLE_COPY_AND_MOVE(scope_exit) + + EF exitFunction_; + bool active_ = true; +}; + +template +scope_exit(EF) -> scope_exit; + +#endif /* __DOXYGEN__ */ + } /* namespace utils */ #ifndef __DOXYGEN__ From patchwork Mon Aug 4 23:31:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 24059 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 3C440BE086 for ; Mon, 4 Aug 2025 23:32:12 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 973CA69225; Tue, 5 Aug 2025 01:32:10 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="a27jDZL5"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CC9AA69222 for ; Tue, 5 Aug 2025 01:32:08 +0200 (CEST) Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 5101832FD for ; Tue, 5 Aug 2025 01:31:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1754350281; bh=HQQpoa160C8j3jA6/OnpsPJXD9zOnZ0N0TshqI/S0o4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=a27jDZL5Shtwr8s5e7KQUd1C85/WdM++IGv+n5Po7//8pM/BzIK3Y1ntcECeTB55Z RI3PeK+rywa44myN26NEnYV7h9wlfGrA3udk9CUkp5mM6C6THmg9BqrvM2coBgOWFP BAeTPQan14QQtPxZbFmKTfqlJHU7G81FUbPKKYuU= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [PATCH v4 2/2] libcamera: v4l2_videodevice: Use scope_exit Date: Tue, 5 Aug 2025 02:31:51 +0300 Message-ID: <20250804233152.11538-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.49.1 In-Reply-To: <20250804233152.11538-1-laurent.pinchart@ideasonboard.com> References: <20250804233152.11538-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The V4L2VideoDevice::queueBuffer() function performs the same cleanup action in many error paths. Use scope_exit to simplify it. Signed-off-by: Laurent Pinchart Reviewed-by: Stefan Klug Reviewed-by: Kieran Bingham --- src/libcamera/v4l2_videodevice.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index 71cc7e895d8c..d206244fa9a6 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -1668,6 +1668,8 @@ int V4L2VideoDevice::queueBuffer(FrameBuffer *buffer) if (ret < 0) return ret; + auto guard = utils::scope_exit{ [&]() { cache_->put(buf.index); } }; + buf.index = ret; buf.type = bufferType_; buf.memory = memoryType_; @@ -1683,15 +1685,11 @@ int V4L2VideoDevice::queueBuffer(FrameBuffer *buffer) */ if (planes.size() < numV4l2Planes) { LOG(V4L2, Error) << "Frame buffer has too few planes"; - cache_->put(buf.index); - return -EINVAL; } if (planes.size() != numV4l2Planes && !buffer->_d()->isContiguous()) { LOG(V4L2, Error) << "Device format requires contiguous buffer"; - cache_->put(buf.index); - return -EINVAL; } @@ -1734,8 +1732,6 @@ int V4L2VideoDevice::queueBuffer(FrameBuffer *buffer) if (i != planes.size() - 1 && bytesused != length) { LOG(V4L2, Error) << "Holes in multi-planar buffer not supported"; - cache_->put(buf.index); - return -EINVAL; } } @@ -1785,8 +1781,6 @@ int V4L2VideoDevice::queueBuffer(FrameBuffer *buffer) LOG(V4L2, Error) << "Failed to queue buffer " << buf.index << ": " << strerror(-ret); - cache_->put(buf.index); - return ret; } @@ -1798,6 +1792,7 @@ int V4L2VideoDevice::queueBuffer(FrameBuffer *buffer) queuedBuffers_[buf.index] = buffer; + guard.release(); return 0; }