[{"id":18138,"web_url":"https://patchwork.libcamera.org/comment/18138/","msgid":"","date":"2021-07-12T16:03:20","subject":"Re: [libcamera-devel] [PATCH 26/30] cam: Reorganize run() function\n\tand merge the two event loops","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 07/07/2021 03:19, Laurent Pinchart wrote:\n> Reorganize the run() function to make it more readable, and merge the\n> two event loops into one as capture and hotplug monitoring don't have to\n> be mutually exclusive.\n> \n> Signed-off-by: Laurent Pinchart \n> ---\n> src/cam/main.cpp | 60 ++++++++++++++++++++++++------------------------\n> 1 file changed, 30 insertions(+), 30 deletions(-)\n> \n> diff --git a/src/cam/main.cpp b/src/cam/main.cpp\n> index 380c14e02cf0..a3f19d0fa61b 100644\n> --- a/src/cam/main.cpp\n> +++ b/src/cam/main.cpp\n> @@ -5,6 +5,7 @@\n> * main.cpp - cam - The libcamera swiss army knife\n> */\n> \n> +#include \n> #include \n> #include \n> #include \n> @@ -48,6 +49,7 @@ private:\n> \n> \tstd::unique_ptr cm_;\n> \n> +\tstd::atomic_uint loopUsers_;\n> \tEventLoop loop_;\n> };\n> \n> @@ -164,14 +166,15 @@ void CamApp::cameraRemoved(std::shared_ptr cam)\n> \n> void CamApp::captureDone()\n> {\n> -\tEventLoop::instance()->exit(0);\n> +\tif (--loopUsers_ == 0)\n\nAha, now I see how we're getting multi-session too.\n\nReviewed-by: Kieran Bingham \n\n> +\t\tEventLoop::instance()->exit(0);\n> }\n> \n> int CamApp::run()\n> {\n> -\tstd::unique_ptr session;\n> \tint ret;\n> \n> +\t/* 1. List all cameras. */\n> \tif (options_.isSet(OptList)) {\n> \t\tstd::cout << \"Available cameras:\" << std::endl;\n> \n> @@ -182,6 +185,9 @@ int CamApp::run()\n> \t\t}\n> \t}\n> \n> +\t/* 2. Create the camera session. */\n> +\tstd::unique_ptr session;\n> +\n> \tif (options_.isSet(OptCamera)) {\n> \t\tsession = std::make_unique(cm_.get(), options_);\n> \t\tif (!session->isValid()) {\n> @@ -195,36 +201,25 @@ int CamApp::run()\n> \t\tsession->captureDone.connect(this, &CamApp::captureDone);\n> \t}\n> \n> -\tif (options_.isSet(OptListControls)) {\n> +\t/* 3. Print camera information. */\n> +\tif (options_.isSet(OptListControls) ||\n> +\t options_.isSet(OptListProperties) ||\n> +\t options_.isSet(OptInfo)) {\n> \t\tif (!session) {\n> -\t\t\tstd::cout << \"Cannot list controls without a camera\"\n> +\t\t\tstd::cout << \"Cannot print camera information without a camera\"\n> \t\t\t\t << std::endl;\n> \t\t\treturn -EINVAL;\n> \t\t}\n> \n> -\t\tsession->listControls();\n> -\t}\n> -\n> -\tif (options_.isSet(OptListProperties)) {\n> -\t\tif (!session) {\n> -\t\t\tstd::cout << \"Cannot list properties without a camera\"\n> -\t\t\t\t << std::endl;\n> -\t\t\treturn -EINVAL;\n> -\t\t}\n> -\n> -\t\tsession->listProperties();\n> -\t}\n> -\n> -\tif (options_.isSet(OptInfo)) {\n> -\t\tif (!session) {\n> -\t\t\tstd::cout << \"Cannot print stream information without a camera\"\n> -\t\t\t\t << std::endl;\n> -\t\t\treturn -EINVAL;\n> -\t\t}\n> -\n> -\t\tsession->infoConfiguration();\n> +\t\tif (options_.isSet(OptListControls))\n> +\t\t\tsession->listControls();\n> +\t\tif (options_.isSet(OptListProperties))\n> +\t\t\tsession->listProperties();\n> +\t\tif (options_.isSet(OptInfo))\n> +\t\t\tsession->infoConfiguration();\n> \t}\n> \n> +\t/* 4. Start capture. */\n> \tif (options_.isSet(OptCapture)) {\n> \t\tif (!session) {\n> \t\t\tstd::cout << \"Can't capture without a camera\" << std::endl;\n> @@ -237,12 +232,10 @@ int CamApp::run()\n> \t\t\treturn ret;\n> \t\t}\n> \n> -\t\tloop_.exec();\n> -\n> -\t\tsession->stop();\n> -\t\treturn 0;\n> +\t\tloopUsers_++;\n> \t}\n> \n> +\t/* 5. Enable hotplug monitoring. */\n> \tif (options_.isSet(OptMonitor)) {\n> \t\tstd::cout << \"Monitoring new hotplug and unplug events\" << std::endl;\n> \t\tstd::cout << \"Press Ctrl-C to interrupt\" << std::endl;\n> @@ -250,9 +243,16 @@ int CamApp::run()\n> \t\tcm_->cameraAdded.connect(this, &CamApp::cameraAdded);\n> \t\tcm_->cameraRemoved.connect(this, &CamApp::cameraRemoved);\n> \n> -\t\tloop_.exec();\n> +\t\tloopUsers_++;\n> \t}\n> \n> +\tif (loopUsers_)\n> +\t\tloop_.exec();\n> +\n> +\t/* 6. Stop capture. */\n> +\tif (options_.isSet(OptCapture))\n> +\t\tsession->stop();\n> +\n> \treturn 0;\n> }\n> \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 56C79C3226\n\tfor ;\n\tMon, 12 Jul 2021 16:03:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A19CF68526;\n\tMon, 12 Jul 2021 18:03:24 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BF9A968513\n\tfor ;\n\tMon, 12 Jul 2021 18:03:23 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 40770CC;\n\tMon, 12 Jul 2021 18:03:23 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"FOQaKFRH\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626105803;\n\tbh=fPgm0UENgGut0ZOSmK255iJI/VN97Bl/BVeu3nUsxzY=;\n\th=Subject:To:References:From:Date:In-Reply-To:From;\n\tb=FOQaKFRHDudvk3FceyV4OwZjHPeV9fWxodNeWZHSiIDcxa1/dQ7DSgnxetID8pYf4\n\tgOc8Z3hw6oU8p2M9xxEfqD8Spya/mu16+kBbDRNiA0G1eVyeTiXLjb+1xhGljETwPT\n\tIF5xoQMXV+KYdbTqYsCzmxp4vNQAzajxraY0uHck=","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210707021941.20804-1-laurent.pinchart@ideasonboard.com>\n\t<20210707021941.20804-27-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Message-ID":"","Date":"Mon, 12 Jul 2021 17:03:20 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.11.0","MIME-Version":"1.0","In-Reply-To":"<20210707021941.20804-27-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH 26/30] cam: Reorganize run() function\n\tand merge the two event loops","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\" "}}]