From patchwork Thu Apr 15 21:48:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 11955 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 16E2CBD233 for ; Thu, 15 Apr 2021 21:48:55 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D864668814; Thu, 15 Apr 2021 23:48:54 +0200 (CEST) Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A82A8605AE for ; Thu, 15 Apr 2021 23:48:53 +0200 (CEST) Received: from localhost.localdomain (unknown [IPv6:2804:14c:1a9:2978:77f9:56be:21f2:e14e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: nfraprado) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id BBED91F432E1; Thu, 15 Apr 2021 22:48:51 +0100 (BST) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= To: libcamera-devel@lists.libcamera.org Date: Thu, 15 Apr 2021 18:48:11 -0300 Message-Id: <20210415214812.234656-2-nfraprado@collabora.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210415214812.234656-1-nfraprado@collabora.com> References: <20210415214812.234656-1-nfraprado@collabora.com> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH 1/2] lc-compliance: Make SimpleCapture::stop() idempotent X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Make SimpleCapture::stop() be able to be called multiple times and at any point so that it can be called from the destructor and an assert failure can return immeadiately. Signed-off-by: Nícolas F. R. A. Prado --- src/lc-compliance/simple_capture.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/lc-compliance/simple_capture.cpp b/src/lc-compliance/simple_capture.cpp index 0ff720bfd005..c20444aff9ba 100644 --- a/src/lc-compliance/simple_capture.cpp +++ b/src/lc-compliance/simple_capture.cpp @@ -16,6 +16,7 @@ SimpleCapture::SimpleCapture(std::shared_ptr camera) SimpleCapture::~SimpleCapture() { + stop(); } Results::Result SimpleCapture::configure(StreamRole role) @@ -51,12 +52,16 @@ Results::Result SimpleCapture::start() Results::Result SimpleCapture::stop() { + if (!config_) + return; Stream *stream = config_->at(0).stream(); camera_->stop(); camera_->requestCompleted.disconnect(this, &SimpleCapture::requestComplete); + if (!allocator_->allocated()) + return; allocator_->free(stream); return { Results::Pass, "Stopped camera" }; @@ -82,7 +87,6 @@ Results::Result SimpleCaptureBalanced::capture(unsigned int numRequests) if (buffers.size() > numRequests) { /* Cache buffers.size() before we destroy it in stop() */ int buffers_size = buffers.size(); - stop(); return { Results::Skip, "Camera needs " + std::to_string(buffers_size) + " requests, can't test only " + std::to_string(numRequests) }; @@ -97,17 +101,14 @@ Results::Result SimpleCaptureBalanced::capture(unsigned int numRequests) for (const std::unique_ptr &buffer : buffers) { std::unique_ptr request = camera_->createRequest(); if (!request) { - stop(); return { Results::Fail, "Can't create request" }; } if (request->addBuffer(stream, buffer.get())) { - stop(); return { Results::Fail, "Can't set buffer for request" }; } if (queueRequest(request.get()) < 0) { - stop(); return { Results::Fail, "Failed to queue request" }; } @@ -174,17 +175,14 @@ Results::Result SimpleCaptureUnbalanced::capture(unsigned int numRequests) for (const std::unique_ptr &buffer : buffers) { std::unique_ptr request = camera_->createRequest(); if (!request) { - stop(); return { Results::Fail, "Can't create request" }; } if (request->addBuffer(stream, buffer.get())) { - stop(); return { Results::Fail, "Can't set buffer for request" }; } if (camera_->queueRequest(request.get()) < 0) { - stop(); return { Results::Fail, "Failed to queue request" }; }