Patch Detail
Show a patch.
GET /api/1.1/patches/11883/?format=api
{ "id": 11883, "url": "https://patchwork.libcamera.org/api/1.1/patches/11883/?format=api", "web_url": "https://patchwork.libcamera.org/patch/11883/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20210409213815.356837-2-nfraprado@collabora.com>", "date": "2021-04-09T21:38:13", "name": "[libcamera-devel,RFC,1/3] lc-compliance: Test queuing more requests than hardware depth", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "3b6697007d93f9948dca1b20a822e29c84cc8cdb", "submitter": { "id": 84, "url": "https://patchwork.libcamera.org/api/1.1/people/84/?format=api", "name": "Nícolas F. R. A. Prado", "email": "nfraprado@collabora.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/11883/mbox/", "series": [ { "id": 1908, "url": "https://patchwork.libcamera.org/api/1.1/series/1908/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1908", "date": "2021-04-09T21:38:12", "name": "Add lc-compliance test for overflowing requests", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1908/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/11883/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/11883/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 24EEDBD16B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 9 Apr 2021 21:38:50 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E7DC3687F5;\n\tFri, 9 Apr 2021 23:38:49 +0200 (CEST)", "from bhuna.collabora.co.uk (bhuna.collabora.co.uk\n\t[IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 10F4E687F7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 9 Apr 2021 23:38:48 +0200 (CEST)", "from localhost.localdomain (unknown\n\t[IPv6:2804:14c:1a9:2978:fcbb:7aa5:bea8:667e])\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 124991F46A99;\n\tFri, 9 Apr 2021 22:38:45 +0100 (BST)" ], "From": "=?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= <nfraprado@collabora.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 9 Apr 2021 18:38:13 -0300", "Message-Id": "<20210409213815.356837-2-nfraprado@collabora.com>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20210409213815.356837-1-nfraprado@collabora.com>", "References": "<20210409213815.356837-1-nfraprado@collabora.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [RFC PATCH 1/3] lc-compliance: Test queuing more\n\trequests than hardware depth", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Cc": "Collabora Kernel ML <kernel@collabora.com>", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Currently some pipeline handlers allocate a fixed number of buffers for\ninternal usage, and if no internal buffer is available when a request is\nreceived, it fails [1].\n\nExtend the current lc-compliance tests so they also test sending more\nsimultaneous requests in order to detect that issue.\n\n[1] https://bugs.libcamera.org/show_bug.cgi?id=24\n\nSigned-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>\n---\n src/lc-compliance/simple_capture.cpp | 25 +++++++++++++++-------\n src/lc-compliance/simple_capture.h | 2 +-\n src/lc-compliance/single_stream.cpp | 31 ++++++++++++++++------------\n 3 files changed, 37 insertions(+), 21 deletions(-)", "diff": "diff --git a/src/lc-compliance/simple_capture.cpp b/src/lc-compliance/simple_capture.cpp\nindex 0ff720bfd005..61a8c0f40eef 100644\n--- a/src/lc-compliance/simple_capture.cpp\n+++ b/src/lc-compliance/simple_capture.cpp\n@@ -18,10 +18,13 @@ SimpleCapture::~SimpleCapture()\n {\n }\n \n-Results::Result SimpleCapture::configure(StreamRole role)\n+Results::Result SimpleCapture::configure(StreamRole role, unsigned int numBuffers)\n {\n \tconfig_ = camera_->generateConfiguration({ role });\n \n+\tif (numBuffers > 0)\n+\t\tconfig_->at(0).bufferCount = numBuffers;\n+\n \tif (config_->validate() != CameraConfiguration::Valid) {\n \t\tconfig_.reset();\n \t\treturn { Results::Fail, \"Configuration not valid\" };\n@@ -32,6 +35,10 @@ Results::Result SimpleCapture::configure(StreamRole role)\n \t\treturn { Results::Fail, \"Failed to configure camera\" };\n \t}\n \n+\tif (numBuffers > 0 && config_->at(0).bufferCount != numBuffers)\n+\t\treturn { Results::Skip,\n+\t\t\t\"Pipeline doesn't support overriding bufferCount\" };\n+\n \treturn { Results::Pass, \"Configure camera\" };\n }\n \n@@ -77,14 +84,14 @@ Results::Result SimpleCaptureBalanced::capture(unsigned int numRequests)\n \n \tStream *stream = config_->at(0).stream();\n \tconst std::vector<std::unique_ptr<FrameBuffer>> &buffers = allocator_->buffers(stream);\n+\t/* Cache buffers.size() before we destroy it in stop() */\n+\tunsigned int bufSize = buffers.size();\n \n \t/* No point in testing less requests then the camera depth. */\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+\tif (bufSize > numRequests) {\n \t\tstop();\n \n-\t\treturn { Results::Skip, \"Camera needs \" + std::to_string(buffers_size)\n+\t\treturn { Results::Skip, \"Camera needs \" + std::to_string(bufSize)\n \t\t\t+ \" requests, can't test only \" + std::to_string(numRequests) };\n \t}\n \n@@ -125,7 +132,8 @@ Results::Result SimpleCaptureBalanced::capture(unsigned int numRequests)\n \t\t\t\" request, wanted \" + std::to_string(captureLimit_) };\n \n \treturn { Results::Pass, \"Balanced capture of \" +\n-\t\tstd::to_string(numRequests) + \" requests\" };\n+\t\tstd::to_string(numRequests) + \" requests, using \" +\n+\t\tstd::to_string(bufSize) + \" buffers\"};\n }\n \n int SimpleCaptureBalanced::queueRequest(Request *request)\n@@ -197,7 +205,10 @@ Results::Result SimpleCaptureUnbalanced::capture(unsigned int numRequests)\n \tstop();\n \tdelete loop_;\n \n-\treturn { status ? Results::Fail : Results::Pass, \"Unbalanced capture of \" + std::to_string(numRequests) + \" requests\" };\n+\treturn { status ? Results::Fail :\n+\t\tResults::Pass, \"Unbalanced capture of \" +\n+\t\tstd::to_string(numRequests) + \" requests, using \" +\n+\t\tstd::to_string(buffers.size()) + \" buffers\"};\n }\n \n void SimpleCaptureUnbalanced::requestComplete(Request *request)\ndiff --git a/src/lc-compliance/simple_capture.h b/src/lc-compliance/simple_capture.h\nindex 4693c13404ce..f96fb3224290 100644\n--- a/src/lc-compliance/simple_capture.h\n+++ b/src/lc-compliance/simple_capture.h\n@@ -17,7 +17,7 @@\n class SimpleCapture\n {\n public:\n-\tResults::Result configure(libcamera::StreamRole role);\n+\tResults::Result configure(libcamera::StreamRole role, unsigned int numBuffers);\n \n protected:\n \tSimpleCapture(std::shared_ptr<libcamera::Camera> camera);\ndiff --git a/src/lc-compliance/single_stream.cpp b/src/lc-compliance/single_stream.cpp\nindex 60dacd63bf2b..9e33e231f4a9 100644\n--- a/src/lc-compliance/single_stream.cpp\n+++ b/src/lc-compliance/single_stream.cpp\n@@ -14,11 +14,11 @@ using namespace libcamera;\n \n Results::Result testRequestBalance(std::shared_ptr<Camera> camera,\n \t\t\t\t StreamRole role, unsigned int startCycles,\n-\t\t\t\t unsigned int numRequests)\n+\t\t\t\t unsigned int numRequests, unsigned int numBuffers)\n {\n \tSimpleCaptureBalanced capture(camera);\n \n-\tResults::Result ret = capture.configure(role);\n+\tResults::Result ret = capture.configure(role, numBuffers);\n \tif (ret.first != Results::Pass)\n \t\treturn ret;\n \n@@ -28,17 +28,17 @@ Results::Result testRequestBalance(std::shared_ptr<Camera> camera,\n \t\t\treturn ret;\n \t}\n \n-\treturn { Results::Pass, \"Balanced capture of \" +\n-\t\tstd::to_string(numRequests) + \" requests with \" +\n+\treturn { Results::Pass, ret.second + \" and \" +\n \t\tstd::to_string(startCycles) + \" start cycles\" };\n }\n \n Results::Result testRequestUnbalance(std::shared_ptr<Camera> camera,\n-\t\t\t\t StreamRole role, unsigned int numRequests)\n+\t\t\t\t StreamRole role, unsigned int numRequests,\n+\t\t\t\t unsigned int numBuffers)\n {\n \tSimpleCaptureUnbalanced capture(camera);\n \n-\tResults::Result ret = capture.configure(role);\n+\tResults::Result ret = capture.configure(role, numBuffers);\n \tif (ret.first != Results::Pass)\n \t\treturn ret;\n \n@@ -54,8 +54,10 @@ Results testSingleStream(std::shared_ptr<Camera> camera)\n \t\t{ \"viewfinder\", Viewfinder },\n \t};\n \tstatic const std::vector<unsigned int> numRequests = { 1, 2, 3, 5, 8, 13, 21, 34, 55, 89 };\n+\t/* 0 means default */\n+\tstatic const std::vector<unsigned int> numBuffers = { 0, 5, 8 };\n \n-\tResults results(numRequests.size() * roles.size() * 3);\n+\tResults results(numRequests.size() * roles.size() * numBuffers.size() * 3);\n \n \tfor (const auto &role : roles) {\n \t\tstd::cout << \"= Test role \" << role.first << std::endl;\n@@ -67,8 +69,9 @@ Results testSingleStream(std::shared_ptr<Camera> camera)\n \t\t * complete N requests to the application.\n \t\t */\n \t\tstd::cout << \"* Test single capture cycles\" << std::endl;\n-\t\tfor (unsigned int num : numRequests)\n-\t\t\tresults.add(testRequestBalance(camera, role.second, 1, num));\n+\t\tfor (unsigned int buf : numBuffers)\n+\t\t\tfor (unsigned int num : numRequests)\n+\t\t\t\tresults.add(testRequestBalance(camera, role.second, 1, num, buf));\n \n \t\t/*\n \t\t * Test multiple start/stop cycles\n@@ -78,8 +81,9 @@ Results testSingleStream(std::shared_ptr<Camera> camera)\n \t\t * error path but is only tested by single-capture applications.\n \t\t */\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+\t\tfor (unsigned int buf : numBuffers)\n+\t\t\tfor (unsigned int num : numRequests)\n+\t\t\t\tresults.add(testRequestBalance(camera, role.second, 3, num, buf));\n \n \t\t/*\n \t\t * Test unbalanced stop\n@@ -89,8 +93,9 @@ Results testSingleStream(std::shared_ptr<Camera> camera)\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\tfor (unsigned int buf : numBuffers)\n+\t\t\tfor (unsigned int num : numRequests)\n+\t\t\t\tresults.add(testRequestUnbalance(camera, role.second, num, buf));\n \t}\n \n \treturn results;\n", "prefixes": [ "libcamera-devel", "RFC", "1/3" ] }