[{"id":16032,"web_url":"https://patchwork.libcamera.org/comment/16032/","msgid":"","date":"2021-03-29T23:41:12","subject":"Re: [libcamera-devel] [PATCH v4 3/3] lc-compliance: Add test\n\tstopping single stream with requests queued","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nThank you for the patch.\n\nOn Mon, Mar 29, 2021 at 07:02:50PM +0200, Niklas Söderlund wrote:\n> Add a test which stops a camera while requests are still queued. This\n> intends to test cleanup paths where requests are dequeued from video\n> devices in an uncompleted state.\n> \n> Signed-off-by: Niklas Söderlund \n> Acked-by: Kieran Bingham \n> Tested-by: Kieran Bingham \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> * Changes since v4\n> - Update commit message.\n> ---\n> src/lc-compliance/simple_capture.cpp | 63 ++++++++++++++++++++++++++++\n> src/lc-compliance/simple_capture.h | 14 +++++++\n> src/lc-compliance/single_stream.cpp | 25 ++++++++++-\n> 3 files changed, 101 insertions(+), 1 deletion(-)\n> \n> diff --git a/src/lc-compliance/simple_capture.cpp b/src/lc-compliance/simple_capture.cpp\n> index 389dc11fc60225c5..0ff720bfd0052e45 100644\n> --- a/src/lc-compliance/simple_capture.cpp\n> +++ b/src/lc-compliance/simple_capture.cpp\n> @@ -149,3 +149,66 @@ void SimpleCaptureBalanced::requestComplete(Request *request)\n> \tif (queueRequest(request))\n> \t\tloop_->exit(-EINVAL);\n> }\n> +\n> +/* SimpleCaptureUnbalanced */\n> +\n> +SimpleCaptureUnbalanced::SimpleCaptureUnbalanced(std::shared_ptr camera)\n> +\t: SimpleCapture(camera)\n> +{\n> +}\n> +\n> +Results::Result SimpleCaptureUnbalanced::capture(unsigned int numRequests)\n> +{\n> +\tResults::Result ret = start();\n> +\tif (ret.first != Results::Pass)\n> +\t\treturn ret;\n> +\n> +\tStream *stream = config_->at(0).stream();\n> +\tconst std::vector> &buffers = allocator_->buffers(stream);\n> +\n> +\tcaptureCount_ = 0;\n> +\tcaptureLimit_ = numRequests;\n> +\n> +\t/* Queue the recommended number of reqeuests. */\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\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\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\t\treturn { Results::Fail, \"Failed to queue request\" };\n> +\t\t}\n> +\n> +\t\trequests.push_back(std::move(request));\n> +\t}\n> +\n> +\t/* Run capture session. */\n> +\tloop_ = new EventLoop();\n> +\tint status = loop_->exec();\n> +\tstop();\n> +\tdelete loop_;\n> +\n> +\treturn { status ? Results::Fail : Results::Pass, \"Unbalanced capture of \" + std::to_string(numRequests) + \" requests\" };\n> +}\n> +\n> +void SimpleCaptureUnbalanced::requestComplete(Request *request)\n> +{\n> +\tcaptureCount_++;\n> +\tif (captureCount_ >= captureLimit_) {\n> +\t\tloop_->exit(0);\n> +\t\treturn;\n> +\t}\n> +\n> +\trequest->reuse(Request::ReuseBuffers);\n> +\tif (camera_->queueRequest(request))\n> +\t\tloop_->exit(-EINVAL);\n> +}\n> diff --git a/src/lc-compliance/simple_capture.h b/src/lc-compliance/simple_capture.h\n> index 3a6afc538c623050..4693c13404cee7d2 100644\n> --- a/src/lc-compliance/simple_capture.h\n> +++ b/src/lc-compliance/simple_capture.h\n> @@ -51,4 +51,18 @@ private:\n> \tunsigned int captureLimit_;\n> };\n> \n> +class SimpleCaptureUnbalanced : public SimpleCapture\n> +{\n> +public:\n> +\tSimpleCaptureUnbalanced(std::shared_ptr camera);\n> +\n> +\tResults::Result capture(unsigned int numRequests);\n> +\n> +private:\n> +\tvoid requestComplete(libcamera::Request *request) override;\n> +\n> +\tunsigned int captureCount_;\n> +\tunsigned int captureLimit_;\n> +};\n> +\n> #endif /* __LC_COMPLIANCE_SIMPLE_CAPTURE_H__ */\n> diff --git a/src/lc-compliance/single_stream.cpp b/src/lc-compliance/single_stream.cpp\n> index e9ca1d58ecb959cd..8318b42f42d640aa 100644\n> --- a/src/lc-compliance/single_stream.cpp\n> +++ b/src/lc-compliance/single_stream.cpp\n> @@ -33,6 +33,18 @@ Results::Result testRequestBalance(std::shared_ptr camera,\n> \t\tstd::to_string(startCycles) + \" start cycles\" };\n> }\n> \n> +Results::Result testRequestUnbalance(std::shared_ptr camera,\n> +\t\t\t\t StreamRole role, unsigned int numRequests)\n> +{\n> +\tSimpleCaptureUnbalanced capture(camera);\n> +\n> +\tResults::Result ret = capture.configure(role);\n> +\tif (ret.first != Results::Pass)\n> +\t\treturn ret;\n> +\n> +\treturn capture.capture(numRequests);\n> +}\n> +\n> Results testSingleStream(std::shared_ptr camera)\n> {\n> \tstatic const std::vector> roles = {\n> @@ -43,7 +55,7 @@ Results testSingleStream(std::shared_ptr camera)\n> \t};\n> \tstatic const std::vector numRequests = { 1, 2, 3, 5, 8, 13, 21, 34, 55, 89 };\n> \n> -\tResults results(numRequests.size() * roles.size() * 2);\n> +\tResults results(numRequests.size() * roles.size() * 3);\n> \n> \tfor (const auto &role : roles) {\n> \t\tstd::cout << \"= Test role \" << role.first << std::endl;\n> @@ -68,6 +80,17 @@ Results testSingleStream(std::shared_ptr camera)\n> \t\tstd::cout << \"* Test multiple start/stop cycles\" << std::endl;\n> \t\tfor (unsigned int num : numRequests)\n> \t\t\tresults.add(testRequestBalance(camera, role.second, 3, num));\n> +\n> +\t\t/*\n> +\t\t * Test unbalanced stop\n> +\t\t *\n> +\t\t * Makes sure the camera supports a stop with requests queued.\n> +\t\t * Example failure is a camera that does not handle cancelation\n> +\t\t * of buffers coming back from the video device while stopping.\n> +\t\t */\n> +\t\tstd::cout << \"* Test unbalanced stop\" << std::endl;\n> +\t\tfor (unsigned int num : numRequests)\n> +\t\t\tresults.add(testRequestUnbalance(camera, role.second, num));\n> \t}\n> \n> \treturn results;","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 47322C32EA\n\tfor ;\n\tMon, 29 Mar 2021 23:42:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9FE6568784;\n\tTue, 30 Mar 2021 01:41:59 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8982B602D7\n\tfor ;\n\tTue, 30 Mar 2021 01:41:58 +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 7C484DD;\n\tTue, 30 Mar 2021 01:41:57 +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=\"k0AAPUuS\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1617061318;\n\tbh=w+MIhGVRJcRL22JlASMwmYf9iBOmmTEEgZ0L9da7Vi0=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=k0AAPUuS9G5Kic3quP0uwnvBCzfUmWeZXnmRmGIlGLJd/RVtbh6vCid9SnhJdjVBF\n\tsFp3/B7bEXS046JYRC6g9KlQH0nQUi5c8g1V8+zT2HR9G5uStHi4c1b7Hba06b0Jf8\n\tBf7ZZQYq0l+sk67Ix+Z8ez0+Qc4NnKEURNV5t4dE=","Date":"Tue, 30 Mar 2021 02:41:12 +0300","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Message-ID":"","References":"<20210329170250.937120-1-niklas.soderlund@ragnatech.se>\n\t<20210329170250.937120-4-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210329170250.937120-4-niklas.soderlund@ragnatech.se>","Subject":"Re: [libcamera-devel] [PATCH v4 3/3] lc-compliance: Add test\n\tstopping single stream with requests queued","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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]