{"id":19513,"url":"https://patchwork.libcamera.org/api/1.1/patches/19513/?format=json","web_url":"https://patchwork.libcamera.org/patch/19513/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20240220164317.998477-3-dan.scally@ideasonboard.com>","date":"2024-02-20T16:43:12","name":"[v2,2/7] libcamera: camera: Turn queuedRequests_ to a map","commit_ref":null,"pull_url":null,"state":"rejected","archived":true,"hash":"23ecb1ca92e6f0d6b1e4e88d566fcc9427dc5680","submitter":{"id":156,"url":"https://patchwork.libcamera.org/api/1.1/people/156/?format=json","name":"Dan Scally","email":"dan.scally@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19513/mbox/","series":[{"id":4172,"url":"https://patchwork.libcamera.org/api/1.1/series/4172/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4172","date":"2024-02-20T16:43:10","name":"Remove RkISP1FrameInfo and IPU3Frames classes","version":2,"mbox":"https://patchwork.libcamera.org/series/4172/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19513/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19513/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 CBA05C3261\n\tfor ;\n\tTue, 20 Feb 2024 16:43:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0F84962820;\n\tTue, 20 Feb 2024 17:43:27 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6425A61CAA\n\tfor ;\n\tTue, 20 Feb 2024 17:43:24 +0100 (CET)","from mail.ideasonboard.com\n\t(cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net [86.13.91.161])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 01EA913AC;\n\tTue, 20 Feb 2024 17:43:16 +0100 (CET)"],"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=\"YpeuKOCF\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1708447397;\n\tbh=R4kXQda0HMfbVXX1PAGOXI0OdPf6pPixlt799u6rYJM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=YpeuKOCFXnr7EI81DYYV0TKc6ICSRGYfB1mzZvAgSGUlp6C09yZEMn/AS0LNt6mLx\n\tNWIB4kLVnW10JeDmU+/PI5J1AgbXWyZfyS4/neDrW0rF1VCKAqnyhwqxzD+5aVaHxu\n\tIogUxpoSfsmjm83dTOvbc9NOvHHEGYdnbXHB8zy0=","From":"Daniel Scally ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH v2 2/7] libcamera: camera: Turn queuedRequests_ to a map","Date":"Tue, 20 Feb 2024 16:43:12 +0000","Message-Id":"<20240220164317.998477-3-dan.scally@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20240220164317.998477-1-dan.scally@ideasonboard.com>","References":"<20240220164317.998477-1-dan.scally@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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":"To facilitate fetching Requests queued to a camera using their\nsequence number, transform the queuedRequests_ list to a map with\nthe sequence as the key.\n\nSigned-off-by: Daniel Scally \n---\nChanges in v2:\n\n\t- New patch\n\n include/libcamera/internal/camera.h | 4 ++--\n src/libcamera/camera.cpp | 4 ++--\n src/libcamera/pipeline_handler.cpp | 12 ++++++++----\n 3 files changed, 12 insertions(+), 8 deletions(-)","diff":"diff --git a/include/libcamera/internal/camera.h b/include/libcamera/internal/camera.h\nindex 38dd94ff..fff70ff6 100644\n--- a/include/libcamera/internal/camera.h\n+++ b/include/libcamera/internal/camera.h\n@@ -8,7 +8,7 @@\n #pragma once\n \n #include \n-#include \n+#include \n #include \n #include \n #include \n@@ -33,7 +33,7 @@ public:\n \n \tPipelineHandler *pipe() { return pipe_.get(); }\n \n-\tstd::list queuedRequests_;\n+\tstd::map queuedRequests_;\n \tControlInfoMap controlInfo_;\n \tControlList properties_;\n \ndiff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex a71dc933..3aa051f9 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -601,9 +601,9 @@ Camera::Private::~Private()\n \n /**\n * \\var Camera::Private::queuedRequests_\n- * \\brief The list of queued and not yet completed requests\n+ * \\brief The map of queued and not yet completed requests\n *\n- * This list tracks requests queued in order to ensure completion of all\n+ * This map tracks requests queued in order to ensure completion of all\n * requests when the pipeline handler is stopped.\n *\n * \\sa PipelineHandler::queueRequest(), PipelineHandler::stop(),\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex 343804e9..a8a67a7d 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -428,9 +428,9 @@ void PipelineHandler::doQueueRequest(Request *request)\n \n \tCamera *camera = request->_d()->camera();\n \tCamera::Private *data = camera->_d();\n-\tdata->queuedRequests_.push_back(request);\n \n \trequest->_d()->sequence_ = data->requestSequence_++;\n+\tdata->queuedRequests_[request->sequence()] = request;\n \n \tif (request->_d()->cancelled_) {\n \t\tcompleteRequest(request);\n@@ -532,13 +532,17 @@ void PipelineHandler::completeRequest(Request *request)\n \n \tCamera::Private *data = camera->_d();\n \n-\twhile (!data->queuedRequests_.empty()) {\n-\t\tRequest *req = data->queuedRequests_.front();\n+\tfor (auto it = data->queuedRequests_.begin(), it_next = it;\n+\t it != data->queuedRequests_.end(); it = it_next) {\n+\t\tuint32_t seq = it->first;\n+\t\tRequest *req = it->second;\n+\t\t++it_next;\n+\n \t\tif (req->status() == Request::RequestPending)\n \t\t\tbreak;\n \n \t\tASSERT(!req->hasPendingBuffers());\n-\t\tdata->queuedRequests_.pop_front();\n+\t\tdata->queuedRequests_.erase(seq);\n \t\tcamera->requestComplete(req);\n \t}\n }\n","prefixes":["v2","2/7"]}