From patchwork Mon May 10 09:58:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 12236 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 AAE47BF835 for ; Mon, 10 May 2021 09:59:12 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 50C1468928; Mon, 10 May 2021 11:59:12 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="SOoguaPp"; dkim-atps=neutral Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 45B9F68911 for ; Mon, 10 May 2021 11:59:08 +0200 (CEST) Received: by mail-wr1-x435.google.com with SMTP id t18so15948121wry.1 for ; Mon, 10 May 2021 02:59:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JYjTBu6eoLSl1bTSIjACjku/fhdeNHUKB7hMNg3Gq8A=; b=SOoguaPpdeHGHgAFaSltmqHLRMuoKGv39YPbmhbv1bpjdWmxIbzMD/4g7BQReNX/Ch LQvZQ07zfMP2RYuLePrSpCult2n1ERRio8d6CWB8Vkoa4MBfX4BPMHbg8C0JpKnj8/zX dyeYb/j433+gZ6IhdiCkOETeQmB2cjol9Eri4Q+hMz+40bV8lneMRDSM0yaRS1BwjG9W xdz2lP6BcQ+B0G4Dw8S2HZC1dytRCYx+zzoc2K0aX6IR03raBq4zYlu/YMwYbMdV0mIM 3Vpo8r5CtLHSDnnqI0RHESClGIFtIAAwLJ74JmGvAjn3qj7LDVanH37mWu+m3TDS1Fll 2vTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JYjTBu6eoLSl1bTSIjACjku/fhdeNHUKB7hMNg3Gq8A=; b=W1KiXISlWVSWiXM/5gQwpZCxli8a79c0W6uW41w7H6atnnq1/1TXZ/BaAfgRntaHbD jP4giXbvGRaXEZas6HGv88DCjy4VAg1Ex8T4CrWGa+IU6jBLu2ih9phbW1VqVKNx+BlP a9VrQZ4UF87f3Hq2atCa1yJPeFvMH1vZshsakuQkdhoBQEo6twgJJbyxP+k9zvhqTO+O xwKkcofm/WA0jLU+9oncd7i+QCNJrLNwlTk2NNZnE+iRRDJO7FqVBB61sk68H2GgYNP7 PW+lcXisEWZiC52lg6YD4hOQpgYKD940L8Zfm7ypkE1CpmRLt9PhvVCly+kJFmpXF9Qa 4VkQ== X-Gm-Message-State: AOAM5323nBep6qYxY7FPJhiLpIg9wORQbXLhS5DkOucmqoqUoNJ8GdYM xJIat7+IIX/6zKNIy3hnJbvY6+whGYbTsw== X-Google-Smtp-Source: ABdhPJyoE2sO1LqG50SLncLmtLjPC2u0Qt+iwuOU1jw4QcrVFgpYIR6PrdqwCDNydnENZhfhaMJIUQ== X-Received: by 2002:adf:ffc4:: with SMTP id x4mr28644272wrs.415.1620640747685; Mon, 10 May 2021 02:59:07 -0700 (PDT) Received: from naush-laptop.pitowers.org ([2a00:1098:3142:14:e710:3ec:6dad:dc2]) by smtp.gmail.com with ESMTPSA id y17sm24767917wrw.90.2021.05.10.02.59.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 02:59:07 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Mon, 10 May 2021 10:58:12 +0100 Message-Id: <20210510095814.3732400-4-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510095814.3732400-1-naush@raspberrypi.com> References: <20210510095814.3732400-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v6 3/6] ipa: raspberrypi: Switch to std::scoped_lock in the Metadata class 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" Replace std::lock_guard with std::scoped_lock. When locking a single mutex, both are functionally the same. When locking two mutexes in the operator= overload, the scoped_lock uses a deadlock avoidance algorithm to avoid deadlock. Signed-off-by: Naushir Patuck Reviewed-by: David Plowman Reviewed-by: Laurent Pinchart --- src/ipa/raspberrypi/controller/metadata.hpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ipa/raspberrypi/controller/metadata.hpp b/src/ipa/raspberrypi/controller/metadata.hpp index 07dd28ed9e0a..e735cfbe0480 100644 --- a/src/ipa/raspberrypi/controller/metadata.hpp +++ b/src/ipa/raspberrypi/controller/metadata.hpp @@ -22,14 +22,14 @@ public: template void Set(std::string const &tag, T const &value) { - std::lock_guard lock(mutex_); + std::scoped_lock lock(mutex_); data_[tag] = value; } template int Get(std::string const &tag, T &value) const { - std::lock_guard lock(mutex_); + std::scoped_lock lock(mutex_); auto it = data_.find(tag); if (it == data_.end()) return -1; @@ -39,14 +39,13 @@ public: void Clear() { - std::lock_guard lock(mutex_); + std::scoped_lock lock(mutex_); data_.clear(); } Metadata &operator=(Metadata const &other) { - std::lock_guard lock(mutex_); - std::lock_guard other_lock(other.mutex_); + std::scoped_lock lock(mutex_, other.mutex_); data_ = other.data_; return *this; }