{"id":15023,"url":"https://patchwork.libcamera.org/api/patches/15023/?format=json","web_url":"https://patchwork.libcamera.org/patch/15023/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20211203195539.1574621-2-hiroh@chromium.org>","date":"2021-12-03T19:55:33","name":"[libcamera-devel,1/7] ipa: raspberrypi: Use libcamera Mutex class","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"229924bc8aa112c053d17c21436c81e1c9fbfbe2","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/people/63/?format=json","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15023/mbox/","series":[{"id":2814,"url":"https://patchwork.libcamera.org/api/series/2814/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2814","date":"2021-12-03T19:55:32","name":"Apply clang thread safety annotations to raspberrypi","version":1,"mbox":"https://patchwork.libcamera.org/series/2814/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15023/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15023/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 96295BDB13\n\tfor ;\n\tFri, 3 Dec 2021 19:55:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3A3D660866;\n\tFri, 3 Dec 2021 20:55:50 +0100 (CET)","from mail-pg1-x536.google.com (mail-pg1-x536.google.com\n\t[IPv6:2607:f8b0:4864:20::536])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1F1F8607DE\n\tfor ;\n\tFri, 3 Dec 2021 20:55:49 +0100 (CET)","by mail-pg1-x536.google.com with SMTP id f125so4176105pgc.0\n\tfor ;\n\tFri, 03 Dec 2021 11:55:49 -0800 (PST)","from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:cd78:3a5f:d792:6177])\n\tby smtp.gmail.com with ESMTPSA id\n\tt3sm4265891pfj.207.2021.12.03.11.55.45\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 03 Dec 2021 11:55:46 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"a5BcjTT0\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=7c0ztD8/1SOOARKz2G/PkduZhMSeGknto+y9CzbjGq4=;\n\tb=a5BcjTT0teZ26Cq4X622BcL5yOg9xIeXR0f6NWIgZLAW9NfhcvGqXeKNN2Gw9hsPCm\n\tIrKuG/AAX0lWS4EAjS92lfgPvUX1CAL0H9wfWc9/9CF1qBmrX9KB75cMqoR1pFj8jfQk\n\tbuG0zdIdng7wQR1Q+Ubnhd/8LyXv4WM/pWy3U=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\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=7c0ztD8/1SOOARKz2G/PkduZhMSeGknto+y9CzbjGq4=;\n\tb=iFbTEGUXzY84wOEY+jEWEKH/2b2n6nONF8U8yJ3nMeDgWK/94G6QYNm9GeWD8smU/F\n\t4A4etzy7Zk7qIJBHxJBEW5Y1wTowWxaXFDuotdNeoOiWCIIFwoqoP78QITuu/MkvymF2\n\td8tullwYC0ooIRa4BZuixKKccqws6y+1fUUkTyVWvYH0gbMmk3sx8XSbkpadSMJKfPk2\n\tUHjfzgvK1pkjSsJybLlw2da+YmmRv7m8ZfMIb+zMyoz8h+iHXVJgFfzx7HtxCpa0oa1e\n\tMl6d2lka3LJ6thAKjq/R1eLS3k1gEKCxiv/8snaG2KLLkAJrwYKARsu+0py5xKsSWZEL\n\t8K1g==","X-Gm-Message-State":"AOAM532frhVWlgJZyikPcw5J1AdBSXaKE1bUieYk3OuQAWZ+8HFVi5vL\n\tTC2PM7FkLlSbt6SIzi2lFzqZKvMaJ0diqQ==","X-Google-Smtp-Source":"ABdhPJzc+yrWxOrdJ8wu/7z4pXKpTXM4h+jDu1dByTLktjr2NJeisoOdCCaHHE7s0XaqEYmUcfRjLw==","X-Received":"by 2002:a63:60c:: with SMTP id 12mr5979341pgg.125.1638561347309; \n\tFri, 03 Dec 2021 11:55:47 -0800 (PST)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 4 Dec 2021 04:55:33 +0900","Message-Id":"<20211203195539.1574621-2-hiroh@chromium.org>","X-Mailer":"git-send-email 2.34.1.400.ga245620fadb-goog","In-Reply-To":"<20211203195539.1574621-1-hiroh@chromium.org>","References":"<20211203195539.1574621-1-hiroh@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 1/7] ipa: raspberrypi: Use libcamera Mutex\n\tclass","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\" "},"content":"This replaces std::mutex, std::unique_lock and\nstd::condition_variable in src/ipa/raspberrypi with libcamera\nMutex, MutexLocker and ConditionVariable, respectively.\n\nSigned-off-by: Hirokazu Honda \n---\n src/ipa/raspberrypi/controller/metadata.hpp | 28 +++++++++++--------\n src/ipa/raspberrypi/controller/rpi/alsc.cpp | 12 ++++----\n src/ipa/raspberrypi/controller/rpi/alsc.hpp | 10 +++----\n src/ipa/raspberrypi/controller/rpi/awb.cpp | 10 +++----\n src/ipa/raspberrypi/controller/rpi/awb.hpp | 10 +++----\n .../raspberrypi/controller/rpi/contrast.cpp | 4 +--\n .../raspberrypi/controller/rpi/contrast.hpp | 4 +--\n src/ipa/raspberrypi/controller/rpi/lux.cpp | 4 +--\n src/ipa/raspberrypi/controller/rpi/lux.hpp | 5 ++--\n 9 files changed, 45 insertions(+), 42 deletions(-)","diff":"diff --git a/src/ipa/raspberrypi/controller/metadata.hpp b/src/ipa/raspberrypi/controller/metadata.hpp\nindex 51e576cf..ff2e1ae3 100644\n--- a/src/ipa/raspberrypi/controller/metadata.hpp\n+++ b/src/ipa/raspberrypi/controller/metadata.hpp\n@@ -10,9 +10,10 @@\n \n #include \n #include \n-#include \n #include \n \n+#include \n+\n namespace RPiController {\n \n class Metadata\n@@ -22,13 +23,13 @@ public:\n \n \tMetadata(Metadata const &other)\n \t{\n-\t\tstd::scoped_lock other_lock(other.mutex_);\n+\t\tlibcamera::MutexLocker other_lock(other.mutex_);\n \t\tdata_ = other.data_;\n \t}\n \n \tMetadata(Metadata &&other)\n \t{\n-\t\tstd::scoped_lock other_lock(other.mutex_);\n+\t\tlibcamera::MutexLocker other_lock(other.mutex_);\n \t\tdata_ = std::move(other.data_);\n \t\tother.data_.clear();\n \t}\n@@ -36,14 +37,14 @@ public:\n \ttemplate\n \tvoid Set(std::string const &tag, T const &value)\n \t{\n-\t\tstd::scoped_lock lock(mutex_);\n+\t\tlibcamera::MutexLocker 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::scoped_lock lock(mutex_);\n+\t\tlibcamera::MutexLocker lock(mutex_);\n \t\tauto it = data_.find(tag);\n \t\tif (it == data_.end())\n \t\t\treturn -1;\n@@ -53,20 +54,22 @@ public:\n \n \tvoid Clear()\n \t{\n-\t\tstd::scoped_lock lock(mutex_);\n+\t\tlibcamera::MutexLocker lock(mutex_);\n \t\tdata_.clear();\n \t}\n \n \tMetadata &operator=(Metadata const &other)\n \t{\n-\t\tstd::scoped_lock lock(mutex_, other.mutex_);\n+\t\tlibcamera::MutexLocker lock(mutex_);\n+\t\tlibcamera::MutexLocker other_lock(other.mutex_);\n \t\tdata_ = other.data_;\n \t\treturn *this;\n \t}\n \n \tMetadata &operator=(Metadata &&other)\n \t{\n-\t\tstd::scoped_lock lock(mutex_, other.mutex_);\n+\t\tlibcamera::MutexLocker lock(mutex_);\n+\t\tlibcamera::MutexLocker other_lock(other.mutex_);\n \t\tdata_ = std::move(other.data_);\n \t\tother.data_.clear();\n \t\treturn *this;\n@@ -74,7 +77,8 @@ public:\n \n \tvoid Merge(Metadata &other)\n \t{\n-\t\tstd::scoped_lock lock(mutex_, other.mutex_);\n+\t\tlibcamera::MutexLocker lock(mutex_);\n+\t\tlibcamera::MutexLocker other_lock(other.mutex_);\n \t\tdata_.merge(other.data_);\n \t}\n \n@@ -99,11 +103,11 @@ public:\n \t// Note: use of (lowercase) lock and unlock means you can create scoped\n \t// locks with the standard lock classes.\n \t// e.g. std::lock_guard lock(metadata)\n-\tvoid lock() { mutex_.lock(); }\n-\tvoid unlock() { mutex_.unlock(); }\n+\tvoid lock() LIBCAMERA_TSA_ACQUIRE(mutex_) { mutex_.lock(); }\n+\tvoid unlock() LIBCAMERA_TSA_RELEASE(mutex_) { mutex_.unlock(); }\n \n private:\n-\tmutable std::mutex mutex_;\n+\tmutable libcamera::Mutex mutex_;\n \tstd::map data_;\n };\n \ndiff --git a/src/ipa/raspberrypi/controller/rpi/alsc.cpp b/src/ipa/raspberrypi/controller/rpi/alsc.cpp\nindex be3d1ae4..97a05a30 100644\n--- a/src/ipa/raspberrypi/controller/rpi/alsc.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/alsc.cpp\n@@ -35,7 +35,7 @@ Alsc::Alsc(Controller *controller)\n Alsc::~Alsc()\n {\n \t{\n-\t\tstd::lock_guard lock(mutex_);\n+\t\tMutexLocker lock(mutex_);\n \t\tasync_abort_ = true;\n \t}\n \tasync_signal_.notify_one();\n@@ -179,7 +179,7 @@ void Alsc::waitForAysncThread()\n {\n \tif (async_started_) {\n \t\tasync_started_ = false;\n-\t\tstd::unique_lock lock(mutex_);\n+\t\tMutexLocker lock(mutex_);\n \t\tsync_signal_.wait(lock, [&] {\n \t\t\treturn async_finished_;\n \t\t});\n@@ -314,7 +314,7 @@ void Alsc::restartAsync(StatisticsPtr &stats, Metadata *image_metadata)\n \tframe_phase_ = 0;\n \tasync_started_ = true;\n \t{\n-\t\tstd::lock_guard lock(mutex_);\n+\t\tMutexLocker lock(mutex_);\n \t\tasync_start_ = true;\n \t}\n \tasync_signal_.notify_one();\n@@ -332,7 +332,7 @@ void Alsc::Prepare(Metadata *image_metadata)\n \tLOG(RPiAlsc, Debug)\n \t\t<< \"frame_count \" << frame_count_ << \" speed \" << speed;\n \t{\n-\t\tstd::unique_lock lock(mutex_);\n+\t\tMutexLocker lock(mutex_);\n \t\tif (async_started_ && async_finished_)\n \t\t\tfetchAsyncResults();\n \t}\n@@ -370,7 +370,7 @@ void Alsc::asyncFunc()\n {\n \twhile (true) {\n \t\t{\n-\t\t\tstd::unique_lock lock(mutex_);\n+\t\t\tMutexLocker lock(mutex_);\n \t\t\tasync_signal_.wait(lock, [&] {\n \t\t\t\treturn async_start_ || async_abort_;\n \t\t\t});\n@@ -380,7 +380,7 @@ void Alsc::asyncFunc()\n \t\t}\n \t\tdoAlsc();\n \t\t{\n-\t\t\tstd::lock_guard lock(mutex_);\n+\t\t\tMutexLocker lock(mutex_);\n \t\t\tasync_finished_ = true;\n \t\t}\n \t\tsync_signal_.notify_one();\ndiff --git a/src/ipa/raspberrypi/controller/rpi/alsc.hpp b/src/ipa/raspberrypi/controller/rpi/alsc.hpp\nindex 9616b99e..3f9d6837 100644\n--- a/src/ipa/raspberrypi/controller/rpi/alsc.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/alsc.hpp\n@@ -6,10 +6,10 @@\n */\n #pragma once\n \n-#include \n-#include \n #include \n \n+#include \n+\n #include \"../algorithm.hpp\"\n #include \"../alsc_status.h\"\n \n@@ -63,11 +63,11 @@ private:\n \tdouble luminance_table_[ALSC_CELLS_X * ALSC_CELLS_Y];\n \tstd::thread async_thread_;\n \tvoid asyncFunc(); // asynchronous thread function\n-\tstd::mutex mutex_;\n+\tlibcamera::Mutex mutex_;\n \t// condvar for async thread to wait on\n-\tstd::condition_variable async_signal_;\n+\tlibcamera::ConditionVariable async_signal_;\n \t// condvar for synchronous thread to wait on\n-\tstd::condition_variable sync_signal_;\n+\tlibcamera::ConditionVariable sync_signal_;\n \t// for sync thread to check if async thread finished (requires mutex)\n \tbool async_finished_;\n \t// for async thread to check if it's been told to run (requires mutex)\ndiff --git a/src/ipa/raspberrypi/controller/rpi/awb.cpp b/src/ipa/raspberrypi/controller/rpi/awb.cpp\nindex 5cfd33a3..b4e45abf 100644\n--- a/src/ipa/raspberrypi/controller/rpi/awb.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/awb.cpp\n@@ -132,7 +132,7 @@ Awb::Awb(Controller *controller)\n Awb::~Awb()\n {\n \t{\n-\t\tstd::lock_guard lock(mutex_);\n+\t\tMutexLocker lock(mutex_);\n \t\tasync_abort_ = true;\n \t}\n \tasync_signal_.notify_one();\n@@ -252,7 +252,7 @@ void Awb::restartAsync(StatisticsPtr &stats, double lux)\n \t\t\t\t sizeof(async_results_.mode) - 1);\n \tasync_results_.mode[len] = '\\0';\n \t{\n-\t\tstd::lock_guard lock(mutex_);\n+\t\tMutexLocker lock(mutex_);\n \t\tasync_start_ = true;\n \t}\n \tasync_signal_.notify_one();\n@@ -268,7 +268,7 @@ void Awb::Prepare(Metadata *image_metadata)\n \tLOG(RPiAwb, Debug)\n \t\t<< \"frame_count \" << frame_count_ << \" speed \" << speed;\n \t{\n-\t\tstd::unique_lock lock(mutex_);\n+\t\tMutexLocker lock(mutex_);\n \t\tif (async_started_ && async_finished_)\n \t\t\tfetchAsyncResults();\n \t}\n@@ -317,7 +317,7 @@ void Awb::asyncFunc()\n {\n \twhile (true) {\n \t\t{\n-\t\t\tstd::unique_lock lock(mutex_);\n+\t\t\tMutexLocker lock(mutex_);\n \t\t\tasync_signal_.wait(lock, [&] {\n \t\t\t\treturn async_start_ || async_abort_;\n \t\t\t});\n@@ -327,7 +327,7 @@ void Awb::asyncFunc()\n \t\t}\n \t\tdoAwb();\n \t\t{\n-\t\t\tstd::lock_guard lock(mutex_);\n+\t\t\tMutexLocker lock(mutex_);\n \t\t\tasync_finished_ = true;\n \t\t}\n \t\tsync_signal_.notify_one();\ndiff --git a/src/ipa/raspberrypi/controller/rpi/awb.hpp b/src/ipa/raspberrypi/controller/rpi/awb.hpp\nindex 8af1f27c..30f39c4a 100644\n--- a/src/ipa/raspberrypi/controller/rpi/awb.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/awb.hpp\n@@ -6,10 +6,10 @@\n */\n #pragma once\n \n-#include \n-#include \n #include \n \n+#include \n+\n #include \"../awb_algorithm.hpp\"\n #include \"../pwl.hpp\"\n #include \"../awb_status.h\"\n@@ -108,11 +108,11 @@ private:\n \tAwbConfig config_;\n \tstd::thread async_thread_;\n \tvoid asyncFunc(); // asynchronous thread function\n-\tstd::mutex mutex_;\n+\tlibcamera::Mutex mutex_;\n \t// condvar for async thread to wait on\n-\tstd::condition_variable async_signal_;\n+\tlibcamera::ConditionVariable async_signal_;\n \t// condvar for synchronous thread to wait on\n-\tstd::condition_variable sync_signal_;\n+\tlibcamera::ConditionVariable sync_signal_;\n \t// for sync thread to check if async thread finished (requires mutex)\n \tbool async_finished_;\n \t// for async thread to check if it's been told to run (requires mutex)\ndiff --git a/src/ipa/raspberrypi/controller/rpi/contrast.cpp b/src/ipa/raspberrypi/controller/rpi/contrast.cpp\nindex ae55aad5..6726b4e3 100644\n--- a/src/ipa/raspberrypi/controller/rpi/contrast.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/contrast.cpp\n@@ -88,7 +88,7 @@ void Contrast::Initialise()\n \n void Contrast::Prepare(Metadata *image_metadata)\n {\n-\tstd::unique_lock lock(mutex_);\n+\tMutexLocker lock(mutex_);\n \timage_metadata->Set(\"contrast.status\", status_);\n }\n \n@@ -172,7 +172,7 @@ void Contrast::Process(StatisticsPtr &stats,\n \tContrastStatus status;\n \tfill_in_status(status, brightness_, contrast_, gamma_curve);\n \t{\n-\t\tstd::unique_lock lock(mutex_);\n+\t\tMutexLocker lock(mutex_);\n \t\tstatus_ = status;\n \t}\n }\ndiff --git a/src/ipa/raspberrypi/controller/rpi/contrast.hpp b/src/ipa/raspberrypi/controller/rpi/contrast.hpp\nindex 85624539..b74e06ab 100644\n--- a/src/ipa/raspberrypi/controller/rpi/contrast.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/contrast.hpp\n@@ -6,7 +6,7 @@\n */\n #pragma once\n \n-#include \n+#include \n \n #include \"../contrast_algorithm.hpp\"\n #include \"../pwl.hpp\"\n@@ -44,7 +44,7 @@ private:\n \tdouble brightness_;\n \tdouble contrast_;\n \tContrastStatus status_;\n-\tstd::mutex mutex_;\n+\tlibcamera::Mutex mutex_;\n };\n \n } // namespace RPiController\ndiff --git a/src/ipa/raspberrypi/controller/rpi/lux.cpp b/src/ipa/raspberrypi/controller/rpi/lux.cpp\nindex f77e9140..7198f64b 100644\n--- a/src/ipa/raspberrypi/controller/rpi/lux.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/lux.cpp\n@@ -54,7 +54,7 @@ void Lux::SetCurrentAperture(double aperture)\n \n void Lux::Prepare(Metadata *image_metadata)\n {\n-\tstd::unique_lock lock(mutex_);\n+\tMutexLocker lock(mutex_);\n \timage_metadata->Set(\"lux.status\", status_);\n }\n \n@@ -88,7 +88,7 @@ void Lux::Process(StatisticsPtr &stats, Metadata *image_metadata)\n \t\tstatus.aperture = current_aperture;\n \t\tLOG(RPiLux, Debug) << \": estimated lux \" << estimated_lux;\n \t\t{\n-\t\t\tstd::unique_lock lock(mutex_);\n+\t\t\tMutexLocker lock(mutex_);\n \t\t\tstatus_ = status;\n \t\t}\n \t\t// Overwrite the metadata here as well, so that downstream\ndiff --git a/src/ipa/raspberrypi/controller/rpi/lux.hpp b/src/ipa/raspberrypi/controller/rpi/lux.hpp\nindex 3ebd35d1..caa018da 100644\n--- a/src/ipa/raspberrypi/controller/rpi/lux.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/lux.hpp\n@@ -6,8 +6,7 @@\n */\n #pragma once\n \n-#include \n-\n+#include \n #include \n \n #include \"../lux_status.h\"\n@@ -37,7 +36,7 @@ private:\n \tdouble reference_lux_;\n \tdouble current_aperture_;\n \tLuxStatus status_;\n-\tstd::mutex mutex_;\n+\tlibcamera::Mutex mutex_;\n };\n \n } // namespace RPiController\n","prefixes":["libcamera-devel","1/7"]}