{"id":9715,"url":"https://patchwork.libcamera.org/api/1.1/patches/9715/?format=json","web_url":"https://patchwork.libcamera.org/patch/9715/","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":"<20200922133537.258098-12-paul.elder@ideasonboard.com>","date":"2020-09-22T13:35:10","name":"[libcamera-devel,11/38] meson: ipa, proxy: Generate headers and proxy with mojo","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"cb9e4d868c60a7c8ebc5f313b612ecd097d4feec","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9715/mbox/","series":[{"id":1309,"url":"https://patchwork.libcamera.org/api/1.1/series/1309/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1309","date":"2020-09-22T13:34:59","name":"IPA isolation implementation","version":1,"mbox":"https://patchwork.libcamera.org/series/1309/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9715/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9715/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 A81DDBF01C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 22 Sep 2020 13:37:11 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 74A8C62FDA;\n\tTue, 22 Sep 2020 15:37:11 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CAD2260576\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 22 Sep 2020 15:37:09 +0200 (CEST)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D928D2D7;\n\tTue, 22 Sep 2020 15:37:02 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"i12SSgVr\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1600781824;\n\tbh=oN4BO8eIk0HdNcNYbg5eNiwDvsbRQTJrYk8/J2DBOp8=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=i12SSgVr8HIn/xyt8hD5H0HL4fC1tjJPiOvrlctn4s58nwtlWk+JzBk7IaNI29vwY\n\tQ15yDKSSOcGNY0dBdAonrlgOx0V7p8z+QMossHvIKb3uSjROo+b2fJ0txPbGyRKqgx\n\t2aP4pYKZQIbEoQZaoRCwAJzabvR590Ebdre8qdpA=","From":"Paul Elder <paul.elder@ideasonboard.com>","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 22 Sep 2020 22:35:10 +0900","Message-Id":"<20200922133537.258098-12-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200922133537.258098-1-paul.elder@ideasonboard.com>","References":"<20200922133537.258098-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 11/38] meson: ipa,\n\tproxy: Generate headers and proxy with mojo","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"Run mojo from meson to generate the header, serializer, and proxy files\nfor every pipeline's mojom data definition file.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n\n---\nThis patch depends on the patch series \"Unify utils locations\".\n\nChanges in v2:\n- clean up loops\n- remove non-literal keys in maps\n- move loading the mojom scripts to utils/\n- declare the template files in meson\n- add the generated headers into libcamera_generated_headers instead of\n  libcamera_internal_headers\n- add libcamera_generated_headers to libcamera_sources\n---\n include/libcamera/ipa/meson.build             | 74 +++++++++++++++++++\n src/libcamera/meson.build                     |  1 +\n src/libcamera/proxy/meson.build               | 16 ++++\n src/libcamera/proxy/worker/meson.build        | 18 ++++-\n .../libcamera_templates/meson.build           | 11 +++\n utils/ipc/generators/meson.build              |  3 +\n utils/ipc/meson.build                         | 14 ++++\n utils/meson.build                             |  1 +\n 8 files changed, 136 insertions(+), 2 deletions(-)\n create mode 100644 utils/ipc/generators/libcamera_templates/meson.build\n create mode 100644 utils/ipc/generators/meson.build\n create mode 100644 utils/ipc/meson.build","diff":"diff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build\nindex 508c6bd1..c6231f2c 100644\n--- a/include/libcamera/ipa/meson.build\n+++ b/include/libcamera/ipa/meson.build\n@@ -8,3 +8,77 @@ libcamera_ipa_headers = files([\n \n install_headers(libcamera_ipa_headers,\n                 subdir: join_paths(libcamera_include_dir, 'ipa'))\n+\n+#\n+# Prepare IPA/IPC generation components\n+#\n+\n+ipa_mojom_files = []\n+\n+ipa_mojoms = []\n+\n+#\n+# Generate headers from templates.\n+#\n+\n+libcamera_generated_headers = []\n+\n+foreach file : ipa_mojom_files\n+    name = file.split('.')[0]\n+\n+    # {pipeline}.mojom-module\n+    mojom = custom_target(file.split('.')[0] + '_mojom_module',\n+                          input : file,\n+                          output : file + '-module',\n+                          command : [mojom_parser,\n+                                     '--output-root', meson.build_root(),\n+                                     '--input-root', meson.source_root(),\n+                                     '--mojoms', '@INPUT@'\n+                          ])\n+\n+    # {pipeline}_generated.h\n+    header = custom_target(name + '_generated_h',\n+                           input : mojom,\n+                           output : name + '_generated.h',\n+                           depends : mojom_template,\n+                           command : [mojom_generator, 'generate',\n+                                      '-g', 'libcamera',\n+                                      '--bytecode_path', mojom_templates_dir,\n+                                      '--libcamera_generate_header',\n+                                      '--libcamera_output_path=@OUTPUT@',\n+                                      './' +'@INPUT@'\n+                           ])\n+\n+    # {pipeline}_serializer.h\n+    serializer = custom_target(name + '_serializer_h',\n+                               input : mojom,\n+                               output : name + '_serializer.h',\n+                               depends : mojom_template,\n+                               command : [mojom_generator, 'generate',\n+                                          '-g', 'libcamera',\n+                                          '--bytecode_path', mojom_templates_dir,\n+                                          '--libcamera_generate_serializer',\n+                                          '--libcamera_output_path=@OUTPUT@',\n+                                          './' +'@INPUT@'\n+                               ])\n+\n+    # ipa_proxy_{pipeline}.h\n+    proxy_header = custom_target(name + '_proxy_h',\n+                                 input : mojom,\n+                                 output : 'ipa_proxy_' + name + '.h',\n+                                 depends : mojom_template,\n+                                 command : [mojom_generator, 'generate',\n+                                            '-g', 'libcamera',\n+                                            '--bytecode_path', mojom_templates_dir,\n+                                            '--libcamera_generate_proxy_h',\n+                                            '--libcamera_output_path=@OUTPUT@',\n+                                            './' +'@INPUT@'\n+                                 ])\n+\n+    ipa_mojoms += {\n+        'name': name,\n+        'mojom': mojom,\n+    }\n+\n+    libcamera_generated_headers += [header, serializer, proxy_header]\n+endforeach\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 27182bfc..9d7442fa 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -54,6 +54,7 @@ libcamera_sources = files([\n \n libcamera_sources += libcamera_public_headers\n libcamera_sources += libcamera_internal_headers\n+libcamera_sources += libcamera_generated_headers\n \n includes = [\n     libcamera_includes,\ndiff --git a/src/libcamera/proxy/meson.build b/src/libcamera/proxy/meson.build\nindex bd804750..bacf800f 100644\n--- a/src/libcamera/proxy/meson.build\n+++ b/src/libcamera/proxy/meson.build\n@@ -4,3 +4,19 @@ libcamera_sources += files([\n     'ipa_proxy_linux.cpp',\n     'ipa_proxy_thread.cpp',\n ])\n+\n+# generate ipa_proxy_{pipeline}.cpp\n+foreach mojom : ipa_mojoms\n+    proxy = custom_target(mojom['name'] + '_proxy_cpp',\n+                          input : mojom['mojom'],\n+                          output : 'ipa_proxy_' + mojom['name'] + '.cpp',\n+                          depends : [mojom_template],\n+                          command : [mojom_generator, 'generate',\n+                                     '-g', 'libcamera',\n+                                     '--bytecode_path', mojom_templates_dir,\n+                                     '--libcamera_generate_proxy_cpp',\n+                                     '--libcamera_output_path=@OUTPUT@',\n+                                     './' + '@INPUT@'])\n+\n+    libcamera_sources += proxy\n+endforeach\ndiff --git a/src/libcamera/proxy/worker/meson.build b/src/libcamera/proxy/worker/meson.build\nindex ac0310a7..836d1759 100644\n--- a/src/libcamera/proxy/worker/meson.build\n+++ b/src/libcamera/proxy/worker/meson.build\n@@ -6,8 +6,22 @@ ipa_proxy_sources = [\n \n proxy_install_dir = join_paths(get_option('libexecdir'), 'libcamera')\n \n-foreach t : ipa_proxy_sources\n-    proxy = executable(t[0], t[1],\n+# generate ipa_proxy_{pipeline}_worker.cpp\n+foreach mojom : ipa_mojoms\n+    worker = custom_target(mojom['name'] + '_proxy_worker',\n+                           input : mojom['mojom'],\n+                           output : 'ipa_proxy_' + mojom['name'] + '_worker.cpp',\n+                           depends : [mojom_template],\n+                           command : [mojom_generator, 'generate',\n+                                      '-g', 'libcamera',\n+                                      '--bytecode_path', mojom_templates_dir,\n+                                      '--libcamera_generate_proxy_worker',\n+                                      '--libcamera_output_path=@OUTPUT@',\n+                                      './' + '@INPUT@'\n+                           ])\n+\n+    proxy = executable('ipa_proxy_' + mojom['name'],\n+                       [worker, libcamera_generated_headers],\n                        install : true,\n                        install_dir : proxy_install_dir,\n                        dependencies : libcamera_dep)\ndiff --git a/utils/ipc/generators/libcamera_templates/meson.build b/utils/ipc/generators/libcamera_templates/meson.build\nnew file mode 100644\nindex 00000000..d0a7449f\n--- /dev/null\n+++ b/utils/ipc/generators/libcamera_templates/meson.build\n@@ -0,0 +1,11 @@\n+# SPDX-License-Identifier: CC0-1.0\n+\n+mojom_template_files = files([\n+    'module_generated.h.tmpl',\n+    'module_ipa_proxy.cpp.tmpl',\n+    'module_ipa_proxy.h.tmpl',\n+    'module_ipa_proxy_worker.cpp.tmpl',\n+    'module_serializer.h.tmpl',\n+    'proxy_functions.tmpl',\n+    'serializer.tmpl',\n+])\ndiff --git a/utils/ipc/generators/meson.build b/utils/ipc/generators/meson.build\nnew file mode 100644\nindex 00000000..504f1a46\n--- /dev/null\n+++ b/utils/ipc/generators/meson.build\n@@ -0,0 +1,3 @@\n+# SPDX-License-Identifier: CC0-1.0\n+\n+subdir('libcamera_templates')\ndiff --git a/utils/ipc/meson.build b/utils/ipc/meson.build\nnew file mode 100644\nindex 00000000..9f7b7cc0\n--- /dev/null\n+++ b/utils/ipc/meson.build\n@@ -0,0 +1,14 @@\n+# SPDX-License-Identifier: CC0-1.0\n+\n+subdir('generators')\n+\n+mojom_parser = find_program('./mojo/public/tools/mojom/mojom_parser.py')\n+\n+mojom_generator = find_program('./generate.py')\n+\n+mojom_template = custom_target('mojom_template',\n+                               input : mojom_template_files,\n+                               output : 'libcamera_templates.zip',\n+                               command : [mojom_generator, '-o', '@OUTDIR@', 'precompile'])\n+\n+mojom_templates_dir = meson.current_build_dir()\ndiff --git a/utils/meson.build b/utils/meson.build\nindex a069e1ca..5dfb0741 100644\n--- a/utils/meson.build\n+++ b/utils/meson.build\n@@ -1,5 +1,6 @@\n # SPDX-License-Identifier: CC0-1.0\n \n+subdir('ipc')\n subdir('ipu3')\n \n ## Generates control_ids.h and property_ids.h\n","prefixes":["libcamera-devel","11/38"]}