Patch Detail
Show a patch.
GET /api/1.1/patches/14837/?format=api
{ "id": 14837, "url": "https://patchwork.libcamera.org/api/1.1/patches/14837/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14837/", "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": "<20211129114453.3186042-2-hiroh@chromium.org>", "date": "2021-11-29T11:44:43", "name": "[libcamera-devel,v2,01/11] libcamera: base: Introduce ConditionVariable", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "8a18a7c406442905821e47a9e476a3d8461fe9c1", "submitter": { "id": 63, "url": "https://patchwork.libcamera.org/api/1.1/people/63/?format=api", "name": "Hirokazu Honda", "email": "hiroh@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/14837/mbox/", "series": [ { "id": 2770, "url": "https://patchwork.libcamera.org/api/1.1/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/14837/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14837/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 6CA8BBF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 29 Nov 2021 11:45:06 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2A159605B4;\n\tMon, 29 Nov 2021 12:45:06 +0100 (CET)", "from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com\n\t[IPv6:2607:f8b0:4864:20::62f])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C7FD660597\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 29 Nov 2021 12:45:03 +0100 (CET)", "by mail-pl1-x62f.google.com with SMTP id q17so11924120plr.11\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 29 Nov 2021 03:45:03 -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.00\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 29 Nov 2021 03:45:01 -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=\"KBc0wTXE\"; 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=fTPId8aJWvtcDKFDNSLx1VnBGzL59PNNmLExIJt0hrk=;\n\tb=KBc0wTXE+eDafmJJvHF0d8BdK8RuHBvP7y0XH/QGR82xG02CgSDpSzvXAg0nN9nBGK\n\tT6WVXetG729ZTkKb7rKytEToxIsMI71NHXOgGch6vjJS0u5OkJSn75jEGb8nL0nMAu4p\n\t9X20swRUkoeMALqlfBStZZHYLEx4k9DMwFDHY=", "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=fTPId8aJWvtcDKFDNSLx1VnBGzL59PNNmLExIJt0hrk=;\n\tb=cixNoVAoUHqlH+5Gu+RtNSFdlT0jQx2JhMol2rHrHiJsQZTkYe9yprj6c+ZRKQ1whv\n\tSmevNx8n7J524vrILfUiW/fFWYOPPx9dCC0v9xMC3b68MhrZOeONJwrTybYw+7bdJbnA\n\tiqUK2ltX1HdXCkgTGTNBGJyHlZtD9g4ZMWnGixJU4H0wKEWAlqfSRunvlmYfs4a7OlUS\n\tBE9m12sh2tNvgMxEg56klQhZvbeFMv730ToacZw3IKpiNEu/FAY3Hvvh4zAxSvhQFWMH\n\tOttfpFnxeG6maKLZl1ZEAyQZtyyzVDYiTkg4vApcT3aV2gYpOvlbU1fdVsbbsQGRE5CL\n\tiq9Q==", "X-Gm-Message-State": "AOAM530pQ9MBRY6T7m96sdyYd3SXjSak7XHGMwODM8e2LO0xpNgr9+Be\n\t7XEjinny6R4fbYLtu9VNVrPsv2W4dws3JQ==", "X-Google-Smtp-Source": "ABdhPJws6EAbDLiF5qjKSHgbkBSbSvRcMh0n4Lzx4UQlnjIFQWoxaSPXR2FYqwcaFHVeMgwu9M+6Xg==", "X-Received": "by 2002:a17:90b:3b83:: with SMTP id\n\tpc3mr37671622pjb.106.1638186301843; \n\tMon, 29 Nov 2021 03:45:01 -0800 (PST)", "From": "Hirokazu Honda <hiroh@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 29 Nov 2021 20:44:43 +0900", "Message-Id": "<20211129114453.3186042-2-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 01/11] libcamera: base: Introduce\n\tConditionVariable", "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": "ConditionVariable is alias to std::condition_variable. This replaces\nstd::condition_variable with the ConditionVariable. It enables\nreplacing ConditionVariable implementation easily in the following\npatches.\n\nSigned-off-by: Hirokazu Honda <hiroh@chromium.org>\n---\n include/libcamera/base/semaphore.h | 4 +---\n include/libcamera/base/thread.h | 2 ++\n src/android/camera_stream.h | 3 +--\n src/libcamera/base/thread.cpp | 3 +--\n src/libcamera/camera_manager.cpp | 3 +--\n src/v4l2/v4l2_camera.h | 2 +-\n 6 files changed, 7 insertions(+), 10 deletions(-)", "diff": "diff --git a/include/libcamera/base/semaphore.h b/include/libcamera/base/semaphore.h\nindex ae87d319..ec05fad3 100644\n--- a/include/libcamera/base/semaphore.h\n+++ b/include/libcamera/base/semaphore.h\n@@ -7,8 +7,6 @@\n \n #pragma once\n \n-#include <condition_variable>\n-\n #include <libcamera/base/private.h>\n #include <libcamera/base/thread.h>\n \n@@ -26,7 +24,7 @@ public:\n \n private:\n \tMutex mutex_;\n-\tstd::condition_variable cv_;\n+\tConditionVariable cv_;\n \tunsigned int available_;\n };\n \ndiff --git a/include/libcamera/base/thread.h b/include/libcamera/base/thread.h\nindex 32ebc80a..1ebf8363 100644\n--- a/include/libcamera/base/thread.h\n+++ b/include/libcamera/base/thread.h\n@@ -7,6 +7,7 @@\n \n #pragma once\n \n+#include <condition_variable>\n #include <memory>\n #include <mutex>\n #include <sys/types.h>\n@@ -26,6 +27,7 @@ class Object;\n class ThreadData;\n class ThreadMain;\n \n+using ConditionVariable = std::condition_variable;\n using Mutex = std::mutex;\n using MutexLocker = std::unique_lock<std::mutex>;\n \ndiff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\nindex e9da75f0..e4808369 100644\n--- a/src/android/camera_stream.h\n+++ b/src/android/camera_stream.h\n@@ -7,7 +7,6 @@\n \n #pragma once\n \n-#include <condition_variable>\n #include <memory>\n #include <mutex>\n #include <queue>\n@@ -154,7 +153,7 @@ private:\n \t\tPostProcessor *postProcessor_;\n \n \t\tlibcamera::Mutex mutex_;\n-\t\tstd::condition_variable cv_;\n+\t\tlibcamera::ConditionVariable cv_;\n \n \t\tstd::queue<Camera3RequestDescriptor::StreamBuffer *> requests_;\n \t\tState state_ = State::Stopped;\ndiff --git a/src/libcamera/base/thread.cpp b/src/libcamera/base/thread.cpp\nindex d0ca30e3..58e1265f 100644\n--- a/src/libcamera/base/thread.cpp\n+++ b/src/libcamera/base/thread.cpp\n@@ -8,7 +8,6 @@\n #include <libcamera/base/thread.h>\n \n #include <atomic>\n-#include <condition_variable>\n #include <list>\n #include <sys/syscall.h>\n #include <sys/types.h>\n@@ -158,7 +157,7 @@ private:\n \n \tstd::atomic<EventDispatcher *> dispatcher_;\n \n-\tstd::condition_variable cv_;\n+\tConditionVariable cv_;\n \tstd::atomic<bool> exit_;\n \tint exitCode_;\n \ndiff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex e78bb1d7..77ff3bd1 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -7,7 +7,6 @@\n \n #include <libcamera/camera_manager.h>\n \n-#include <condition_variable>\n #include <map>\n \n #include <libcamera/camera.h>\n@@ -63,7 +62,7 @@ private:\n \tvoid createPipelineHandlers();\n \tvoid cleanup();\n \n-\tstd::condition_variable cv_;\n+\tConditionVariable cv_;\n \tbool initialized_;\n \tint status_;\n \ndiff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h\nindex 94263b2f..4afbb331 100644\n--- a/src/v4l2/v4l2_camera.h\n+++ b/src/v4l2/v4l2_camera.h\n@@ -82,6 +82,6 @@ private:\n \tint efd_;\n \n \tlibcamera::Mutex bufferMutex_;\n-\tstd::condition_variable bufferCV_;\n+\tlibcamera::ConditionVariable bufferCV_;\n \tunsigned int bufferAvailableCount_;\n };\n", "prefixes": [ "libcamera-devel", "v2", "01/11" ] }