[{"id":21664,"web_url":"https://patchwork.libcamera.org/comment/21664/","msgid":"","date":"2021-12-08T10:40:39","subject":"Re: [libcamera-devel] [PATCH v4 07/11] 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 Wed, Dec 01, 2021 at 03:29:32PM +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> Reviewed-by: Laurent Pinchart at the end of the line.\n\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 3de27ae93645..6aa3378547ba 100644\n> --- a/include/libcamera/internal/pipeline_handler.h\n> +++ b/include/libcamera/internal/pipeline_handler.h\n> @@ -8,6 +8,7 @@\n> #pragma once\n> \n> #include \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::queue waitingRequests_;\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 f039ffd4f88d..f1e54497aa03 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> +\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..2374c2891c64 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(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> + *\n> + * Iterate the list of waiting requests and queue them to the device one\n> + * by one.\n> + */\n> +void PipelineHandler::doQueueRequests()\n> +{\n> +\twhile (!waitingRequests_.empty()) {\n> +\t\tRequest *request = waitingRequests_.front();\n> +\t\twaitingRequests_.pop();\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 05EF5BF415\n\tfor ;\n\tWed, 8 Dec 2021 10:41:11 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3E1D060868;\n\tWed, 8 Dec 2021 11:41:11 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 60C5E60225\n\tfor ;\n\tWed, 8 Dec 2021 11:41:09 +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 DC2B98BB;\n\tWed, 8 Dec 2021 11:41:08 +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=\"T5wJ8i/M\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1638960069;\n\tbh=6klawMqcdckYw++kVSRxmaykvzfUhYB5mjp6/qqrWqk=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=T5wJ8i/MILDUFolPb0oz70njW8JsHBckbtXSRwjOiA6+UQM69Le3eVJxyBrZLXRde\n\tt6XsJ5eTPMvMxGIDpQP5E9uAeNOHxeZ2gsK6G/MTZDWe1Lpxqb2d/zv0/T8Q2Iq4LQ\n\tE71rmeweaX27U1TkL9Hb2QZKez7WsFzJmQi8EBJ0=","Date":"Wed, 8 Dec 2021 12:40:39 +0200","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"","References":"<20211201142936.107405-1-jacopo@jmondi.org>\n\t<20211201142936.107405-8-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20211201142936.107405-8-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH v4 07/11] 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\" "}}]