From patchwork Thu Mar 4 09:06:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 11495 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 52488BD1F1 for ; Thu, 4 Mar 2021 09:06:46 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A3C8868A92; Thu, 4 Mar 2021 10:06:45 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="TUVh/VSb"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4FD6E602EC for ; Thu, 4 Mar 2021 10:06:44 +0100 (CET) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 187ED27A; Thu, 4 Mar 2021 10:06:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1614848803; bh=Sj4F8ldZn7QJTRBPy7Xicpvc2w4GPI7nAxAVsazwnFY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TUVh/VSbvS9i5vbMfDSjySjAPzVHzjGGu3zuV7JG06K+v2WJZhOYvgkPbcx512E61 ovQbHaW1pG7RT+WdblHqmaXnqJ8fF83msxA5m6KrpsoRm68fbIo88vvftPLjuJzDEx TsrqYB/vFZ31Ko2cAazPvHQQZTAlNnwT939I3g9w= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Thu, 4 Mar 2021 18:06:22 +0900 Message-Id: <20210304090622.13623-1-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210304084703.11542-1-paul.elder@ideasonboard.com> References: <20210304084703.11542-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v1.1] utils: ipc: Support custom parameters to init() X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add support to the mojom-based code generator for custom parameters to init(). Remove the parameter type and count validation as well. Signed-off-by: Paul Elder Reviewed-by: Laurent Pinchart --- Changes in v1.1 - remove unused variables in the python file --- .../libcamera_templates/module_ipa_proxy.cpp.tmpl | 15 ++++++++++++--- .../libcamera_templates/proxy_functions.tmpl | 13 ------------- utils/ipc/generators/mojom_libcamera_generator.py | 12 +----------- 3 files changed, 13 insertions(+), 27 deletions(-) diff --git a/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl b/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl index 5e0d3976..8ba1a5cf 100644 --- a/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl +++ b/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl @@ -144,10 +144,19 @@ void {{proxy_name}}::recvMessage(const IPCMessage &data) {{proxy_funcs.func_sig(proxy_name, method, "Thread")}} { -{%- if method.mojom_name == "init" %} - {{proxy_funcs.init_thread_body()}} -{%- elif method.mojom_name == "stop" %} +{%- if method.mojom_name == "stop" %} {{proxy_funcs.stop_thread_body()}} +{%- elif method.mojom_name == "init" %} + {{ method|method_return_value + " _ret = " if method|method_return_value != "void" -}} + ipa_->{{method.mojom_name}}( + {%- for param in method|method_param_names -%} + {{param}}{{- ", " if not loop.last}} + {%- endfor -%} +); + + proxy_.moveToThread(&thread_); + + return {{ "_ret" if method|method_return_value != "void" }}; {%- elif method.mojom_name == "start" %} running_ = true; thread_.start(); diff --git a/utils/ipc/generators/libcamera_templates/proxy_functions.tmpl b/utils/ipc/generators/libcamera_templates/proxy_functions.tmpl index 40611feb..f2d86b67 100644 --- a/utils/ipc/generators/libcamera_templates/proxy_functions.tmpl +++ b/utils/ipc/generators/libcamera_templates/proxy_functions.tmpl @@ -19,19 +19,6 @@ ){{" override" if override}} {%- endmacro -%} -{# - # \brief Generate function body for IPA init() function for thread - #} -{%- macro init_thread_body() -%} - int ret = ipa_->init(settings); - if (ret) - return ret; - - proxy_.moveToThread(&thread_); - - return 0; -{%- endmacro -%} - {# # \brief Generate function body for IPA stop() function for thread #} diff --git a/utils/ipc/generators/mojom_libcamera_generator.py b/utils/ipc/generators/mojom_libcamera_generator.py index 438e41c6..fa0c21a2 100644 --- a/utils/ipc/generators/mojom_libcamera_generator.py +++ b/utils/ipc/generators/mojom_libcamera_generator.py @@ -341,19 +341,9 @@ def ValidateInterfaces(interfaces): ValidateSingleLength(f_start, 'start()', False) ValidateSingleLength(f_stop, 'stop()', False) - f_init = f_init[0] - f_start = f_start[0] f_stop = f_stop[0] - # Validate parameters to init() - ValidateSingleLength(f_init.parameters, 'input parameter to init()') - ValidateSingleLength(f_init.response_parameters, 'output parameter from init()') - if f_init.parameters[0].kind.mojom_name != 'IPASettings': - raise Exception('init() must have single IPASettings input parameter') - if f_init.response_parameters[0].kind.spec != 'i32': - raise Exception('init() must have single int32 output parameter') - - # No need to validate start() as it is customizable + # No need to validate init() and start() as they are customizable # Validate parameters to stop() ValidateZeroLength(f_stop.parameters, 'input parameter to stop()')