[{"id":21498,"web_url":"https://patchwork.libcamera.org/comment/21498/","msgid":"","date":"2021-12-01T10:06:44","subject":"Re: [libcamera-devel] [PATCH v5 01/12] libcamera: base: Introduce\n\tConditionVariable","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/people/86/","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"content":"Hi Hiro,\n\nThank you for the patch\n\nOn 12/1/21 1:23 PM, 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> Reviewed-by: Laurent Pinchart \n\n\nReviewed-by: Umang Jain \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 | 8 ++++++--\n> src/libcamera/camera_manager.cpp | 3 +--\n> src/v4l2/v4l2_camera.h | 2 +-\n> 6 files changed, 12 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..b893135f 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> @@ -205,6 +204,11 @@ ThreadData *ThreadData::current()\n> \treturn data;\n> }\n> \n> +/**\n> + * \\typedef ConditionVariable\n> + * \\brief An alias for std::condition_variable\n> + */\n> +\n> /**\n> * \\typedef Mutex\n> * \\brief An alias for std::mutex\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 2FD7EBDB13\n\tfor ;\n\tWed, 1 Dec 2021 10:06:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 49E2360720;\n\tWed, 1 Dec 2021 11:06:51 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7583E6011D\n\tfor ;\n\tWed, 1 Dec 2021 11:06:49 +0100 (CET)","from [192.168.1.106] (unknown [103.251.226.170])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 49D538AE;\n\tWed, 1 Dec 2021 11:06:48 +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=\"hmXiXNcO\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1638353209;\n\tbh=RJuyxsgGZU5UgVDM+ur4JFo+GYedQ00mgbFbHwtsza4=;\n\th=Subject:To:References:From:Date:In-Reply-To:From;\n\tb=hmXiXNcOT1Wz84rfatYjMaO43Ijs3+ojVGm5f9VgmtbZ1umPC4ilVs42MDS1Ls0Qn\n\tcX0ItlegwXyukXCRPkNxx+4d4NI224pci4Hxt89XwgDf3oiV1pvNBInr2frz0jyMTH\n\tNf+sJTi3Bm5Qf24FoyD+H27ip7uxic90ctS2Gsxk=","To":"Hirokazu Honda , libcamera-devel@lists.libcamera.org","References":"<20211201075348.3121186-1-hiroh@chromium.org>\n\t<20211201075348.3121186-2-hiroh@chromium.org>","From":"Umang Jain ","Message-ID":"","Date":"Wed, 1 Dec 2021 15:36:44 +0530","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.10.2","MIME-Version":"1.0","In-Reply-To":"<20211201075348.3121186-2-hiroh@chromium.org>","Content-Type":"text/plain; charset=utf-8; format=flowed","Content-Transfer-Encoding":"7bit","Content-Language":"en-US","Subject":"Re: [libcamera-devel] [PATCH v5 01/12] 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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]