Patch Detail
Show a patch.
GET /api/1.1/patches/17755/?format=api
{ "id": 17755, "url": "https://patchwork.libcamera.org/api/1.1/patches/17755/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17755/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20221103132041.64644-4-umang.jain@ideasonboard.com>", "date": "2022-11-03T13:20:39", "name": "[libcamera-devel,v3,3/5] libcamera: camera_manager: Apply clang thread safety annotation", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "0b5f66cbebf8e64a6420610787147cf0a0b43195", "submitter": { "id": 86, "url": "https://patchwork.libcamera.org/api/1.1/people/86/?format=api", "name": "Umang Jain", "email": "umang.jain@ideasonboard.com" }, "delegate": { "id": 12, "url": "https://patchwork.libcamera.org/api/1.1/users/12/?format=api", "username": "uajain", "first_name": "Umang", "last_name": "Jain", "email": "umang.jain@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/17755/mbox/", "series": [ { "id": 3596, "url": "https://patchwork.libcamera.org/api/1.1/series/3596/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3596", "date": "2022-11-03T13:20:36", "name": "Apply clang thread safety annotation libcamera-core and v4l2", "version": 3, "mbox": "https://patchwork.libcamera.org/series/3596/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17755/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17755/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 AC637C3285\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 3 Nov 2022 13:21:00 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 562FA63083;\n\tThu, 3 Nov 2022 14:21:00 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 47F8A63079\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 3 Nov 2022 14:20:58 +0100 (CET)", "from umang.jainideasonboard.com (unknown [103.251.226.107])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3BA7256D;\n\tThu, 3 Nov 2022 14:20:55 +0100 (CET)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1667481660;\n\tbh=f4h+ip3NlN/U3w2+q3lDxqUOwIhIZfN8LShVKJpA2h0=;\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=iX5Wd6OlXNOwX+46ZPaMU3SsNFeUCA6bf08Zr9p26YC79NJ5VP8HUu+hBbETMYNkP\n\tDhqPvRDzBQvOLzpMNlKVCcpi0Y4UjFklkS2NxusLED6zPfWhNBUXwXxDendJV46blO\n\tvsejy58QEE5S31jsVsJ9Cm4BXSUdUvMPBmlL33iWhiCeE3N8/s/41VU7vVpOP1Ofw1\n\tON/X+zaixBaYEggSzig0ck2oVPB28baW+7nYFQ9WMEpETjYswjDyYfoLi8mLQc9Qjf\n\tyn3N2nDu47/H8+IVsTNv1tDximiCApE2j0j5YAyQy/SCR5fMdi6exFaAAczRNbNpwI\n\t482Zn3ogje26Q==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1667481658;\n\tbh=f4h+ip3NlN/U3w2+q3lDxqUOwIhIZfN8LShVKJpA2h0=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Zn5jUXHEMPu5e914CyTNG0q6uoHIpOh2gmwfSvTBGjX2qMscbqgCoxIN/3851eobT\n\tLs7Al+S6PFZPOTk5a0fbimPFuq7dPmR8xGBdJeksNgc/7RVPibK1pd8urOZc5AQ7iA\n\t0xRUQ10pHYsgBGrhOO2v9dd+vvd6B8k/KrqArx5Q=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"Zn5jUXHE\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 3 Nov 2022 18:50:39 +0530", "Message-Id": "<20221103132041.64644-4-umang.jain@ideasonboard.com>", "X-Mailer": "git-send-email 2.37.3", "In-Reply-To": "<20221103132041.64644-1-umang.jain@ideasonboard.com>", "References": "<20221103132041.64644-1-umang.jain@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 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>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Umang Jain <umang.jain@ideasonboard.com>\n---\n src/libcamera/camera_manager.cpp | 24 +++++++++++++++---------\n 1 file changed, 15 insertions(+), 9 deletions(-)", "diff": "diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex 2c100c24..b1785f75 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,9 @@ int CameraManager::Private::start()\n \n \t{\n \t\tMutexLocker locker(mutex_);\n-\t\tcv_.wait(locker, [&] { return initialized_; });\n+\t\tcv_.wait(locker, [&]() LIBCAMERA_TSA_REQUIRES(mutex_) {\n+\t\t\treturn initialized_;\n+\t\t});\n \t\tstatus = status_;\n \t}\n \n@@ -178,7 +180,11 @@ void CameraManager::Private::cleanup()\n \t * process deletion requests from the thread's message queue as the event\n \t * loop is not in action here.\n \t */\n-\tcameras_.clear();\n+\t{\n+\t\tMutexLocker locker(mutex_);\n+\t\tcameras_.clear();\n+\t}\n+\n \tdispatchMessages(Message::Type::DeferredDelete);\n \n \tenumerator_.reset(nullptr);\n", "prefixes": [ "libcamera-devel", "v3", "3/5" ] }