{"id":12748,"url":"https://patchwork.libcamera.org/api/patches/12748/?format=json","web_url":"https://patchwork.libcamera.org/patch/12748/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210629151218.248650-3-nfraprado@collabora.com>","date":"2021-06-29T15:12:15","name":"[libcamera-devel,v10,2/5] lc-compliance: Make SimpleCapture::stop() idempotent","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4bd1937cc4e283cd0720a79c2203be846bd70ae6","submitter":{"id":84,"url":"https://patchwork.libcamera.org/api/people/84/?format=json","name":"Nícolas F. R. A. Prado","email":"nfraprado@collabora.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12748/mbox/","series":[{"id":2192,"url":"https://patchwork.libcamera.org/api/series/2192/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2192","date":"2021-06-29T15:12:13","name":"lc-compliance: Refactor using Googletest","version":10,"mbox":"https://patchwork.libcamera.org/series/2192/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12748/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12748/checks/","tags":{},"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 8E5CFC321F\n\tfor ;\n\tTue, 29 Jun 2021 15:13:11 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5D76B684E9;\n\tTue, 29 Jun 2021 17:13:11 +0200 (CEST)","from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 34B2B684E8\n\tfor ;\n\tTue, 29 Jun 2021 17:13:10 +0200 (CEST)","from localhost.localdomain (unknown\n\t[IPv6:2804:14c:1a9:2434:bd70:78a1:919c:f01a])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits))\n\t(No client certificate requested) (Authenticated sender: nfraprado)\n\tby bhuna.collabora.co.uk (Postfix) with ESMTPSA id 8B1EA1F430AA;\n\tTue, 29 Jun 2021 16:13:08 +0100 (BST)"],"From":"=?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 29 Jun 2021 12:12:15 -0300","Message-Id":"<20210629151218.248650-3-nfraprado@collabora.com>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20210629151218.248650-1-nfraprado@collabora.com>","References":"<20210629151218.248650-1-nfraprado@collabora.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v10 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":"kernel@collabora.com, =?utf-8?q?Andr=C3=A9_Almeida?=\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Make SimpleCapture::stop() be able to be called multiple times and at\nany point so that it can be called from the destructor and an assert\nfailure can return immediately.\n\nSigned-off-by: Nícolas F. R. A. Prado \nReviewed-by: Laurent Pinchart \nReviewed-by: Jacopo Mondi \n---\nChanges in v10:\n- Thanks to Jacopo:\n - Updated copyright header\n\nNo changes in v9\n\nNo changes in v8\n\nChanges in v7:\n- Thanks to Jacopo:\n - Moved the check for buffers allocated to the beginning of\n SimpleCapture::stop()\n\nNo changes in v6\n\nNo changes in v5\n\nNo changes in v4\n\nNo changes in v3\n\nChanges in v2:\n- Suggested by Laurent:\n - Fixed code style\n\n src/lc-compliance/simple_capture.cpp | 32 ++++++++++------------------\n 1 file changed, 11 insertions(+), 21 deletions(-)","diff":"diff --git a/src/lc-compliance/simple_capture.cpp b/src/lc-compliance/simple_capture.cpp\nindex 64e862a08e3a..635c96e5e5c8 100644\n--- a/src/lc-compliance/simple_capture.cpp\n+++ b/src/lc-compliance/simple_capture.cpp\n@@ -1,6 +1,6 @@\n /* SPDX-License-Identifier: GPL-2.0-or-later */\n /*\n- * Copyright (C) 2020, Google Inc.\n+ * Copyright (C) 2020-2021, Google Inc.\n *\n * simple_capture.cpp - Simple capture helper\n */\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,14 @@ Results::Result SimpleCapture::start()\n \n void SimpleCapture::stop()\n {\n-\tStream *stream = config_->at(0).stream();\n+\tif (!config_ || !allocator_->allocated())\n+\t\treturn;\n \n \tcamera_->stop();\n \n \tcamera_->requestCompleted.disconnect(this, &SimpleCapture::requestComplete);\n \n+\tStream *stream = config_->at(0).stream();\n \tallocator_->free(stream);\n }\n \n@@ -84,7 +87,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 +100,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 +171,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}\n","prefixes":["libcamera-devel","v10","2/5"]}