From patchwork Thu May 15 12:00:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 23367 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 46615C3220 for ; Thu, 15 May 2025 12:00:27 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 756D968C92; Thu, 15 May 2025 14:00:23 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="oGmU38gT"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 079F968B6E for ; Thu, 15 May 2025 14:00:17 +0200 (CEST) Received: from pb-laptop.local (185.221.142.248.nat.pool.zt.hu [185.221.142.248]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id DB8B0A57; Thu, 15 May 2025 13:59:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1747310400; bh=cFUUT4bWq0B7vLv+FUMXYm9V1puLnTfIqpnWJEO1PCc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oGmU38gTcvrq8cCtWuoF5msJfjRg0NBjilJAZ3yBjn/Axx+qy1bSICEUsYNy+pAiu zlu/6DJf8DEX22D6J5+fAOZv9cODxgq+M3JKum/oCVPMmoR2lkEZKxBYGrSAQdU5/z GWaxwew13tBhoIHnHN3ZdOINenamjcgXVx0Wzjrw= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Cc: Paul Elder Subject: [RFC PATCH v1 2/8] utils: codegen: ipc: Remove `namespace` argument Date: Thu, 15 May 2025 14:00:06 +0200 Message-ID: <20250515120012.3127231-3-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250515120012.3127231-1-barnabas.pocze@ideasonboard.com> References: <20250515120012.3127231-1-barnabas.pocze@ideasonboard.com> MIME-Version: 1.0 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" The `serializer()`, `deserializer_{fd,no_fd,simple}()` functions take a string argument named "namespace", but they do not use it. So remove the argument. Signed-off-by: Barnabás Pőcze Reviewed-by: Paul Elder --- .../core_ipa_serializer.h.tmpl | 8 ++++---- .../module_ipa_serializer.h.tmpl | 8 ++++---- .../libcamera_templates/serializer.tmpl | 18 +++++++++--------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/utils/codegen/ipc/generators/libcamera_templates/core_ipa_serializer.h.tmpl b/utils/codegen/ipc/generators/libcamera_templates/core_ipa_serializer.h.tmpl index 036518f6c..cbb35ef51 100644 --- a/utils/codegen/ipc/generators/libcamera_templates/core_ipa_serializer.h.tmpl +++ b/utils/codegen/ipc/generators/libcamera_templates/core_ipa_serializer.h.tmpl @@ -31,12 +31,12 @@ template<> class IPADataSerializer<{{struct|name}}> { public: -{{- serializer.serializer(struct, "")}} +{{- serializer.serializer(struct)}} {%- if struct|has_fd %} -{{serializer.deserializer_fd(struct, "")}} +{{serializer.deserializer_fd(struct)}} {%- else %} -{{serializer.deserializer_no_fd(struct, "")}} -{{serializer.deserializer_fd_simple(struct, "")}} +{{serializer.deserializer_no_fd(struct)}} +{{serializer.deserializer_fd_simple(struct)}} {%- endif %} }; {% endfor %} diff --git a/utils/codegen/ipc/generators/libcamera_templates/module_ipa_serializer.h.tmpl b/utils/codegen/ipc/generators/libcamera_templates/module_ipa_serializer.h.tmpl index cd5a65a92..f3b8e3b15 100644 --- a/utils/codegen/ipc/generators/libcamera_templates/module_ipa_serializer.h.tmpl +++ b/utils/codegen/ipc/generators/libcamera_templates/module_ipa_serializer.h.tmpl @@ -32,12 +32,12 @@ template<> class IPADataSerializer<{{struct|name_full}}> { public: -{{- serializer.serializer(struct, namespace_str)}} +{{- serializer.serializer(struct)}} {%- if struct|has_fd %} -{{serializer.deserializer_fd(struct, namespace_str)}} +{{serializer.deserializer_fd(struct)}} {%- else %} -{{serializer.deserializer_no_fd(struct, namespace_str)}} -{{serializer.deserializer_fd_simple(struct, namespace_str)}} +{{serializer.deserializer_no_fd(struct)}} +{{serializer.deserializer_fd_simple(struct)}} {%- endif %} }; {% endfor %} diff --git a/utils/codegen/ipc/generators/libcamera_templates/serializer.tmpl b/utils/codegen/ipc/generators/libcamera_templates/serializer.tmpl index 323e12939..114e349c9 100644 --- a/utils/codegen/ipc/generators/libcamera_templates/serializer.tmpl +++ b/utils/codegen/ipc/generators/libcamera_templates/serializer.tmpl @@ -28,7 +28,7 @@ # # \todo Avoid intermediate vectors #} -{%- macro serializer_field(field, namespace, loop) %} +{%- macro serializer_field(field, loop) %} {%- if field|is_pod or field|is_enum %} std::vector {{field.mojom_name}}; std::tie({{field.mojom_name}}, std::ignore) = @@ -94,7 +94,7 @@ # Generate code to deserialize \a field into object ret. # This code is meant to be used by the IPADataSerializer specialization. #} -{%- macro deserializer_field(field, namespace, loop) %} +{%- macro deserializer_field(field, loop) %} {% if field|is_pod or field|is_enum %} {%- set field_size = (field|bit_width|int / 8)|int %} {{- check_data_size(field_size, 'dataSize', field.mojom_name, 'data')}} @@ -182,7 +182,7 @@ # Generate code for IPADataSerializer specialization, for serializing # \a struct. #} -{%- macro serializer(struct, namespace) %} +{%- macro serializer(struct) %} static std::tuple, std::vector> serialize(const {{struct|name_full}} &data, {%- if struct|needs_control_serializer %} @@ -196,7 +196,7 @@ std::vector retFds; {%- endif %} {%- for field in struct.fields %} -{{serializer_field(field, namespace, loop)}} +{{serializer_field(field, loop)}} {%- endfor %} {% if struct|has_fd %} return {retData, retFds}; @@ -213,7 +213,7 @@ # Generate code for IPADataSerializer specialization, for deserializing # \a struct, in the case that \a struct has file descriptors. #} -{%- macro deserializer_fd(struct, namespace) %} +{%- macro deserializer_fd(struct) %} static {{struct|name_full}} deserialize(std::vector &data, std::vector &fds, @@ -245,7 +245,7 @@ size_t dataSize = std::distance(dataBegin, dataEnd); [[maybe_unused]] size_t fdsSize = std::distance(fdsBegin, fdsEnd); {%- for field in struct.fields -%} -{{deserializer_field(field, namespace, loop)}} +{{deserializer_field(field, loop)}} {%- endfor %} return ret; } @@ -258,7 +258,7 @@ # \a struct, in the case that \a struct has no file descriptors but requires # deserializers with file descriptors. #} -{%- macro deserializer_fd_simple(struct, namespace) %} +{%- macro deserializer_fd_simple(struct) %} static {{struct|name_full}} deserialize(std::vector &data, [[maybe_unused]] std::vector &fds, @@ -285,7 +285,7 @@ # Generate code for IPADataSerializer specialization, for deserializing # \a struct, in the case that \a struct does not have file descriptors. #} -{%- macro deserializer_no_fd(struct, namespace) %} +{%- macro deserializer_no_fd(struct) %} static {{struct|name_full}} deserialize(std::vector &data, {%- if struct|needs_control_serializer %} @@ -312,7 +312,7 @@ size_t dataSize = std::distance(dataBegin, dataEnd); {%- for field in struct.fields -%} -{{deserializer_field(field, namespace, loop)}} +{{deserializer_field(field, loop)}} {%- endfor %} return ret; }