{"id":21823,"url":"https://patchwork.libcamera.org/api/patches/21823/?format=json","web_url":"https://patchwork.libcamera.org/patch/21823/","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":"<20241106201721.1624461-2-mzamazal@redhat.com>","date":"2024-11-06T20:17:19","name":"[v6,1/3] libcamera: pipeline_handler: Provide cancelRequest","commit_ref":"fe68cd0d7d504f9edb7fd98d9888f10fb21aeb13","pull_url":null,"state":"accepted","archived":false,"hash":"6eb81d42e161e042ce624382cf96affda692a3ac","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21823/mbox/","series":[{"id":4774,"url":"https://patchwork.libcamera.org/api/series/4774/?format=json","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/21823/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21823/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 19B8ABDB13\n\tfor ;\n\tWed, 6 Nov 2024 20:17:39 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B55A66545A;\n\tWed, 6 Nov 2024 21:17:38 +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 0A84C65446\n\tfor ;\n\tWed, 6 Nov 2024 21:17:35 +0100 (CET)","from mx-prod-mc-04.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-681-w5kOqdlYN3GjOHRv80C_9Q-1;\n\tWed, 06 Nov 2024 15:17:33 -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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 9493419560A3; Wed, 6 Nov 2024 20:17:32 +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 1E2CD1955F42; Wed, 6 Nov 2024 20:17:29 +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=\"affYuEiv\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1730924255;\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=/PveyiXvNvVrexH9JTJH0bWLYLUXWwRuLPQ6SwEwjFM=;\n\tb=affYuEivLVl5dUdQHxEpXyYzh/DHFSImbV9eBLphEu4wcTOMLmiW4QVecoXbqSdU8Uu6zr\n\te/S9QSVQUywFF23Glsu+pHRiW6zoqJOpQqOXR4vDWm3Kh6mk++yyU3qy5Vvb+5t7cowzcl\n\teaJ5FHhIwbwSfCNuyAV2mw1gtHd6C6w=","X-MC-Unique":"w5kOqdlYN3GjOHRv80C_9Q-1","X-Mimecast-MFC-AGG-ID":"w5kOqdlYN3GjOHRv80C_9Q","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal , robert.mader@posteo.de,\n\tkieran.bingham@ideasonboard.com, laurent.pinchart@ideasonboard.com,\n\thdegoede@redhat.com","Subject":"[PATCH v6 1/3] libcamera: pipeline_handler: Provide cancelRequest","Date":"Wed, 6 Nov 2024 21:17:19 +0100","Message-ID":"<20241106201721.1624461-2-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":"TBzYGZ2PWPf_fEW_5gdmVauiWHeaQC7uwxQrw5OhJAI_1730924253","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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Let's extract the two occurrences of canceling a request to a common\nhelper. This is especially useful for the followup patch, which needs\nto cancel a request from outside.\n\nSigned-off-by: Milan Zamazal \nReviewed-by: Hans de Goede \nReviewed-by: Laurent Pinchart \n---\n include/libcamera/internal/pipeline_handler.h | 1 +\n src/libcamera/pipeline_handler.cpp | 23 +++++++++++++------\n 2 files changed, 17 insertions(+), 7 deletions(-)","diff":"diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\nindex 0d3808036..fb28a18d0 100644\n--- a/include/libcamera/internal/pipeline_handler.h\n+++ b/include/libcamera/internal/pipeline_handler.h\n@@ -60,6 +60,7 @@ public:\n \n \tbool completeBuffer(Request *request, FrameBuffer *buffer);\n \tvoid completeRequest(Request *request);\n+\tvoid cancelRequest(Request *request);\n \n \tstd::string configurationFile(const std::string &subdir,\n \t\t\t\t const std::string &name) const;\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex e59404691..4905863c4 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -367,9 +367,7 @@ void PipelineHandler::stop(Camera *camera)\n \twhile (!waitingRequests_.empty()) {\n \t\tRequest *request = waitingRequests_.front();\n \t\twaitingRequests_.pop();\n-\n-\t\trequest->_d()->cancel();\n-\t\tcompleteRequest(request);\n+\t\tcancelRequest(request);\n \t}\n \n \t/* Make sure no requests are pending. */\n@@ -470,10 +468,8 @@ void PipelineHandler::doQueueRequest(Request *request)\n \t}\n \n \tint ret = queueRequestDevice(camera, request);\n-\tif (ret) {\n-\t\trequest->_d()->cancel();\n-\t\tcompleteRequest(request);\n-\t}\n+\tif (ret)\n+\t\tcancelRequest(request);\n }\n \n /**\n@@ -568,6 +564,19 @@ void PipelineHandler::completeRequest(Request *request)\n \t}\n }\n \n+/**\n+ * \\brief Cancel request and signal its completion\n+ * \\param[in] request The request to cancel\n+ *\n+ * This function cancels and completes the request. The same rules as for\n+ * completeRequest() apply.\n+ */\n+void PipelineHandler::cancelRequest(Request *request)\n+{\n+\trequest->_d()->cancel();\n+\tcompleteRequest(request);\n+}\n+\n /**\n * \\brief Retrieve the absolute path to a platform configuration file\n * \\param[in] subdir The pipeline handler specific subdirectory name\n","prefixes":["v6","1/3"]}