{"id":12236,"url":"https://patchwork.libcamera.org/api/1.1/patches/12236/?format=json","web_url":"https://patchwork.libcamera.org/patch/12236/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210510095814.3732400-4-naush@raspberrypi.com>","date":"2021-05-10T09:58:12","name":"[libcamera-devel,v6,3/6] ipa: raspberrypi: Switch to std::scoped_lock in the Metadata class","commit_ref":"7de2bbed9b0965e894dbbecd3b0d96c375b3ef90","pull_url":null,"state":"accepted","archived":false,"hash":"523e5b1a45375ed5a066c6f09a33f98a50e66e68","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/1.1/people/34/?format=json","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12236/mbox/","series":[{"id":2015,"url":"https://patchwork.libcamera.org/api/1.1/series/2015/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2015","date":"2021-05-10T09:58:09","name":"ipa: raspberrypi: Rate-limit the controller algorithms","version":6,"mbox":"https://patchwork.libcamera.org/series/2015/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12236/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12236/checks/","tags":{},"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 AAE47BF835\n\tfor ;\n\tMon, 10 May 2021 09:59:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 50C1468928;\n\tMon, 10 May 2021 11:59:12 +0200 (CEST)","from mail-wr1-x435.google.com (mail-wr1-x435.google.com\n\t[IPv6:2a00:1450:4864:20::435])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 45B9F68911\n\tfor ;\n\tMon, 10 May 2021 11:59:08 +0200 (CEST)","by mail-wr1-x435.google.com with SMTP id t18so15948121wry.1\n\tfor ;\n\tMon, 10 May 2021 02:59:08 -0700 (PDT)","from naush-laptop.pitowers.org\n\t([2a00:1098:3142:14:e710:3ec:6dad:dc2])\n\tby smtp.gmail.com with ESMTPSA id\n\ty17sm24767917wrw.90.2021.05.10.02.59.07\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 10 May 2021 02:59:07 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"SOoguaPp\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=JYjTBu6eoLSl1bTSIjACjku/fhdeNHUKB7hMNg3Gq8A=;\n\tb=SOoguaPpdeHGHgAFaSltmqHLRMuoKGv39YPbmhbv1bpjdWmxIbzMD/4g7BQReNX/Ch\n\tLQvZQ07zfMP2RYuLePrSpCult2n1ERRio8d6CWB8Vkoa4MBfX4BPMHbg8C0JpKnj8/zX\n\tdyeYb/j433+gZ6IhdiCkOETeQmB2cjol9Eri4Q+hMz+40bV8lneMRDSM0yaRS1BwjG9W\n\txdz2lP6BcQ+B0G4Dw8S2HZC1dytRCYx+zzoc2K0aX6IR03raBq4zYlu/YMwYbMdV0mIM\n\t3Vpo8r5CtLHSDnnqI0RHESClGIFtIAAwLJ74JmGvAjn3qj7LDVanH37mWu+m3TDS1Fll\n\t2vTQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=JYjTBu6eoLSl1bTSIjACjku/fhdeNHUKB7hMNg3Gq8A=;\n\tb=W1KiXISlWVSWiXM/5gQwpZCxli8a79c0W6uW41w7H6atnnq1/1TXZ/BaAfgRntaHbD\n\tjP4giXbvGRaXEZas6HGv88DCjy4VAg1Ex8T4CrWGa+IU6jBLu2ih9phbW1VqVKNx+BlP\n\ta9VrQZ4UF87f3Hq2atCa1yJPeFvMH1vZshsakuQkdhoBQEo6twgJJbyxP+k9zvhqTO+O\n\txwKkcofm/WA0jLU+9oncd7i+QCNJrLNwlTk2NNZnE+iRRDJO7FqVBB61sk68H2GgYNP7\n\tPW+lcXisEWZiC52lg6YD4hOQpgYKD940L8Zfm7ypkE1CpmRLt9PhvVCly+kJFmpXF9Qa\n\t4VkQ==","X-Gm-Message-State":"AOAM5323nBep6qYxY7FPJhiLpIg9wORQbXLhS5DkOucmqoqUoNJ8GdYM\n\txJIat7+IIX/6zKNIy3hnJbvY6+whGYbTsw==","X-Google-Smtp-Source":"ABdhPJyoE2sO1LqG50SLncLmtLjPC2u0Qt+iwuOU1jw4QcrVFgpYIR6PrdqwCDNydnENZhfhaMJIUQ==","X-Received":"by 2002:adf:ffc4:: with SMTP id\n\tx4mr28644272wrs.415.1620640747685; \n\tMon, 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\n\tstd::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":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Replace std::lock_guard with std::scoped_lock. When locking a single\nmutex, both are functionally the same. When locking two mutexes in the\noperator= overload, the scoped_lock uses a deadlock avoidance algorithm\nto avoid deadlock.\n\nSigned-off-by: Naushir Patuck \n---\n src/ipa/raspberrypi/controller/metadata.hpp | 9 ++++-----\n 1 file changed, 4 insertions(+), 5 deletions(-)","diff":"diff --git a/src/ipa/raspberrypi/controller/metadata.hpp b/src/ipa/raspberrypi/controller/metadata.hpp\nindex 07dd28ed9e0a..e735cfbe0480 100644\n--- a/src/ipa/raspberrypi/controller/metadata.hpp\n+++ b/src/ipa/raspberrypi/controller/metadata.hpp\n@@ -22,14 +22,14 @@ public:\n \ttemplate\n \tvoid Set(std::string const &tag, T const &value)\n \t{\n-\t\tstd::lock_guard lock(mutex_);\n+\t\tstd::scoped_lock lock(mutex_);\n \t\tdata_[tag] = value;\n \t}\n \n \ttemplate\n \tint Get(std::string const &tag, T &value) const\n \t{\n-\t\tstd::lock_guard lock(mutex_);\n+\t\tstd::scoped_lock lock(mutex_);\n \t\tauto it = data_.find(tag);\n \t\tif (it == data_.end())\n \t\t\treturn -1;\n@@ -39,14 +39,13 @@ public:\n \n \tvoid Clear()\n \t{\n-\t\tstd::lock_guard lock(mutex_);\n+\t\tstd::scoped_lock lock(mutex_);\n \t\tdata_.clear();\n \t}\n \n \tMetadata &operator=(Metadata const &other)\n \t{\n-\t\tstd::lock_guard lock(mutex_);\n-\t\tstd::lock_guard other_lock(other.mutex_);\n+\t\tstd::scoped_lock lock(mutex_, other.mutex_);\n \t\tdata_ = other.data_;\n \t\treturn *this;\n \t}\n","prefixes":["libcamera-devel","v6","3/6"]}