{"id":23446,"url":"https://patchwork.libcamera.org/api/1.1/patches/23446/?format=json","web_url":"https://patchwork.libcamera.org/patch/23446/","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":"<20250526214224.13631-2-stefan.klug@ideasonboard.com>","date":"2025-05-26T21:42:15","name":"[RFC,1/4] libcamera: pipeline_handler: Move waitingRequests_ into camera class","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"7288c933e626620102ba8a894e017cf4588f3201","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/1.1/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/23446/mbox/","series":[{"id":5196,"url":"https://patchwork.libcamera.org/api/1.1/series/5196/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5196","date":"2025-05-26T21:42:14","name":"rkisp1: Allow usage of more than 4 buffers","version":1,"mbox":"https://patchwork.libcamera.org/series/5196/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/23446/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23446/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 7606CC31E9\n\tfor ;\n\tMon, 26 May 2025 21:42:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 22FCB68DA4;\n\tMon, 26 May 2025 23:42:43 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C184A68D96\n\tfor ;\n\tMon, 26 May 2025 23:42:39 +0200 (CEST)","from ideasonboard.com (tmo-070-11.customers.d1-online.com\n\t[80.187.70.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 77710581;\n\tMon, 26 May 2025 23:42:14 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"GLe6RND+\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1748295734;\n\tbh=0m+3kFvpZElflcFlDllGFZmikYubz8bNi7HYK8MldTI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=GLe6RND+3M4sI2LfetRXTAGlGJsA6TXZFetVrtWZvSDR7OhOS4QKyApwTYWaOM3fo\n\tB4zRLD5RO83blluvow3E2dnj+gwUlKMOzLfvAZqU4Zwqydd0XHlDS622CW/BaC7CtI\n\tw0oOHB2Mgjmt+Qoo6dHDfcgn4s0lYJimSCBL6Rgc=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ","Subject":"[RFC PATCH 1/4] libcamera: pipeline_handler: Move waitingRequests_\n\tinto camera class","Date":"Mon, 26 May 2025 23:42:15 +0200","Message-ID":"<20250526214224.13631-2-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20250526214224.13631-1-stefan.klug@ideasonboard.com>","References":"<20250526214224.13631-1-stefan.klug@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":"The waiting requests of one camera should not be able to influence\nqueuing to another camera. Therefore change the single waitingRequests_\nqueue into one queue per camera.\n\nSigned-off-by: Stefan Klug \n---\n include/libcamera/internal/camera.h | 2 ++\n include/libcamera/internal/pipeline_handler.h | 3 --\n src/libcamera/pipeline_handler.cpp | 34 +++++++++++++------\n 3 files changed, 25 insertions(+), 14 deletions(-)","diff":"diff --git a/include/libcamera/internal/camera.h b/include/libcamera/internal/camera.h\nindex 18f5c32a18e4..8a2e9ed5894d 100644\n--- a/include/libcamera/internal/camera.h\n+++ b/include/libcamera/internal/camera.h\n@@ -10,6 +10,7 @@\n #include \n #include \n #include \n+#include \n #include \n #include \n #include \n@@ -36,6 +37,7 @@ public:\n \tconst PipelineHandler *pipe() const { return pipe_.get(); }\n \n \tstd::list queuedRequests_;\n+\tstd::queue waitingRequests_;\n \tControlInfoMap controlInfo_;\n \tControlList properties_;\n \ndiff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\nindex 972a2fa65310..dedc29e815fb 100644\n--- a/include/libcamera/internal/pipeline_handler.h\n+++ b/include/libcamera/internal/pipeline_handler.h\n@@ -8,7 +8,6 @@\n #pragma once\n \n #include \n-#include \n #include \n #include \n #include \n@@ -94,8 +93,6 @@ private:\n \tstd::vector> mediaDevices_;\n \tstd::vector> cameras_;\n \n-\tstd::queue waitingRequests_;\n-\n \tconst char *name_;\n \tunsigned int useCount_;\n \ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex d84dff3c9f19..14d8602e67d8 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -363,15 +363,16 @@ void PipelineHandler::stop(Camera *camera)\n \t/* Stop the pipeline handler and let the queued requests complete. */\n \tstopDevice(camera);\n \n+\tCamera::Private *data = camera->_d();\n+\n \t/* Cancel and signal as complete all waiting requests. */\n-\twhile (!waitingRequests_.empty()) {\n-\t\tRequest *request = waitingRequests_.front();\n-\t\twaitingRequests_.pop();\n+\twhile (!data->waitingRequests_.empty()) {\n+\t\tRequest *request = data->waitingRequests_.front();\n+\t\tdata->waitingRequests_.pop();\n \t\tcancelRequest(request);\n \t}\n \n \t/* Make sure no requests are pending. */\n-\tCamera::Private *data = camera->_d();\n \tASSERT(data->queuedRequests_.empty());\n \n \tdata->requestSequence_ = 0;\n@@ -444,7 +445,9 @@ void PipelineHandler::queueRequest(Request *request)\n {\n \tLIBCAMERA_TRACEPOINT(request_queue, request);\n \n-\twaitingRequests_.push(request);\n+\tCamera *camera = request->_d()->camera();\n+\tCamera::Private *data = camera->_d();\n+\tdata->waitingRequests_.push(request);\n \n \trequest->_d()->prepare(300ms);\n }\n@@ -480,13 +483,20 @@ void PipelineHandler::doQueueRequest(Request *request)\n */\n void PipelineHandler::doQueueRequests()\n {\n-\twhile (!waitingRequests_.empty()) {\n-\t\tRequest *request = waitingRequests_.front();\n-\t\tif (!request->_d()->prepared_)\n-\t\t\tbreak;\n+\tfor (const std::weak_ptr &ptr : cameras_) {\n+\t\tstd::shared_ptr camera = ptr.lock();\n+\t\tif (!camera)\n+\t\t\tcontinue;\n \n-\t\tdoQueueRequest(request);\n-\t\twaitingRequests_.pop();\n+\t\tCamera::Private *data = camera->_d();\n+\t\twhile (!data->waitingRequests_.empty()) {\n+\t\t\tRequest *request = data->waitingRequests_.front();\n+\t\t\tif (!request->_d()->prepared_)\n+\t\t\t\tbreak;\n+\n+\t\t\tdoQueueRequest(request);\n+\t\t\tdata->waitingRequests_.pop();\n+\t\t}\n \t}\n }\n \n@@ -562,6 +572,8 @@ void PipelineHandler::completeRequest(Request *request)\n \t\tdata->queuedRequests_.pop_front();\n \t\tcamera->requestComplete(req);\n \t}\n+\n+\tdoQueueRequests();\n }\n \n /**\n","prefixes":["RFC","1/4"]}