{"id":12899,"url":"https://patchwork.libcamera.org/api/patches/12899/?format=json","web_url":"https://patchwork.libcamera.org/patch/12899/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20210711231547.19664-3-laurent.pinchart@ideasonboard.com>","date":"2021-07-11T23:15:46","name":"[libcamera-devel,2/3] libcamera: ipa_manager: Split common code out of createIPA()","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"0536af1da05aa9cb8e93de0ff70f3bd5241e0b38","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12899/mbox/","series":[{"id":2226,"url":"https://patchwork.libcamera.org/api/series/2226/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2226","date":"2021-07-11T23:15:44","name":"libcamera: ipa_manager: Fix, cleanup, and allow forcing isolation","version":1,"mbox":"https://patchwork.libcamera.org/series/2226/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12899/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12899/checks/","tags":{},"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 8EFCFC3225\n\tfor ;\n\tSun, 11 Jul 2021 23:16:40 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4A1F168535;\n\tMon, 12 Jul 2021 01:16:39 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 00DEE68521\n\tfor ;\n\tMon, 12 Jul 2021 01:16:38 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 96500CC\n\tfor ;\n\tMon, 12 Jul 2021 01:16:37 +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=\"KAmpRc0G\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626045397;\n\tbh=7i4HOEzapnvHYF6XQkEnWY+0MyqAHYNtoz1Jtqu3Wg0=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=KAmpRc0G7uMPq8Dtnb7mxCb25s2LecqpKmQ+sqU/G353ninj6ZVr5J+HK+xvY6C6r\n\tCTX2IQrAIgn9hYk5egk33uM88GpqtSDDcj8QFhGwnG/K6LvLY4+Jg6GwyAg617uCd+\n\tAvKjB+Dnhzc6VC3zCGtB/vbbwq7MnAUncFp/KWmw=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 12 Jul 2021 02:15:46 +0300","Message-Id":"<20210711231547.19664-3-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210711231547.19664-1-laurent.pinchart@ideasonboard.com>","References":"<20210711231547.19664-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 2/3] libcamera: ipa_manager: Split common\n\tcode out of createIPA()","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The createIPA() template function starts with code that doesn't depend\non the template parameters. Split it to a non-template function to avoid\ncode duplication in the binary.\n\nSigned-off-by: Laurent Pinchart \n---\n include/libcamera/internal/ipa_manager.h | 13 ++++---------\n src/libcamera/ipa_manager.cpp | 17 +++++++++++++++++\n 2 files changed, 21 insertions(+), 9 deletions(-)","diff":"diff --git a/include/libcamera/internal/ipa_manager.h b/include/libcamera/internal/ipa_manager.h\nindex 42201839901b..0687842e5c06 100644\n--- a/include/libcamera/internal/ipa_manager.h\n+++ b/include/libcamera/internal/ipa_manager.h\n@@ -34,15 +34,7 @@ public:\n \t\t\t\t\t uint32_t minVersion,\n \t\t\t\t\t uint32_t maxVersion)\n \t{\n-\t\tIPAModule *m = nullptr;\n-\n-\t\tfor (IPAModule *module : self_->modules_) {\n-\t\t\tif (module->match(pipe, minVersion, maxVersion)) {\n-\t\t\t\tm = module;\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\t}\n-\n+\t\tIPAModule *m = self_->module(pipe, minVersion, maxVersion);\n \t\tif (!m)\n \t\t\treturn nullptr;\n \n@@ -62,6 +54,9 @@ private:\n \t\t std::vector &files);\n \tunsigned int addDir(const char *libDir, unsigned int maxDepth = 0);\n \n+\tIPAModule *module(PipelineHandler *pipe, uint32_t minVersion,\n+\t\t\t uint32_t maxVersion);\n+\n \tbool isSignatureValid(IPAModule *ipa) const;\n \n \tstd::vector modules_;\ndiff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\nindex b4606c6159e5..9533c8fadea6 100644\n--- a/src/libcamera/ipa_manager.cpp\n+++ b/src/libcamera/ipa_manager.cpp\n@@ -245,6 +245,23 @@ unsigned int IPAManager::addDir(const char *libDir, unsigned int maxDepth)\n \treturn count;\n }\n \n+/**\n+ * \\brief Retrieve and IPA module that matches a given pipeline handler\n+ * \\param[in] pipe The pipeline handler\n+ * \\param[in] minVersion Minimum acceptable version of IPA module\n+ * \\param[in] maxVersion Maximum acceptable version of IPA module\n+ */\n+IPAModule *IPAManager::module(PipelineHandler *pipe, uint32_t minVersion,\n+\t\t\t uint32_t maxVersion)\n+{\n+\tfor (IPAModule *module : modules_) {\n+\t\tif (module->match(pipe, minVersion, maxVersion))\n+\t\t\treturn module;\n+\t}\n+\n+\treturn nullptr;\n+}\n+\n /**\n * \\fn IPAManager::createIPA()\n * \\brief Create an IPA proxy that matches a given pipeline handler\n","prefixes":["libcamera-devel","2/3"]}