[{"id":21401,"web_url":"https://patchwork.libcamera.org/comment/21401/","msgid":"","date":"2021-11-30T04:32:39","subject":"Re: [libcamera-devel] [PATCH v2 10/11] android: camera_device: 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:52PM +0900, Hirokazu Honda wrote:\n> This applies clang thread safety annotation to CameraDevice.\n> Mutex and MutexLocker there are replaced with Mutex2 and\n> MutexLocer2.\n> \n> Signed-off-by: Hirokazu Honda \n> ---\n> src/android/camera_device.cpp | 2 --\n> src/android/camera_device.h | 18 ++++++++++--------\n> 2 files changed, 10 insertions(+), 10 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 59185e7f..e7365175 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -14,7 +14,6 @@\n> #include \n> \n> #include \n> -#include \n\nThis belongs to a different patch.\n\n> #include \n> \n> #include \n> @@ -932,7 +931,6 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> \t\t\t * Request.\n> \t\t\t */\n> \t\t\tLOG(HAL, Debug) << ss.str() << \" (mapped)\";\n> -\n\nNot needed.\n\n> \t\t\tdescriptor->pendingStreamsToProcess_.insert(\n> \t\t\t\t{ cameraStream, &buffer });\n> \t\t\tcontinue;\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 51fe7da2..2083dac1 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -9,7 +9,6 @@\n> \n> #include \n> #include \n> -#include \n> #include \n> #include \n> \n> @@ -18,7 +17,8 @@\n> #include \n> #include \n> #include \n> -#include \n> +#include \n> +#include \n\nThese belong to 02/11 too.\n\nReviewed-by: Laurent Pinchart \n\n> \n> #include \n> #include \n> @@ -83,7 +83,7 @@ private:\n> \t\tRunning,\n> \t};\n> \n> -\tvoid stop();\n> +\tvoid stop() LIBCAMERA_TSA_EXCLUDES(stateMutex_);\n> \n> \tstd::unique_ptr\n> \tcreateFrameBuffer(const buffer_handle_t camera3buffer,\n> @@ -95,8 +95,9 @@ private:\n> \tvoid notifyError(uint32_t frameNumber, camera3_stream_t *stream,\n> \t\t\t camera3_error_msg_code code) const;\n> \tint processControls(Camera3RequestDescriptor *descriptor);\n> -\tvoid completeDescriptor(Camera3RequestDescriptor *descriptor);\n> -\tvoid sendCaptureResults();\n> +\tvoid completeDescriptor(Camera3RequestDescriptor *descriptor)\n> +\t\tLIBCAMERA_TSA_EXCLUDES(descriptorsMutex_);\n> +\tvoid sendCaptureResults() LIBCAMERA_TSA_REQUIRES(descriptorsMutex_);\n> \tvoid setBufferStatus(Camera3RequestDescriptor::StreamBuffer &buffer,\n> \t\t\t Camera3RequestDescriptor::Status status);\n> \tstd::unique_ptr getResultMetadata(\n> @@ -108,7 +109,7 @@ private:\n> \tCameraWorker worker_;\n> \n> \tlibcamera::Mutex stateMutex_; /* Protects access to the camera state. */\n> -\tState state_;\n> +\tState state_ LIBCAMERA_TSA_GUARDED_BY(stateMutex_);\n> \n> \tstd::shared_ptr camera_;\n> \tstd::unique_ptr config_;\n> @@ -119,8 +120,9 @@ private:\n> \n> \tstd::vector streams_;\n> \n> -\tlibcamera::Mutex descriptorsMutex_; /* Protects descriptors_. */\n> -\tstd::queue> descriptors_;\n> +\tlibcamera::Mutex descriptorsMutex_ LIBCAMERA_TSA_ACQUIRED_AFTER(stateMutex_);\n> +\tstd::queue> descriptors_\n> +\t\tLIBCAMERA_TSA_GUARDED_BY(descriptorsMutex_);\n> \n> \tstd::string maker_;\n> \tstd::string model_;","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 CF041BF415\n\tfor ;\n\tTue, 30 Nov 2021 04:33:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1DC72605B4;\n\tTue, 30 Nov 2021 05:33:06 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B7C26604FC\n\tfor ;\n\tTue, 30 Nov 2021 05:33:04 +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 2C8018F0;\n\tTue, 30 Nov 2021 05:33:04 +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=\"Rf2jW4zC\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1638246784;\n\tbh=UWrbJKLTm3siwQSBRl7l8uIV9kq4ozZu+fI2CU7m5xc=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Rf2jW4zCvUjXx8rjvasL6T4gnIrbjCkEqQyLlOCeBqTgijgeO2uRgAk7NrUcHGln8\n\ts5pO7hgapemy1qFjcF8h70T7KefqNS7tyu4bjJYT8ocZCVnq+3neC4M8mfGuti2dWY\n\tGKpbBjCa/2DWtyXnuGdc/oyUdUfYi9Hwh2VKdvtY=","Date":"Tue, 30 Nov 2021 06:32:39 +0200","From":"Laurent Pinchart ","To":"Hirokazu Honda ","Message-ID":"","References":"<20211129114453.3186042-1-hiroh@chromium.org>\n\t<20211129114453.3186042-11-hiroh@chromium.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20211129114453.3186042-11-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH v2 10/11] android: camera_device: 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\" "}}]