{"id":2861,"url":"https://patchwork.libcamera.org/api/patches/2861/?format=json","web_url":"https://patchwork.libcamera.org/patch/2861/","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":"<20200220165704.23600-3-kieran.bingham@ideasonboard.com>","date":"2020-02-20T16:57:00","name":"[libcamera-devel,v3,2/6] libcamera: ipa_manager: Split path handling","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"56a572720d65e8ab99a0ce52f16f6013753a9303","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2861/mbox/","series":[{"id":688,"url":"https://patchwork.libcamera.org/api/series/688/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=688","date":"2020-02-20T16:56:58","name":"Support loading IPAs from the build tree","version":3,"mbox":"https://patchwork.libcamera.org/series/688/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2861/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2861/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2DEE0625C1\n\tfor ;\n\tThu, 20 Feb 2020 17:57:08 +0100 (CET)","from localhost.localdomain\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C7F3913C2;\n\tThu, 20 Feb 2020 17:57:07 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1582217827;\n\tbh=4Vg9DJG9pZMz6SzWLMBp0i6D9Yk+BQOQBUkHlR1u4JI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=qHcAMPW3AE4nHLgG76Lz9Zz2ZR+ON9wXjBum734kSwMh4bdbEZfqhAEuQOKXIw7Pr\n\tvmS7JQtWeaVqZNZO5k9hQVMzFb211AaKG6rS+lpv7CuUmAp5g5NEAKi5YgqZj8e4ev\n\t1BjZ5UjSLNNbsK3+/iw5TulU9xrhLruIjoE2ngJk=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Thu, 20 Feb 2020 16:57:00 +0000","Message-Id":"<20200220165704.23600-3-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20200220165704.23600-1-kieran.bingham@ideasonboard.com>","References":"<20200220165704.23600-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 2/6] libcamera: ipa_manager: Split path\n\thandling","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","X-List-Received-Date":"Thu, 20 Feb 2020 16:57:08 -0000"},"content":"Move the iteration of a colon-separated path to its own function.\nThis prepares for parsing extra path variables.\n\nSigned-off-by: Kieran Bingham \n---\n src/libcamera/include/ipa_manager.h | 1 +\n src/libcamera/ipa_manager.cpp | 35 ++++++++++++++++++++++-------\n 2 files changed, 28 insertions(+), 8 deletions(-)","diff":"diff --git a/src/libcamera/include/ipa_manager.h b/src/libcamera/include/ipa_manager.h\nindex 126f8babbc8f..94d35d9062e4 100644\n--- a/src/libcamera/include/ipa_manager.h\n+++ b/src/libcamera/include/ipa_manager.h\n@@ -33,6 +33,7 @@ private:\n \t~IPAManager();\n \n \tint addDir(const char *libDir);\n+\tint addPath(const char *path);\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\nindex 4ffbdd712ac2..d87f2221b00b 100644\n--- a/src/libcamera/ipa_manager.cpp\n+++ b/src/libcamera/ipa_manager.cpp\n@@ -110,14 +110,7 @@ IPAManager::IPAManager()\n \t\treturn;\n \t}\n \n-\tfor (const auto &dir : utils::split(modulePaths, \":\")) {\n-\t\tif (dir.empty())\n-\t\t\tcontinue;\n-\n-\t\tint ret = addDir(dir.c_str());\n-\t\tif (ret > 0)\n-\t\t\tipaCount += ret;\n-\t}\n+\tipaCount += addPath(modulePaths);\n \n \tif (!ipaCount)\n \t\tLOG(IPAManager, Warning)\n@@ -197,6 +190,32 @@ int IPAManager::addDir(const char *libDir)\n \treturn count;\n }\n \n+/**\n+ * \\brief Load IPA modules from a search path\n+ * \\param[in] path The colon-separated list of directories to load IPA modules from\n+ *\n+ * This method tries to create an IPAModule instance for every shared object\n+ * found in the directories listed in \\a path.\n+ *\n+ * \\return Number of modules loaded by this call, or a negative error code\n+ * otherwise\n+ */\n+int IPAManager::addPath(const char *path)\n+{\n+\tint ipaCount = 0;\n+\n+\tfor (const auto &dir : utils::split(path, \":\")) {\n+\t\tif (dir.empty())\n+\t\t\tcontinue;\n+\n+\t\tint ret = addDir(dir.c_str());\n+\t\tif (ret > 0)\n+\t\t\tipaCount += ret;\n+\t}\n+\n+\treturn ipaCount;\n+}\n+\n /**\n * \\brief Create an IPA interface that matches a given pipeline handler\n * \\param[in] pipe The pipeline handler that wants a matching IPA interface\n","prefixes":["libcamera-devel","v3","2/6"]}