Patch Detail
Show a patch.
GET /api/patches/14410/?format=api
{ "id": 14410, "url": "https://patchwork.libcamera.org/api/patches/14410/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14410/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20211029041424.1430886-4-hiroh@chromium.org>", "date": "2021-10-29T04:14:21", "name": "[libcamera-devel,RFC,3/6] android: camera_hal_manager: Add thread safety annotation", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "8e73fc4a945e3c68b9e40b430ab7b0c278290a38", "submitter": { "id": 63, "url": "https://patchwork.libcamera.org/api/people/63/?format=api", "name": "Hirokazu Honda", "email": "hiroh@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/14410/mbox/", "series": [ { "id": 2678, "url": "https://patchwork.libcamera.org/api/series/2678/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2678", "date": "2021-10-29T04:14:18", "name": "Introduce clang thread safety annotations", "version": 1, "mbox": "https://patchwork.libcamera.org/series/2678/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14410/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14410/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 D291FBF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 29 Oct 2021 04:14:39 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8CA47600C3;\n\tFri, 29 Oct 2021 06:14:39 +0200 (CEST)", "from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com\n\t[IPv6:2607:f8b0:4864:20::52b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3123D600C1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 29 Oct 2021 06:14:37 +0200 (CEST)", "by mail-pg1-x52b.google.com with SMTP id q187so8697058pgq.2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 28 Oct 2021 21:14:37 -0700 (PDT)", "from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:fd56:8786:5663:b946])\n\tby smtp.gmail.com with ESMTPSA id\n\t11sm4826714pfl.41.2021.10.28.21.14.33\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 28 Oct 2021 21:14:34 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"MxFZQXfS\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=L3Ks0SBFgrAtnuHoUek3d3iZpn1ML52IY5W1kRp0HGs=;\n\tb=MxFZQXfS0F1tVQWbIPlLxQ5Ir3QngnyCxetV7mlfGUYa5+8e5Fw9cD8RlPQJvudrCg\n\t/aXXCaEZTyf1Xsl3/MMAhIt1LPFyDMf9GwRizlMT4v+LQraDoz+A/Q1rT1jrC2wy0HaT\n\tgK6wxHQ00PcY51hHeFHDtVL0MMJcj4CyKRjug=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=L3Ks0SBFgrAtnuHoUek3d3iZpn1ML52IY5W1kRp0HGs=;\n\tb=azXDlUaxCoqVblvekQdneeJrFfdS4j3va3pZjq76Ssls90yyRO/lZ0Gjj0un0xK+dO\n\txgySy4WWtC+o4eyls17YZhw651CB6bIY9IPDU5AheSipFXD0SN+276kFA2CAaJvB6REz\n\tbn09h0SbGZ5fEZ3vTf3eA8Jk9Nhf/0eLsZ4LP9cPLcOE9kWyxwwR7c1CfBPlI2lHlwQZ\n\t5gPfifF3WwfHt4OHuqN44ESWrPqsjaQOk3phITeeTOmX5PQWiAhdGcInwtVjTJrx44ay\n\txipGtzmNlzBkvUqM+qKeY8QngP8HvtA+qVkHkH1T6jHLrVaqGOIRFR8RBAMYSWtGq1pS\n\tgyYg==", "X-Gm-Message-State": "AOAM532qgZGmNd2m5TJ6FcOvFgKPSTGv6+MJ/kweMFCLjSNU07JUU7HY\n\tZiKfTG3j4crUQ+idhDCg4cBl5EwgqarLBA==", "X-Google-Smtp-Source": "ABdhPJyCnd4t5M/pJVzfiKdirPIjRkUUfgiUsInyH1VAiGxbz4ob93J1SLVRGzhyknXCtgi+ODBytg==", "X-Received": "by 2002:aa7:9099:0:b0:44c:a3b5:ca52 with SMTP id\n\ti25-20020aa79099000000b0044ca3b5ca52mr8342615pfa.85.1635480875319; \n\tThu, 28 Oct 2021 21:14:35 -0700 (PDT)", "From": "Hirokazu Honda <hiroh@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 29 Oct 2021 13:14:21 +0900", "Message-Id": "<20211029041424.1430886-4-hiroh@chromium.org>", "X-Mailer": "git-send-email 2.33.1.1089.g2158813163f-goog", "In-Reply-To": "<20211029041424.1430886-1-hiroh@chromium.org>", "References": "<20211029041424.1430886-1-hiroh@chromium.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [RFC PATCH 3/6] android: camera_hal_manager: Add\n\tthread 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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "This applies clang thread safety annotation to CameraHalManager.\nMutex and MutexLocker there are replaced with Mutex2 and\nMutexLocer2.\n\nSigned-off-by: Hirokazu Honda <hiroh@chromium.org>\n---\n src/android/camera_hal_manager.cpp | 10 +++++-----\n src/android/camera_hal_manager.h | 14 ++++++--------\n 2 files changed, 11 insertions(+), 13 deletions(-)", "diff": "diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\nindex 5f7bfe26..26715a5f 100644\n--- a/src/android/camera_hal_manager.cpp\n+++ b/src/android/camera_hal_manager.cpp\n@@ -75,7 +75,7 @@ int CameraHalManager::init()\n std::tuple<CameraDevice *, int>\n CameraHalManager::open(unsigned int id, const hw_module_t *hardwareModule)\n {\n-\tMutexLocker locker(mutex_);\n+\tMutexLocker2 locker(mutex_);\n \n \tif (!callbacks_) {\n \t\tLOG(HAL, Error) << \"Can't open camera before callbacks are set\";\n@@ -103,7 +103,7 @@ void CameraHalManager::cameraAdded(std::shared_ptr<Camera> cam)\n \tbool isCameraExternal = false;\n \tbool isCameraNew = false;\n \n-\tMutexLocker locker(mutex_);\n+\tMutexLocker2 locker(mutex_);\n \n \t/*\n \t * Each camera is assigned a unique integer ID when it is seen for the\n@@ -198,7 +198,7 @@ void CameraHalManager::cameraAdded(std::shared_ptr<Camera> cam)\n \n void CameraHalManager::cameraRemoved(std::shared_ptr<Camera> cam)\n {\n-\tMutexLocker locker(mutex_);\n+\tMutexLocker2 locker(mutex_);\n \n \tauto iter = std::find_if(cameras_.begin(), cameras_.end(),\n \t\t\t\t [&cam](const std::unique_ptr<CameraDevice> &camera) {\n@@ -257,7 +257,7 @@ int CameraHalManager::getCameraInfo(unsigned int id, struct camera_info *info)\n \tif (!info)\n \t\treturn -EINVAL;\n \n-\tMutexLocker locker(mutex_);\n+\tMutexLocker2 locker(mutex_);\n \n \tCameraDevice *camera = cameraDeviceFromHalId(id);\n \tif (!camera) {\n@@ -280,7 +280,7 @@ void CameraHalManager::setCallbacks(const camera_module_callbacks_t *callbacks)\n {\n \tcallbacks_ = callbacks;\n \n-\tMutexLocker locker(mutex_);\n+\tMutexLocker2 locker(mutex_);\n \n \t/*\n \t * Some external cameras may have been identified before the callbacks_\ndiff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h\nindex 3f6d302a..9b8c3a1f 100644\n--- a/src/android/camera_hal_manager.h\n+++ b/src/android/camera_hal_manager.h\n@@ -8,7 +8,6 @@\n #define __ANDROID_CAMERA_MANAGER_H__\n \n #include <map>\n-#include <mutex>\n #include <stddef.h>\n #include <tuple>\n #include <vector>\n@@ -18,6 +17,8 @@\n #include <system/camera_metadata.h>\n \n #include <libcamera/base/class.h>\n+#include <libcamera/base/mutex.h>\n+#include <libcamera/base/thread_annotations.h>\n \n #include <libcamera/camera_manager.h>\n \n@@ -44,9 +45,6 @@ public:\n private:\n \tLIBCAMERA_DISABLE_COPY_AND_MOVE(CameraHalManager)\n \n-\tusing Mutex = std::mutex;\n-\tusing MutexLocker = std::unique_lock<std::mutex>;\n-\n \tstatic constexpr unsigned int firstExternalCameraId_ = 1000;\n \n \tCameraHalManager();\n@@ -56,15 +54,15 @@ private:\n \tvoid cameraAdded(std::shared_ptr<libcamera::Camera> cam);\n \tvoid cameraRemoved(std::shared_ptr<libcamera::Camera> cam);\n \n-\tCameraDevice *cameraDeviceFromHalId(unsigned int id);\n+\tCameraDevice *cameraDeviceFromHalId(unsigned int id) REQUIRES(mutex_);\n \n \tstd::unique_ptr<libcamera::CameraManager> cameraManager_;\n \tCameraHalConfig halConfig_;\n \n \tconst camera_module_callbacks_t *callbacks_;\n-\tstd::vector<std::unique_ptr<CameraDevice>> cameras_;\n-\tstd::map<std::string, unsigned int> cameraIdsMap_;\n-\tMutex mutex_;\n+\tstd::vector<std::unique_ptr<CameraDevice>> cameras_ GUARDED_BY(mutex_);\n+\tstd::map<std::string, unsigned int> cameraIdsMap_ GUARDED_BY(mutex_);\n+\tlibcamera::Mutex2 mutex_;\n \n \tunsigned int numInternalCameras_;\n \tunsigned int nextExternalCameraId_;\n", "prefixes": [ "libcamera-devel", "RFC", "3/6" ] }