[{"id":17143,"web_url":"https://patchwork.libcamera.org/comment/17143/","msgid":"","date":"2021-05-23T20:34:41","subject":"Re: [libcamera-devel] [PATCH v4 2/5] lc-compliance: Make\n\tSimpleCapture::stop() idempotent","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Nícolas,\n\nThank you for the patch.\n\nOn Fri, May 21, 2021 at 10:30:51AM -0300, Nícolas F. R. A. Prado wrote:\n> Make SimpleCapture::stop() be able to be called multiple times and at\n> any point so that it can be called from the destructor and an assert\n> failure can return immediately.\n> \n> Signed-off-by: Nícolas F. R. A. Prado \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> No changes in v4\n> \n> No changes in v3\n> \n> Changes in v2:\n> - Suggested by Laurent:\n> - Fixed code style\n> \n> src/lc-compliance/simple_capture.cpp | 33 +++++++++++-----------------\n> 1 file changed, 13 insertions(+), 20 deletions(-)\n> \n> diff --git a/src/lc-compliance/simple_capture.cpp b/src/lc-compliance/simple_capture.cpp\n> index 64e862a08e3a..f90fe6d0f9aa 100644\n> --- a/src/lc-compliance/simple_capture.cpp\n> +++ b/src/lc-compliance/simple_capture.cpp\n> @@ -17,6 +17,7 @@ SimpleCapture::SimpleCapture(std::shared_ptr camera)\n> \n> SimpleCapture::~SimpleCapture()\n> {\n> +\tstop();\n> }\n> \n> Results::Result SimpleCapture::configure(StreamRole role)\n> @@ -55,12 +56,17 @@ Results::Result SimpleCapture::start()\n> \n> void SimpleCapture::stop()\n> {\n> -\tStream *stream = config_->at(0).stream();\n> +\tif (!config_)\n> +\t\treturn;\n> \n> \tcamera_->stop();\n> \n> \tcamera_->requestCompleted.disconnect(this, &SimpleCapture::requestComplete);\n> \n> +\tif (!allocator_->allocated())\n> +\t\treturn;\n> +\n> +\tStream *stream = config_->at(0).stream();\n> \tallocator_->free(stream);\n> }\n> \n> @@ -84,7 +90,6 @@ Results::Result SimpleCaptureBalanced::capture(unsigned int numRequests)\n> \tif (buffers.size() > numRequests) {\n> \t\t/* Cache buffers.size() before we destroy it in stop() */\n> \t\tint buffers_size = buffers.size();\n> -\t\tstop();\n> \n> \t\treturn { Results::Skip, \"Camera needs \" + std::to_string(buffers_size)\n> \t\t\t+ \" requests, can't test only \" + std::to_string(numRequests) };\n> @@ -98,20 +103,14 @@ Results::Result SimpleCaptureBalanced::capture(unsigned int numRequests)\n> \tstd::vector> requests;\n> \tfor (const std::unique_ptr &buffer : buffers) {\n> \t\tstd::unique_ptr request = camera_->createRequest();\n> -\t\tif (!request) {\n> -\t\t\tstop();\n> +\t\tif (!request)\n> \t\t\treturn { Results::Fail, \"Can't create request\" };\n> -\t\t}\n> \n> -\t\tif (request->addBuffer(stream, buffer.get())) {\n> -\t\t\tstop();\n> +\t\tif (request->addBuffer(stream, buffer.get()))\n> \t\t\treturn { Results::Fail, \"Can't set buffer for request\" };\n> -\t\t}\n> \n> -\t\tif (queueRequest(request.get()) < 0) {\n> -\t\t\tstop();\n> +\t\tif (queueRequest(request.get()) < 0)\n> \t\t\treturn { Results::Fail, \"Failed to queue request\" };\n> -\t\t}\n> \n> \t\trequests.push_back(std::move(request));\n> \t}\n> @@ -175,20 +174,14 @@ Results::Result SimpleCaptureUnbalanced::capture(unsigned int numRequests)\n> \tstd::vector> requests;\n> \tfor (const std::unique_ptr &buffer : buffers) {\n> \t\tstd::unique_ptr request = camera_->createRequest();\n> -\t\tif (!request) {\n> -\t\t\tstop();\n> +\t\tif (!request)\n> \t\t\treturn { Results::Fail, \"Can't create request\" };\n> -\t\t}\n> \n> -\t\tif (request->addBuffer(stream, buffer.get())) {\n> -\t\t\tstop();\n> +\t\tif (request->addBuffer(stream, buffer.get()))\n> \t\t\treturn { Results::Fail, \"Can't set buffer for request\" };\n> -\t\t}\n> \n> -\t\tif (camera_->queueRequest(request.get()) < 0) {\n> -\t\t\tstop();\n> +\t\tif (camera_->queueRequest(request.get()) < 0)\n> \t\t\treturn { Results::Fail, \"Failed to queue request\" };\n> -\t\t}\n> \n> \t\trequests.push_back(std::move(request));\n> \t}","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 16E9BC3201\n\tfor ;\n\tSun, 23 May 2021 20:34:46 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CD67E6891B;\n\tSun, 23 May 2021 22:34:45 +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 088F7601A9\n\tfor ;\n\tSun, 23 May 2021 22:34:45 +0200 (CEST)","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 8F0722A8;\n\tSun, 23 May 2021 22:34:44 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"nK2PkBuA\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1621802084;\n\tbh=xnUp5YRjuvZVgtH+febP8vhue8SXF3xPH5esCWT3HKs=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=nK2PkBuAu4Qcaqq6+UaTR3VzeaKs6jR4d6nDQAktZxj+cbiyOYRw2Nlus627F8M7D\n\tz+Bx0zDfiLfuXTZeJDN425ca6jr4OezTe9sZYnTQd8ECsvjn/vKpEuYgHD4cN7HeG0\n\tc8jiMA1AVak8S1V8794Ij9apOEKLZqcmCT4UUyWQ=","Date":"Sun, 23 May 2021 23:34:41 +0300","From":"Laurent Pinchart ","To":"=?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4=?= Prado ","Message-ID":"","References":"<20210521133054.274502-1-nfraprado@collabora.com>\n\t<20210521133054.274502-3-nfraprado@collabora.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20210521133054.274502-3-nfraprado@collabora.com>","Subject":"Re: [libcamera-devel] [PATCH v4 2/5] lc-compliance: Make\n\tSimpleCapture::stop() idempotent","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, kernel@collabora.com, =?utf-8?q?A?=\n\t=?utf-8?b?bmRyw6k=?= Almeida ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]