[{"id":21076,"web_url":"https://patchwork.libcamera.org/comment/21076/","msgid":"","date":"2021-11-21T18:37:06","subject":"Re: [libcamera-devel] [PATCH v2 06/12] libcamera: pipeline_handler:\n\tSplit request queueing","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Sat, Nov 20, 2021 at 12:13:07PM +0100, Jacopo Mondi wrote:\n> In order to prepare to handle synchronization fences at Request\n> queueing time, split the PipelineHandler::queueRequest() function in\n> two, by creating a list of waiting requests and introducing the\n> doQueueRequest() function that queues requests to the device in the\n> order the pipeline has received them.\n> \n> Signed-off-by: Jacopo Mondi \n> ---\n> include/libcamera/internal/pipeline_handler.h | 6 +++++\n> .../libcamera/internal/tracepoints/request.tp | 9 +++++++\n> src/libcamera/pipeline_handler.cpp | 27 +++++++++++++++++++\n> 3 files changed, 42 insertions(+)\n> \n> diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\n> index 41cba44d990f..608e6f79039f 100644\n> --- a/include/libcamera/internal/pipeline_handler.h\n> +++ b/include/libcamera/internal/pipeline_handler.h\n> @@ -7,6 +7,7 @@\n> #ifndef __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__\n> #define __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__\n> \n> +#include \n> #include \n> #include \n> #include \n> @@ -76,9 +77,14 @@ private:\n> \tvoid mediaDeviceDisconnected(MediaDevice *media);\n> \tvirtual void disconnect();\n> \n> +\tvoid doQueueRequest(Request *request);\n> +\tvoid doQueueRequests();\n> +\n> \tstd::vector> mediaDevices_;\n> \tstd::vector> cameras_;\n> \n> +\tstd::deque waitingRequests_;\n\nCan you use a std::queue ?\n\n> +\n> \tconst char *name_;\n> \n> \tfriend class PipelineHandlerFactory;\n> diff --git a/include/libcamera/internal/tracepoints/request.tp b/include/libcamera/internal/tracepoints/request.tp\n> index 37cd2f8864ce..87219b8d8e6f 100644\n> --- a/include/libcamera/internal/tracepoints/request.tp\n> +++ b/include/libcamera/internal/tracepoints/request.tp\n> @@ -58,6 +58,15 @@ TRACEPOINT_EVENT_INSTANCE(\n> \t)\n> )\n> \n> +TRACEPOINT_EVENT_INSTANCE(\n> +\tlibcamera,\n> +\trequest,\n> +\trequest_device_queue,\n\nMaybe request_queue_device ?\n\n> +\tTP_ARGS(\n> +\t\tlibcamera::Request *, req\n> +\t)\n> +)\n> +\n> TRACEPOINT_EVENT_INSTANCE(\n> \tlibcamera,\n> \trequest,\n> diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\n> index 67fdf1d8db01..b8dd03647954 100644\n> --- a/src/libcamera/pipeline_handler.cpp\n> +++ b/src/libcamera/pipeline_handler.cpp\n> @@ -312,6 +312,17 @@ void PipelineHandler::queueRequest(Request *request)\n> {\n> \tLIBCAMERA_TRACEPOINT(request_queue, request);\n> \n> +\twaitingRequests_.push_back(request);\n> +\tdoQueueRequests();\n> +}\n> +\n> +/**\n> + * \\brief Queue one requests to the device\n> + */\n> +void PipelineHandler::doQueueRequest(Request *request)\n> +{\n> +\tLIBCAMERA_TRACEPOINT(request_device_queue, request);\n> +\n> \tCamera *camera = request->_d()->camera();\n> \tCamera::Private *data = camera->_d();\n> \tdata->queuedRequests_.push_back(request);\n> @@ -325,6 +336,22 @@ void PipelineHandler::queueRequest(Request *request)\n> \t}\n> }\n> \n> +/**\n> + * \\brief Queue requests to the device\n\nWe need more documentation here and for doQueueRequest(), to explain how\nfences and requests are handled.\n\n> + */\n> +void PipelineHandler::doQueueRequests()\n> +{\n> +\twhile (true) {\n> +\t\tif (waitingRequests_.empty())\n> +\t\t\treturn;\n> +\n> +\t\tRequest *request = waitingRequests_.front();\n> +\t\twaitingRequests_.pop_front();\n> +\n> +\t\tdoQueueRequest(request);\n> +\t}\n> +}\n> +\n> /**\n> * \\fn PipelineHandler::queueRequestDevice()\n> * \\brief Queue a request to the device","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 55D6DBDB13\n\tfor ;\n\tSun, 21 Nov 2021 18:37:31 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id ADA2360371;\n\tSun, 21 Nov 2021 19:37:30 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7FA1260233\n\tfor ;\n\tSun, 21 Nov 2021 19:37:29 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id EE46B9DD;\n\tSun, 21 Nov 2021 19:37:28 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"NLzHKI3W\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1637519849;\n\tbh=KpS7GVH4k3GXbnFnULK7BVUA9N5MNhjksFuhz3ArjMw=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=NLzHKI3WHEaeTM2oBEwr0gAFGqumzFiHVwcRFTz+YukJDjX4AOX8ca2M86YhfFR2N\n\tvW7t8IxIBSyP+AQx/8RW05PYdfOUGqXyCmnkrHMyt7JiFjabyZYRbgR66362bf22Fd\n\tg40lKe7k2VVsJywN5vAOGD7uZRECmG+o0phX5vJo=","Date":"Sun, 21 Nov 2021 20:37:06 +0200","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"","References":"<20211120111313.106621-1-jacopo@jmondi.org>\n\t<20211120111313.106621-7-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20211120111313.106621-7-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH v2 06/12] libcamera: pipeline_handler:\n\tSplit request queueing","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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]