{"id":16290,"url":"https://patchwork.libcamera.org/api/patches/16290/?format=json","web_url":"https://patchwork.libcamera.org/patch/16290/","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":"<20220620165027.549085-4-umang.jain@ideasonboard.com>","date":"2022-06-20T16:50:25","name":"[libcamera-devel,v2,3/5] libcamera: camera_manager: Apply clang thread safety annotation","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"6cbf1407eafba2e686fcaae26fe54e1febdf18d4","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/people/86/?format=json","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"delegate":{"id":12,"url":"https://patchwork.libcamera.org/api/users/12/?format=json","username":"uajain","first_name":"Umang","last_name":"Jain","email":"umang.jain@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/16290/mbox/","series":[{"id":3196,"url":"https://patchwork.libcamera.org/api/series/3196/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3196","date":"2022-06-20T16:50:22","name":"Apply clang thread safety annotation libcamera-core and v4l2","version":2,"mbox":"https://patchwork.libcamera.org/series/3196/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16290/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16290/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 9E7BBBE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 20 Jun 2022 16:50:45 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4C7606563E;\n\tMon, 20 Jun 2022 18:50:45 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D9E4865637\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 20 Jun 2022 18:50:43 +0200 (CEST)","from perceval.ideasonboard.com (unknown\n\t[IPv6:2401:4900:1f3f:e389:cb58:4104:f66:a571])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 46A09883;\n\tMon, 20 Jun 2022 18:50:42 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1655743845;\n\tbh=T6yGjc+PySgh/1/kxCKfvN3M0leBsGQPLp/OacR3Tl0=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=YUfjgUwKxf1NefJWkw4N0Myy+WY2w2X4FFoP0OQ1ITNY8deUBTPj0u/7LiltjnaS5\n\tqJ0J+uB+G33YgMG0wXBerESxjwRBg1UltEfLMfIMnzSv0v0/+BPU5BoR5KeMmUZy9H\n\tPZx4F0s0WQwhEDXuqpKUTnKi4H3QK1FmRvO8PxXKrwhwN3AHEVTyqQ6LnGriVa613o\n\tCN6neUCe2Rjfkf09Xl+W6HiQovbHjRsA9idjI8NDQxYx1fvd6m2rtAixehlIWo6r1B\n\tqCqVeq3dDRUPdlvZcOwn5RSHF1Vm+57IxWC6mFoGw4vQaZbwtLLVg9tsfF7bjXFCK1\n\tssP+xOUmPbh+Q==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1655743843;\n\tbh=T6yGjc+PySgh/1/kxCKfvN3M0leBsGQPLp/OacR3Tl0=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=I9MuwbmPGzOf1EBfzF3WEzeOx0m0fjtTbpNczCrgDp/XInluVAJuPkimCScl6ZujZ\n\tAloZ1E9FQJgmc/t4pJrO7xgAy9wERsitiwHT9QT63N75Vld78VNI4PD8ovEKtdV58+\n\t99nR4mwdD5c8BzoEFbbC3G6E3+gaQHscF050Qp90="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"I9MuwbmP\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 20 Jun 2022 22:20:25 +0530","Message-Id":"<20220620165027.549085-4-umang.jain@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20220620165027.549085-1-umang.jain@ideasonboard.com>","References":"<20220620165027.549085-1-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 3/5] libcamera: camera_manager: Apply\n\tclang thread safety annotation","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","From":"Umang Jain via libcamera-devel <libcamera-devel@lists.libcamera.org>","Reply-To":"Umang Jain <umang.jain@ideasonboard.com>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"From: Hirokazu Honda <hiroh@chromium.org>\n\nThis annotates member functions and variables of\nCameraManager::Private by clang thread safety annotations.\n\nSigned-off-by: Hirokazu Honda <hiroh@chromium.org>\nSigned-off-by: Umang Jain <umang.jain@ideasonboard.com>\n---\n src/libcamera/camera_manager.cpp | 17 +++++++++--------\n 1 file changed, 9 insertions(+), 8 deletions(-)","diff":"diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex 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> camera,\n-\t\t       const std::vector<dev_t> &devnums);\n-\tvoid removeCamera(Camera *camera);\n+\t\t       const std::vector<dev_t> &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<std::shared_ptr<Camera>> cameras_;\n-\tstd::map<dev_t, std::weak_ptr<Camera>> camerasByDevnum_;\n+\tstd::vector<std::shared_ptr<Camera>> cameras_ LIBCAMERA_TSA_GUARDED_BY(mutex_);\n+\tstd::map<dev_t, std::weak_ptr<Camera>> 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<DeviceEnumerator> 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 \t\tstatus = status_;\n \t}\n \n","prefixes":["libcamera-devel","v2","3/5"]}