Patch Detail
Show a patch.
GET /api/patches/14844/?format=api
{ "id": 14844, "url": "https://patchwork.libcamera.org/api/patches/14844/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14844/", "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": "<20211129114453.3186042-9-hiroh@chromium.org>", "date": "2021-11-29T11:44:50", "name": "[libcamera-devel,v2,08/11] android: camera_stream: Add thread safety annotation", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "802b6977bb0cb65e98360ee9fb5b01624c7f9384", "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/14844/mbox/", "series": [ { "id": 2770, "url": "https://patchwork.libcamera.org/api/series/2770/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2770", "date": "2021-11-29T11:44:42", "name": "Introduce clang thread safety annotations", "version": 2, "mbox": "https://patchwork.libcamera.org/series/2770/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14844/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14844/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 A417DBF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 29 Nov 2021 11:45:20 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5A87D605A6;\n\tMon, 29 Nov 2021 12:45:20 +0100 (CET)", "from mail-pl1-x630.google.com (mail-pl1-x630.google.com\n\t[IPv6:2607:f8b0:4864:20::630])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6F66E605BC\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 29 Nov 2021 12:45:15 +0100 (CET)", "by mail-pl1-x630.google.com with SMTP id u17so11932293plg.9\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 29 Nov 2021 03:45:15 -0800 (PST)", "from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:f254:cda9:46e8:17b7])\n\tby smtp.gmail.com with ESMTPSA id\n\thg4sm17951966pjb.1.2021.11.29.03.45.12\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 29 Nov 2021 03:45:13 -0800 (PST)" ], "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=\"fguIXqxk\"; 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=jkEnNVnDsKxPXQVrOr2o6e7y66s+KmMxUJ0aP0RkLt0=;\n\tb=fguIXqxkiDO7csnL7NPKuBJWH+fC17FvaRhnDe9fpaavOAMs/+91UdwosGUUAoeT+F\n\tuxpu47OYoymbmp068czsfJZsh/kINlIYkz/DneryP4zc8ZZGoj2sT+6KCGP4mhWtuqc6\n\tovWa/OmEQfs55x5Z4NZOVpIyxpdcra03RwhxA=", "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=jkEnNVnDsKxPXQVrOr2o6e7y66s+KmMxUJ0aP0RkLt0=;\n\tb=b2PAPDAS10+XSDezxitVX0zDIlulBqc0bsEUvVwM+iDhq6txQvbqeZEqiXwbOo0lDU\n\tVekFOKPWVejeSzkVRUoqXkYuyu8Jh8Kq8kSvdifwxSjUtWWaDPuFjF1v5js+MqmmJuSQ\n\t8g8wswaryw5n+IMEf2/bNRtG8EkKJLUnBeoXPdjNZcgyJLxvikJ9hxKlRz67T0WpAJmK\n\tSICeIPRgTmfDMuChdHKdQyhMSKt0313KXDFQ5s0mtQbqcMtvQo1Qlq0TkZ2BEE+IST9w\n\tKBjrRFFd1t3mlB+UKpMuY3Ss+x0db6FQzwDj5bMgNw6D2Pej6S8FoIumu1YzsbuHla9g\n\tBjOw==", "X-Gm-Message-State": "AOAM532Qw6RWiczGhkG72pdIxnyRnfbyweaiD6DC7sUQ/1E4UoY04oZK\n\tEwpHmgsAf8W5Ax9zgGrfY8noPswYqM7s3A==", "X-Google-Smtp-Source": "ABdhPJzRDB1WHt8A9OoyiFDFs38E5DMFVEv6zg0QRDWnwGToROPWLIGEfA6IO/mS2MMlwBxBe95qCw==", "X-Received": "by 2002:a17:903:408c:b0:142:45a9:672c with SMTP id\n\tz12-20020a170903408c00b0014245a9672cmr59279113plc.7.1638186313714; \n\tMon, 29 Nov 2021 03:45:13 -0800 (PST)", "From": "Hirokazu Honda <hiroh@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 29 Nov 2021 20:44:50 +0900", "Message-Id": "<20211129114453.3186042-9-hiroh@chromium.org>", "X-Mailer": "git-send-email 2.34.0.rc2.393.gf8c9666880-goog", "In-Reply-To": "<20211129114453.3186042-1-hiroh@chromium.org>", "References": "<20211129114453.3186042-1-hiroh@chromium.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 08/11] android: camera_stream: 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 CameraStream.\n\nSigned-off-by: Hirokazu Honda <hiroh@chromium.org>\nReviewed-by: Umang Jain <umang.jain@ideasonboard.com>\n---\n src/android/camera_stream.cpp | 2 +-\n src/android/camera_stream.h | 11 +++++++----\n 2 files changed, 8 insertions(+), 5 deletions(-)", "diff": "diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\nindex 2181d094..ae659808 100644\n--- a/src/android/camera_stream.cpp\n+++ b/src/android/camera_stream.cpp\n@@ -275,7 +275,7 @@ void CameraStream::PostProcessorWorker::run()\n \tMutexLocker locker(mutex_);\n \n \twhile (1) {\n-\t\tcv_.wait(locker, [&] {\n+\t\tcv_.wait(locker, [&]() LIBCAMERA_TSA_REQUIRES(mutex_) {\n \t\t\treturn state_ != State::Running || !requests_.empty();\n \t\t});\n \ndiff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\nindex c127a0e4..6737bd2d 100644\n--- a/src/android/camera_stream.h\n+++ b/src/android/camera_stream.h\n@@ -8,13 +8,14 @@\n #pragma once\n \n #include <memory>\n-#include <mutex>\n #include <queue>\n #include <vector>\n \n #include <hardware/camera3.h>\n \n+#include <libcamera/base/mutex.h>\n #include <libcamera/base/thread.h>\n+#include <libcamera/base/thread_annotations.h>\n \n #include <libcamera/camera.h>\n #include <libcamera/framebuffer.h>\n@@ -155,8 +156,10 @@ private:\n \t\tlibcamera::Mutex mutex_;\n \t\tlibcamera::ConditionVariable cv_;\n \n-\t\tstd::queue<Camera3RequestDescriptor::StreamBuffer *> requests_;\n-\t\tState state_ = State::Stopped;\n+\t\tstd::queue<Camera3RequestDescriptor::StreamBuffer *> requests_\n+\t\t\tLIBCAMERA_TSA_GUARDED_BY(mutex_);\n+\n+\t\tState state_ LIBCAMERA_TSA_GUARDED_BY(mutex_) = State::Stopped;\n \t};\n \n \tint waitFence(int fence);\n@@ -168,7 +171,7 @@ private:\n \tconst unsigned int index_;\n \n \tstd::unique_ptr<libcamera::FrameBufferAllocator> allocator_;\n-\tstd::vector<libcamera::FrameBuffer *> buffers_;\n+\tstd::vector<libcamera::FrameBuffer *> buffers_ LIBCAMERA_TSA_GUARDED_BY(mutex_);\n \t/*\n \t * The class has to be MoveConstructible as instances are stored in\n \t * an std::vector in CameraDevice.\n", "prefixes": [ "libcamera-devel", "v2", "08/11" ] }