[{"id":24807,"web_url":"https://patchwork.libcamera.org/comment/24807/","msgid":"","date":"2022-08-28T18:32:50","subject":"Re: [libcamera-devel] [PATCH v2 3/5] libcamera: camera_manager:\n\tApply clang thread safety annotation","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Umang and Hiro,\n\nThank you for the patch.\n\nOn Mon, Jun 20, 2022 at 10:20:25PM +0530, Umang Jain via libcamera-devel wrote:\n> From: Hirokazu Honda \n> \n> This annotates member functions and variables of\n> CameraManager::Private by clang thread safety annotations.\n> \n> Signed-off-by: Hirokazu Honda \n> Signed-off-by: Umang Jain \n> ---\n> src/libcamera/camera_manager.cpp | 17 +++++++++--------\n> 1 file changed, 9 insertions(+), 8 deletions(-)\n> \n> diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\n> index 70d73822..4f946516 100644\n> --- a/src/libcamera/camera_manager.cpp\n> +++ b/src/libcamera/camera_manager.cpp\n> @@ -42,8 +42,8 @@ public:\n> \n> \tint start();\n> \tvoid addCamera(std::shared_ptr camera,\n> -\t\t const std::vector &devnums);\n> -\tvoid removeCamera(Camera *camera);\n> +\t\t const std::vector &devnums) LIBCAMERA_TSA_EXCLUDES(mutex_);\n> +\tvoid removeCamera(Camera *camera) LIBCAMERA_TSA_EXCLUDES(mutex_);\n> \n> \t/*\n> \t * This mutex protects\n> @@ -52,8 +52,8 @@ public:\n> \t * - cameras_ and camerasByDevnum_ after initialization\n> \t */\n> \tmutable Mutex mutex_;\n> -\tstd::vector> cameras_;\n> -\tstd::map> camerasByDevnum_;\n> +\tstd::vector> cameras_ LIBCAMERA_TSA_GUARDED_BY(mutex_);\n> +\tstd::map> camerasByDevnum_ LIBCAMERA_TSA_GUARDED_BY(mutex_);\n> \n> protected:\n> \tvoid run() override;\n> @@ -61,11 +61,11 @@ protected:\n> private:\n> \tint init();\n> \tvoid createPipelineHandlers();\n> -\tvoid cleanup();\n> +\tvoid cleanup() LIBCAMERA_TSA_EXCLUDES(mutex_);\n> \n> \tConditionVariable cv_;\n> -\tbool initialized_;\n> -\tint status_;\n> +\tbool initialized_ LIBCAMERA_TSA_GUARDED_BY(mutex_);\n> +\tint status_ LIBCAMERA_TSA_GUARDED_BY(mutex_);\n> \n> \tstd::unique_ptr enumerator_;\n> \n> @@ -87,7 +87,8 @@ int CameraManager::Private::start()\n> \n> \t{\n> \t\tMutexLocker locker(mutex_);\n> -\t\tcv_.wait(locker, [&] { return initialized_; });\n> +\t\tcv_.wait(locker,\n> +\t\t\t [&]() LIBCAMERA_TSA_REQUIRES(mutex_) { return initialized_; });\n\n\t\tcv_.wait(locker, [&]() LIBCAMERA_TSA_REQUIRES(mutex_) {\n\t\t\t\t return initialized_;\n\t\t\t });\n\nto match the usual style.\n\nReviewed-by: Laurent Pinchart \n\n> \t\tstatus = status_;\n> \t}\n>","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 40BF5C3272\n\tfor ;\n\tSun, 28 Aug 2022 18:33:02 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7890561FC0;\n\tSun, 28 Aug 2022 20:33:01 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7B8AF61FBD\n\tfor ;\n\tSun, 28 Aug 2022 20:32:59 +0200 (CEST)","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 D16BAE5;\n\tSun, 28 Aug 2022 20:32:58 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1661711581;\n\tbh=z4ECrEl6QU5X2om0JKT5lFtiYqbLEvAoFCpyBzksnwQ=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=OOHPxTDhJhnplS5Hy57SC6x/xf5qJVoSpYnqSdz8ZWdV2O/L9rn3qvVQubFiQJpjJ\n\tVFRwm9HYPaLwhXsJMKlyMghGm4wB4snvvYBE3GoILYuGly5ydl9yKcu+szaiKBXo+Y\n\t6CD4i98mhHj8T1FH5osMUeNE/I5svn+A9/JRfjn3Bf9kAQBear9TGJjZfIUfG0HaOo\n\tTWVH9Mir3M53J6cBcpM8Q9+xr4Pf8padg1RkkjRi5t9W5Kj3XvgSpfn2XCmlgnLwA+\n\tdy7pLMN1FwqRqketAdpZMcmmwPB+rwzmZaxDEhitoy3aOzPWGlb7QLoCD//jWrkQ3o\n\tza0XzDBYMxYsg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1661711579;\n\tbh=z4ECrEl6QU5X2om0JKT5lFtiYqbLEvAoFCpyBzksnwQ=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=dxqhSLZx5i1MVC3cP1aaQ48t0rcLUYib4gxxKLyfw2pqWaS8/rdvDXRwVvVBUnjHh\n\tWY9byWOXFVVML2SqK2c6tk0H7ElUiWMVlNmxqmvasRWHOvtAg/JEdJKQJzWJLQMXhO\n\tjQF6rEn4AGG3Z+lt/V1sS0Db/yP/4dZzkdbEkDR0="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"dxqhSLZx\"; dkim-atps=neutral","Date":"Sun, 28 Aug 2022 21:32:50 +0300","To":"Umang Jain ","Message-ID":"","References":"<20220620165027.549085-1-umang.jain@ideasonboard.com>\n\t<20220620165027.549085-4-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20220620165027.549085-4-umang.jain@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 3/5] libcamera: camera_manager:\n\tApply clang thread 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","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]