[{"id":21509,"web_url":"https://patchwork.libcamera.org/comment/21509/","msgid":"","date":"2021-12-01T10:38:09","subject":"Re: [libcamera-devel] [PATCH v5 11/12] android: camera_device: Add\n\tthread safety annotation","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/people/86/","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"content":"Hi Hiro,\n\nOn 12/1/21 1:23 PM, Hirokazu Honda wrote:\n> This applies clang thread safety annotation to CameraDevice.\n>\n> Signed-off-by: Hirokazu Honda \n> Reviewed-by: Laurent Pinchart \n\n\nReviewed-by: Umang Jain \n\n> ---\n> src/android/camera_device.h | 14 ++++++++------\n> 1 file changed, 8 insertions(+), 6 deletions(-)\n>\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index a945f5de..e5d9cda2 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -82,7 +82,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> @@ -94,8 +94,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> @@ -107,7 +108,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> @@ -118,8 +119,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 77804BF415\n\tfor ;\n\tWed, 1 Dec 2021 10:38:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D1B7960720;\n\tWed, 1 Dec 2021 11:38:16 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 84F256011D\n\tfor ;\n\tWed, 1 Dec 2021 11:38:15 +0100 (CET)","from [192.168.1.106] (unknown [103.251.226.170])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 74AE88AE;\n\tWed, 1 Dec 2021 11:38:13 +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=\"n1A7/C9R\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1638355095;\n\tbh=AD8E+jkQ5DMrNncmQCbPF/Wm0xE+Ya1hEYp8DCblDVA=;\n\th=Subject:To:References:From:Date:In-Reply-To:From;\n\tb=n1A7/C9Rvr9hmDhFq7C7tkN5by44qHnYXoWzUUilrrFI8Ne8IPBjpiHzgL3Q+bqLy\n\tp6mZ1HdQAZXimG3D4DGU8rAhQ8fKXw0nQJg5XyCPXHeLgL3ZX4BiActCxPrrwwlcVP\n\twzoj0CrP93Mc4XN7vGp+h/cozBE9+uO8czvwi8r4=","To":"Hirokazu Honda , libcamera-devel@lists.libcamera.org","References":"<20211201075348.3121186-1-hiroh@chromium.org>\n\t<20211201075348.3121186-12-hiroh@chromium.org>","From":"Umang Jain ","Message-ID":"","Date":"Wed, 1 Dec 2021 16:08:09 +0530","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.10.2","MIME-Version":"1.0","In-Reply-To":"<20211201075348.3121186-12-hiroh@chromium.org>","Content-Type":"text/plain; charset=utf-8; format=flowed","Content-Transfer-Encoding":"7bit","Content-Language":"en-US","Subject":"Re: [libcamera-devel] [PATCH v5 11/12] 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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]