Patch Detail
Show a patch.
GET /api/patches/21824/?format=api
{ "id": 21824, "url": "https://patchwork.libcamera.org/api/patches/21824/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21824/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20241106201721.1624461-3-mzamazal@redhat.com>", "date": "2024-11-06T20:17:20", "name": "[v6,2/3] libcamera: simple: Track requests in conversionQueue_", "commit_ref": "2cc52d68352b9729c8c285805bcbe8313e505ddb", "pull_url": null, "state": "accepted", "archived": false, "hash": "28fe68232aa92325bf4a352ca709e4ce3bdf558e", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21824/mbox/", "series": [ { "id": 4774, "url": "https://patchwork.libcamera.org/api/series/4774/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4774", "date": "2024-11-06T20:17:18", "name": "Clean up pending requests on stop in software ISP", "version": 6, "mbox": "https://patchwork.libcamera.org/series/4774/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21824/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21824/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 B5F43BDB13\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 6 Nov 2024 20:17:42 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 63DA365461;\n\tWed, 6 Nov 2024 21:17:42 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DFB3065456\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 6 Nov 2024 21:17:40 +0100 (CET)", "from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-489-isQeNduvPbKLUEeiQhYAnA-1;\n\tWed, 06 Nov 2024 15:17:36 -0500", "from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.15])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 7505D1955EE9; Wed, 6 Nov 2024 20:17:35 +0000 (UTC)", "from nuthatch.redhat.com (unknown [10.45.224.4])\n\tby mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 16F081956088; Wed, 6 Nov 2024 20:17:32 +0000 (UTC)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"c4bAgc9X\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1730924259;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=gToRVLvkzVjHKyRR7W5wHInMORe1zLI30hDb4yfyaFk=;\n\tb=c4bAgc9X66koI0cngCt3/xUsxUOewOX7E1V8sPCOTGw2QSKkf0eNd2MAgz1abeLD0pQmN3\n\tfWhcgaPhMw38gH8Xsnjvx4UvghbEjQFKM6t/PO5Fq3Q2sbBBZKK4zUWBOllQ43lG/NYuGS\n\tPvpE3y5wRnVcu9TkkKh5wfemE6c+wdo=", "X-MC-Unique": "isQeNduvPbKLUEeiQhYAnA-1", "X-Mimecast-MFC-AGG-ID": "isQeNduvPbKLUEeiQhYAnA", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>, robert.mader@posteo.de,\n\tkieran.bingham@ideasonboard.com, laurent.pinchart@ideasonboard.com,\n\thdegoede@redhat.com", "Subject": "[PATCH v6 2/3] libcamera: simple: Track requests in conversionQueue_", "Date": "Wed, 6 Nov 2024 21:17:20 +0100", "Message-ID": "<20241106201721.1624461-3-mzamazal@redhat.com>", "In-Reply-To": "<20241106201721.1624461-1-mzamazal@redhat.com>", "References": "<20241106201721.1624461-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.0 on 10.30.177.15", "X-Mimecast-Spam-Score": "0", "X-Mimecast-MFC-PROC-ID": "E92kG_6oBJuoW3E42RsuiDiS8mqSECnsP514dfWjx60_1730924255", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"; x-default=true", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Simple pipeline retrieves the requests to complete from the\nconversionQueue_. This patch stores the requests in conversionQueue_\nexplicitly. This explicit tracking is supposed to be preferred to\nimplicit retrieval and it simplifies the completion code a bit here and\nin the followup patch that adds request cleanup on stop.\n\nThe change as implemented assumes that all the buffers in each of the\nconversionQueue_ elements point to the same request, the one specified.\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\nTested-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nReviewed-by: Hans de Goede <hdegoede@redhat.com>\n---\n src/libcamera/pipeline/simple/simple.cpp | 26 ++++++++++++------------\n 1 file changed, 13 insertions(+), 13 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 67f583b8a..13c0a1891 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -282,7 +282,11 @@ public:\n \tstd::unique_ptr<DelayedControls> delayedCtrls_;\n \n \tstd::vector<std::unique_ptr<FrameBuffer>> conversionBuffers_;\n-\tstd::queue<std::map<const Stream *, FrameBuffer *>> conversionQueue_;\n+\tstruct RequestOutputs {\n+\t\tRequest *request;\n+\t\tstd::map<const Stream *, FrameBuffer *> outputs;\n+\t};\n+\tstd::queue<RequestOutputs> conversionQueue_;\n \tbool useConversion_;\n \n \tstd::unique_ptr<Converter> converter_;\n@@ -808,16 +812,12 @@ void SimpleCameraData::bufferReady(FrameBuffer *buffer)\n \t\tif (conversionQueue_.empty())\n \t\t\treturn;\n \n-\t\tRequest *request = nullptr;\n-\t\tfor (auto &item : conversionQueue_.front()) {\n-\t\t\tFrameBuffer *outputBuffer = item.second;\n-\t\t\trequest = outputBuffer->request();\n-\t\t\tpipe->completeBuffer(request, outputBuffer);\n-\t\t}\n+\t\tconst RequestOutputs &outputs = conversionQueue_.front();\n+\t\tfor (auto &[stream, buf] : outputs.outputs)\n+\t\t\tpipe->completeBuffer(outputs.request, buf);\n+\t\tpipe->completeRequest(outputs.request);\n \t\tconversionQueue_.pop();\n \n-\t\tif (request)\n-\t\t\tpipe->completeRequest(request);\n \t\treturn;\n \t}\n \n@@ -833,7 +833,7 @@ void SimpleCameraData::bufferReady(FrameBuffer *buffer)\n \n \tif (useConversion_ && !conversionQueue_.empty()) {\n \t\tconst std::map<const Stream *, FrameBuffer *> &outputs =\n-\t\t\tconversionQueue_.front();\n+\t\t\tconversionQueue_.front().outputs;\n \t\tif (!outputs.empty()) {\n \t\t\tFrameBuffer *outputBuffer = outputs.begin()->second;\n \t\t\tif (outputBuffer)\n@@ -857,7 +857,7 @@ void SimpleCameraData::bufferReady(FrameBuffer *buffer)\n \t\t}\n \n \t\tif (converter_)\n-\t\t\tconverter_->queueBuffers(buffer, conversionQueue_.front());\n+\t\t\tconverter_->queueBuffers(buffer, conversionQueue_.front().outputs);\n \t\telse\n \t\t\t/*\n \t\t\t * request->sequence() cannot be retrieved from `buffer' inside\n@@ -865,7 +865,7 @@ void SimpleCameraData::bufferReady(FrameBuffer *buffer)\n \t\t\t * already here.\n \t\t\t */\n \t\t\tswIsp_->queueBuffers(request->sequence(), buffer,\n-\t\t\t\t\t conversionQueue_.front());\n+\t\t\t\t\t conversionQueue_.front().outputs);\n \n \t\tconversionQueue_.pop();\n \t\treturn;\n@@ -1429,7 +1429,7 @@ int SimplePipelineHandler::queueRequestDevice(Camera *camera, Request *request)\n \t}\n \n \tif (data->useConversion_) {\n-\t\tdata->conversionQueue_.push(std::move(buffers));\n+\t\tdata->conversionQueue_.push({ request, std::move(buffers) });\n \t\tif (data->swIsp_)\n \t\t\tdata->swIsp_->queueRequest(request->sequence(), request->controls());\n \t}\n", "prefixes": [ "v6", "2/3" ] }