[{"id":18132,"web_url":"https://patchwork.libcamera.org/comment/18132/","msgid":"","date":"2021-07-12T15:45:04","subject":"Re: [libcamera-devel] [PATCH 20/30] cam: Use std::unique_ptr<> to\n\tmanager CameraManager","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\n$SUBJECT: s/manager/manage/\n\nOn 07/07/2021 03:19, Laurent Pinchart wrote:\n> Store the CameraManager instance in a unique_ptr to simplify memory\n> management and avoid leaks.\n> \n> Signed-off-by: Laurent Pinchart \n> ---\n> src/cam/main.cpp | 13 +++----------\n> 1 file changed, 3 insertions(+), 10 deletions(-)\n> \n> diff --git a/src/cam/main.cpp b/src/cam/main.cpp\n> index 8ed5e841a1e9..2ef26353e712 100644\n> --- a/src/cam/main.cpp\n> +++ b/src/cam/main.cpp\n> @@ -25,7 +25,6 @@ class CamApp\n> {\n> public:\n> \tCamApp();\n> -\t~CamApp();\n> \n> \tstatic CamApp *instance();\n> \n> @@ -49,8 +48,8 @@ private:\n> \n> \tstatic CamApp *app_;\n> \tOptionsParser::Options options_;\n> -\tCameraManager *cm_;\n> \n> +\tstd::unique_ptr cm_;\n> \tstd::unique_ptr session_;\n> \n> \tEventLoop loop_;\n> @@ -59,16 +58,10 @@ private:\n> CamApp *CamApp::app_ = nullptr;\n> \n> CamApp::CamApp()\n> -\t: cm_(nullptr)\n\n\\o/\n\n> {\n> \tCamApp::app_ = this;\n> }\n> \n> -CamApp::~CamApp()\n> -{\n> -\tdelete cm_;\n\n\\o/\n\nGotta love these wins.\n\nReviewed-by: Kieran Bingham \n\n> -}\n> -\n> CamApp *CamApp::instance()\n> {\n> \treturn CamApp::app_;\n> @@ -82,7 +75,7 @@ int CamApp::init(int argc, char **argv)\n> \tif (ret < 0)\n> \t\treturn ret;\n> \n> -\tcm_ = new CameraManager();\n> +\tcm_ = std::make_unique();\n> \n> \tret = cm_->start();\n> \tif (ret) {\n> @@ -92,7 +85,7 @@ int CamApp::init(int argc, char **argv)\n> \t}\n> \n> \tif (options_.isSet(OptCamera)) {\n> -\t\tsession_ = std::make_unique(cm_, options_);\n> +\t\tsession_ = std::make_unique(cm_.get(), options_);\n> \t\tif (!session_->isValid()) {\n> \t\t\tstd::cout << \"Failed to create camera session\" << std::endl;\n> \t\t\tcleanup();\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 D5953C3226\n\tfor ;\n\tMon, 12 Jul 2021 15:45:08 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6B0D368526;\n\tMon, 12 Jul 2021 17:45:08 +0200 (CEST)","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 4445868513\n\tfor ;\n\tMon, 12 Jul 2021 17:45:07 +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 E2F66CC;\n\tMon, 12 Jul 2021 17:45:06 +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=\"TWKMbSAl\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626104707;\n\tbh=ZX0P9XklNKiwyr/Jq5elDL47KS9hpyi4rIGMeOSp+Jw=;\n\th=Subject:To:References:From:Date:In-Reply-To:From;\n\tb=TWKMbSAlFNggeTaEnzSPhj9tADR3QrT+PSfIDjdWHy0jEmHzHT1TKDT7lDqzgEX5Y\n\tFrY2EDDAcDMhOUR2TKVI+AhSAFj+aAomM5jvqouKAEsc8pyloTIpJzOW0SgzzfAfsv\n\tc70KcqhF9wm2HJlSAz1JF93y5CQdt40DqnuI/yUc=","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210707021941.20804-1-laurent.pinchart@ideasonboard.com>\n\t<20210707021941.20804-21-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Message-ID":"","Date":"Mon, 12 Jul 2021 16:45:04 +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-21-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH 20/30] cam: Use std::unique_ptr<> to\n\tmanager CameraManager","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\" "}}]