[{"id":21399,"web_url":"https://patchwork.libcamera.org/comment/21399/","msgid":"","date":"2021-11-30T04:23:52","subject":"Re: [libcamera-devel] [PATCH v2 08/11] android: camera_stream: Add\n\tthread safety annotation","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Hiro,\n\nThank you for the patch.\n\nOn Mon, Nov 29, 2021 at 08:44:50PM +0900, Hirokazu Honda wrote:\n> This applies clang thread safety annotation to CameraStream.\n> \n> Signed-off-by: Hirokazu Honda \n> Reviewed-by: Umang Jain \n> ---\n> src/android/camera_stream.cpp | 2 +-\n> src/android/camera_stream.h | 11 +++++++----\n> 2 files changed, 8 insertions(+), 5 deletions(-)\n> \n> diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> index 2181d094..ae659808 100644\n> --- a/src/android/camera_stream.cpp\n> +++ b/src/android/camera_stream.cpp\n> @@ -275,7 +275,7 @@ void CameraStream::PostProcessorWorker::run()\n> \tMutexLocker locker(mutex_);\n> \n> \twhile (1) {\n> -\t\tcv_.wait(locker, [&] {\n> +\t\tcv_.wait(locker, [&]() LIBCAMERA_TSA_REQUIRES(mutex_) {\n> \t\t\treturn state_ != State::Running || !requests_.empty();\n> \t\t});\n> \n> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> index c127a0e4..6737bd2d 100644\n> --- a/src/android/camera_stream.h\n> +++ b/src/android/camera_stream.h\n> @@ -8,13 +8,14 @@\n> #pragma once\n> \n> #include \n> -#include \n> #include \n> #include \n> \n> #include \n> \n> +#include \n> #include \n> +#include \n\nI think this belongs to patch 02/11.\n\nReviewed-by: Laurent Pinchart \n\n> #include \n> #include \n> @@ -155,8 +156,10 @@ private:\n> \t\tlibcamera::Mutex mutex_;\n> \t\tlibcamera::ConditionVariable cv_;\n> \n> -\t\tstd::queue requests_;\n> -\t\tState state_ = State::Stopped;\n> +\t\tstd::queue requests_\n> +\t\t\tLIBCAMERA_TSA_GUARDED_BY(mutex_);\n> +\n> +\t\tState state_ LIBCAMERA_TSA_GUARDED_BY(mutex_) = State::Stopped;\n> \t};\n> \n> \tint waitFence(int fence);\n> @@ -168,7 +171,7 @@ private:\n> \tconst unsigned int index_;\n> \n> \tstd::unique_ptr allocator_;\n> -\tstd::vector buffers_;\n> +\tstd::vector buffers_ LIBCAMERA_TSA_GUARDED_BY(mutex_);\n> \t/*\n> \t * The class has to be MoveConstructible as instances are stored in\n> \t * an std::vector in CameraDevice.","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 4C50EBF415\n\tfor ;\n\tTue, 30 Nov 2021 04:24:18 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 94CB7605B4;\n\tTue, 30 Nov 2021 05:24:17 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C9FAF604FC\n\tfor ;\n\tTue, 30 Nov 2021 05:24:16 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3BDE18F0;\n\tTue, 30 Nov 2021 05:24:16 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"kJ5Tf8Hy\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1638246256;\n\tbh=8HSslbH8vR0ocZIEHmXspLrBTaqvjI3HsiSDVcxup7Y=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=kJ5Tf8HyUJq71A8fhcqCMUtdRf1sn8zrnLhiWkdWtu/wz+JbdHfVIs80aSw5gY0mJ\n\t0hiXB2JKOEta02LMyDAlsjGmb6sZ3telbxGsA1FWUxxux6qp3DY3Ig4Er/r/uGx2SZ\n\tAoz+6Ih/Ns7DaWvEORAPDAGNiwFIgQH882Gwt55w=","Date":"Tue, 30 Nov 2021 06:23:52 +0200","From":"Laurent Pinchart ","To":"Hirokazu Honda ","Message-ID":"","References":"<20211129114453.3186042-1-hiroh@chromium.org>\n\t<20211129114453.3186042-9-hiroh@chromium.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20211129114453.3186042-9-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH v2 08/11] android: camera_stream: Add\n\tthread safety annotation","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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]