{"id":22914,"url":"https://patchwork.libcamera.org/api/1.1/patches/22914/?format=json","web_url":"https://patchwork.libcamera.org/patch/22914/","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":"<20250303193335.785606-1-barnabas.pocze@ideasonboard.com>","date":"2025-03-03T19:33:35","name":"[v1] libcamera: ipa_manager: Store `IPAModule`s in `std::unique_ptr`","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"0fa80ec8b8de06b5941806b5473d2fd205518f60","submitter":{"id":216,"url":"https://patchwork.libcamera.org/api/1.1/people/216/?format=json","name":"Barnabás Pőcze","email":"barnabas.pocze@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22914/mbox/","series":[{"id":5039,"url":"https://patchwork.libcamera.org/api/1.1/series/5039/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5039","date":"2025-03-03T19:33:35","name":"[v1] libcamera: ipa_manager: Store `IPAModule`s in `std::unique_ptr`","version":1,"mbox":"https://patchwork.libcamera.org/series/5039/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22914/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22914/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 14DA4BD808\n\tfor ;\n\tMon, 3 Mar 2025 19:33:40 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C276568826;\n\tMon, 3 Mar 2025 20:33:39 +0100 (CET)","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 61F6568779\n\tfor ;\n\tMon, 3 Mar 2025 20:33:38 +0100 (CET)","from pb-laptop.local (185.221.143.4.nat.pool.zt.hu [185.221.143.4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id BFD67346\n\tfor ;\n\tMon, 3 Mar 2025 20:32:06 +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=\"StD72d9U\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1741030326;\n\tbh=FrGbh8uTAEkeMFe8Im5PNDBlhEbS6N7MP8Dgn7H++Lg=;\n\th=From:To:Subject:Date:From;\n\tb=StD72d9UATFuCm6kl1n3+K12W9cAHfNuSX/94rR9SjiS6VhfCQq74nCZ2VWeHsDG7\n\tJrcCNothUGNT+0Dak5GwHyw/rmVjVStf3Zkaf8GLPS78duVOwtkXJKT1Xr0ZMvxPWP\n\tQbqYXjTl2NwlITCNVWDN0LT0n5YC6/osyQ4cy6Y8=","From":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH v1] libcamera: ipa_manager: Store `IPAModule`s in\n\t`std::unique_ptr`","Date":"Mon, 3 Mar 2025 20:33:35 +0100","Message-ID":"<20250303193335.785606-1-barnabas.pocze@ideasonboard.com>","X-Mailer":"git-send-email 2.48.1","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","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":"Express the ownership more clearly by using a smart pointer type.\n\nSigned-off-by: Barnabás Pőcze \n---\n include/libcamera/internal/ipa_manager.h | 2 +-\n src/libcamera/ipa_manager.cpp | 18 ++++++------------\n 2 files changed, 7 insertions(+), 13 deletions(-)","diff":"diff --git a/include/libcamera/internal/ipa_manager.h b/include/libcamera/internal/ipa_manager.h\nindex 16dede0c5..e82c25a64 100644\n--- a/include/libcamera/internal/ipa_manager.h\n+++ b/include/libcamera/internal/ipa_manager.h\n@@ -67,7 +67,7 @@ private:\n \n \tbool isSignatureValid(IPAModule *ipa) const;\n \n-\tstd::vector modules_;\n+\tstd::vector> modules_;\n \n #if HAVE_IPA_PUBKEY\n \tstatic const uint8_t publicKeyData_[];\ndiff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\nindex cfc24d389..830750dcc 100644\n--- a/src/libcamera/ipa_manager.cpp\n+++ b/src/libcamera/ipa_manager.cpp\n@@ -149,11 +149,7 @@ IPAManager::IPAManager()\n \t\t\t<< \"No IPA found in '\" IPA_MODULE_DIR \"'\";\n }\n \n-IPAManager::~IPAManager()\n-{\n-\tfor (IPAModule *module : modules_)\n-\t\tdelete module;\n-}\n+IPAManager::~IPAManager() = default;\n \n /**\n * \\brief Identify shared library objects within a directory\n@@ -226,15 +222,13 @@ unsigned int IPAManager::addDir(const char *libDir, unsigned int maxDepth)\n \n \tunsigned int count = 0;\n \tfor (const std::string &file : files) {\n-\t\tIPAModule *ipaModule = new IPAModule(file);\n-\t\tif (!ipaModule->isValid()) {\n-\t\t\tdelete ipaModule;\n+\t\tauto ipaModule = std::make_unique(file);\n+\t\tif (!ipaModule->isValid())\n \t\t\tcontinue;\n-\t\t}\n \n \t\tLOG(IPAManager, Debug) << \"Loaded IPA module '\" << file << \"'\";\n \n-\t\tmodules_.push_back(ipaModule);\n+\t\tmodules_.push_back(std::move(ipaModule));\n \t\tcount++;\n \t}\n \n@@ -250,9 +244,9 @@ unsigned int IPAManager::addDir(const char *libDir, unsigned int maxDepth)\n IPAModule *IPAManager::module(PipelineHandler *pipe, uint32_t minVersion,\n \t\t\t uint32_t maxVersion)\n {\n-\tfor (IPAModule *module : modules_) {\n+\tfor (const auto &module : modules_) {\n \t\tif (module->match(pipe, minVersion, maxVersion))\n-\t\t\treturn module;\n+\t\t\treturn module.get();\n \t}\n \n \treturn nullptr;\n","prefixes":["v1"]}