Patch Detail
Show a patch.
GET /api/patches/14949/?format=api
{ "id": 14949, "url": "https://patchwork.libcamera.org/api/patches/14949/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14949/", "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": "<20211201075348.3121186-10-hiroh@chromium.org>", "date": "2021-12-01T07:53:45", "name": "[libcamera-devel,v5,09/12] android: camera_stream: Add thread safety annotation", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "420156a9f16230d719dcb50844d536b9601ac5bd", "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/14949/mbox/", "series": [ { "id": 2791, "url": "https://patchwork.libcamera.org/api/series/2791/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2791", "date": "2021-12-01T07:53:36", "name": "Introduce clang thread safety annotations", "version": 5, "mbox": "https://patchwork.libcamera.org/series/2791/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14949/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14949/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 A8BD5BF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 1 Dec 2021 07:54:13 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 23F2460710;\n\tWed, 1 Dec 2021 08:54:13 +0100 (CET)", "from mail-pl1-x636.google.com (mail-pl1-x636.google.com\n\t[IPv6:2607:f8b0:4864:20::636])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1410F60727\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 1 Dec 2021 08:54:12 +0100 (CET)", "by mail-pl1-x636.google.com with SMTP id o14so17040167plg.5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 30 Nov 2021 23:54:12 -0800 (PST)", "from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:3892:a049:59ba:c772])\n\tby smtp.gmail.com with ESMTPSA id\n\tl9sm3500848pfu.55.2021.11.30.23.54.08\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 30 Nov 2021 23:54:10 -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=\"PPJwu3K4\"; 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=AQIBNqacdqTMVVj1+/N7sLikHJdd0HfW4RrtBwMeJFk=;\n\tb=PPJwu3K4h7g4wpWqG1pLHsM45BREkw+UL8ixhzcQ0BJP1vU2DU+sS0aMsPo6mb23S+\n\tfngmPI9+YpB77xf6xfsRqXNb7YeyJtCd/9gieX7+WwtUjFp63GM19JhsCxC8WWtxxYfZ\n\t/zol5Q66ubyfBk10PPjhzb4VfZ7uZF1QrCozs=", "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=AQIBNqacdqTMVVj1+/N7sLikHJdd0HfW4RrtBwMeJFk=;\n\tb=vQm92Ie92ATbMgj26B4Kf817I/GdAIa2orGQZg6zz4DpueybI0AOfAMz7TkCPBqj34\n\tbMpWs1Y84ch8AUkB1aO/pGMJ7q4uT3p0NvULmyREowAT2f0xEyqS9RhpyA4lYufBHxgl\n\tQbNl3M1JNQYvff3Ey9/zKXyfZ3yvmF27R0v+I/pnZbsROnnK6n7y2K1k3nf+sie8FPHQ\n\tmncEWyNfObQxVWYjmWy1RPpQ4egezgJkHpkGhJ+Li9d2pi7cwNBuwSFKIiRr4DLTJ8CR\n\t61IVR/50gfuauJ1s4tojIyTuRh7yl4WOIaQ74z7vxW/9G7KFObstoyJEZZzpw3kbfPiH\n\tOCJg==", "X-Gm-Message-State": "AOAM533BDBAoHZDeEIjirxBpu74n8kznPxZjHbkj/x2sQJVlT9PZdN6F\n\thOELFnC6xwC0PmcSdnb9gAdSVHJXdJCIZA==", "X-Google-Smtp-Source": "ABdhPJwOyThNx/xsjT9+3BnoZ1q1tPITOyu1FpmqpzPg2pm9BvntNH2jX4e4c5g3SvXE5gE+fZy5gg==", "X-Received": "by 2002:a17:902:e84e:b0:141:e3f2:36c5 with SMTP id\n\tt14-20020a170902e84e00b00141e3f236c5mr5582248plg.74.1638345250392; \n\tTue, 30 Nov 2021 23:54:10 -0800 (PST)", "From": "Hirokazu Honda <hiroh@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 1 Dec 2021 16:53:45 +0900", "Message-Id": "<20211201075348.3121186-10-hiroh@chromium.org>", "X-Mailer": "git-send-email 2.34.0.rc2.393.gf8c9666880-goog", "In-Reply-To": "<20211201075348.3121186-1-hiroh@chromium.org>", "References": "<20211201075348.3121186-1-hiroh@chromium.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v5 09/12] 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: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Umang Jain <umang.jain@ideasonboard.com>\n---\n src/android/camera_stream.cpp | 2 +-\n src/android/camera_stream.h | 8 +++++---\n 2 files changed, 6 insertions(+), 4 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 e4eb953a..7b1a2980 100644\n--- a/src/android/camera_stream.h\n+++ b/src/android/camera_stream.h\n@@ -155,8 +155,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 +170,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", "v5", "09/12" ] }