[{"id":21392,"web_url":"https://patchwork.libcamera.org/comment/21392/","msgid":"","date":"2021-11-30T04:04:33","subject":"Re: [libcamera-devel] [PATCH v2 01/11] libcamera: base: Introduce\n\tConditionVariable","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Hiro,\n\nThank you for the patch.\n\nOn Mon, Nov 29, 2021 at 08:44:43PM +0900, Hirokazu Honda wrote:\n> ConditionVariable is alias to std::condition_variable. This replaces\n> std::condition_variable with the ConditionVariable. It enables\n> replacing ConditionVariable implementation easily in the following\n> patches.\n> \n> Signed-off-by: Hirokazu Honda \n\nReviewed-by: Laurent Pinchart \n\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(-)\n> \n> diff --git a/include/libcamera/base/semaphore.h b/include/libcamera/base/semaphore.h\n> index 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 \n> -\n> #include \n> #include \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> \n> diff --git a/include/libcamera/base/thread.h b/include/libcamera/base/thread.h\n> index 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 \n> #include \n> #include \n> #include \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;\n> \n> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> index 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 \n> #include \n> #include \n> #include \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 requests_;\n> \t\tState state_ = State::Stopped;\n> diff --git a/src/libcamera/base/thread.cpp b/src/libcamera/base/thread.cpp\n> index d0ca30e3..58e1265f 100644\n> --- a/src/libcamera/base/thread.cpp\n> +++ b/src/libcamera/base/thread.cpp\n> @@ -8,7 +8,6 @@\n> #include \n> \n> #include \n> -#include \n> #include \n> #include \n> #include \n> @@ -158,7 +157,7 @@ private:\n> \n> \tstd::atomic dispatcher_;\n> \n> -\tstd::condition_variable cv_;\n> +\tConditionVariable cv_;\n> \tstd::atomic exit_;\n> \tint exitCode_;\n> \n> diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\n> index 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 \n> \n> -#include \n> #include \n> \n> #include \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> \n> diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h\n> index 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> };","headers":{"Return-Path":"","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 1E8F7BDB13\n\tfor ;\n\tTue, 30 Nov 2021 04:05:01 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EADD4605B4;\n\tTue, 30 Nov 2021 05:05:00 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 97DF0604FC\n\tfor ;\n\tTue, 30 Nov 2021 05:04:59 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B897C8F0;\n\tTue, 30 Nov 2021 05:04:58 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"U8UvjlTk\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1638245099;\n\tbh=DuezygKnti7cI1GkxmPBq/K6EMZZp7mIA+FhdNMy0L0=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=U8UvjlTkE9dIlfHE1p4j1RdQdmoI6O9730McavfxHcChEsnJAXo7yGlpEzBP877xf\n\tJPaPL8vRe8pxaUarYUuCUVE/pLKyBvhCpNLQzTtztnc6aZ7bWNUaahvmwof+MxQ5LC\n\tz9KeGyVLB+BryXVcMrCDWK9cQsASuyrvJUFtLHNY=","Date":"Tue, 30 Nov 2021 06:04:33 +0200","From":"Laurent Pinchart ","To":"Hirokazu Honda ","Message-ID":"","References":"<20211129114453.3186042-1-hiroh@chromium.org>\n\t<20211129114453.3186042-2-hiroh@chromium.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20211129114453.3186042-2-hiroh@chromium.org>","Subject":"Re: [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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]