{"id":2773,"url":"https://patchwork.libcamera.org/api/patches/2773/?format=json","web_url":"https://patchwork.libcamera.org/patch/2773/","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":"<20200205130420.8736-4-kieran.bingham@ideasonboard.com>","date":"2020-02-05T13:04:18","name":"[libcamera-devel,3/5] libcamera: ipa_manager: Allow recursive parsing","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"7cad88f7d9cd66c372ded63d49a3d492a5acaa61","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/2773/mbox/","series":[{"id":661,"url":"https://patchwork.libcamera.org/api/series/661/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=661","date":"2020-02-05T13:04:15","name":"Support loading IPAs from the build tree","version":1,"mbox":"https://patchwork.libcamera.org/series/661/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2773/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2773/checks/","tags":{},"headers":{"Return-Path":"","Received":["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 8809F60443\n\tfor ;\n\tWed, 5 Feb 2020 14:04:26 +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 31E87E48;\n\tWed, 5 Feb 2020 14:04:26 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1580907866;\n\tbh=t+AzHqUDfnwtvOSNQDS6KA6QGxbt0Kw3HStE9Q3n54Q=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Ag6rZftd5sOi8aRsSGNj0buDdMtKJ7ntq6Hk0u8WT2svZwNvj0Snq+TdRNRafkVhB\n\t6k94ACCcOBbkgsOyn66dXL5pMwBZA8ovz6wgnXq+V9cUYa8bZf0wi3IQctznkaBOXL\n\tAxZoxXzdvRvTby0xQ42BMzQKla0Z5uZlnylrWf8Y=","From":"Kieran Bingham ","To":"LibCamera Devel ","Date":"Wed, 5 Feb 2020 13:04:18 +0000","Message-Id":"<20200205130420.8736-4-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20200205130420.8736-1-kieran.bingham@ideasonboard.com>","References":"<20200205130420.8736-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 3/5] libcamera: ipa_manager: Allow\n\trecursive parsing","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":"Wed, 05 Feb 2020 13:04:26 -0000"},"content":"Provide an optional means to recurse into subdirectories to search for IPA\nlibraries. This allows IPAs contained within their own build directory\nto be resolved when loading from a non-installed build.\n\nSigned-off-by: Kieran Bingham \n---\n src/libcamera/include/ipa_manager.h | 6 ++--\n src/libcamera/ipa_manager.cpp | 54 ++++++++++++++++++++++++-----\n 2 files changed, 49 insertions(+), 11 deletions(-)","diff":"diff --git a/src/libcamera/include/ipa_manager.h b/src/libcamera/include/ipa_manager.h\nindex 94d35d9062e4..8243ba5a1f51 100644\n--- a/src/libcamera/include/ipa_manager.h\n+++ b/src/libcamera/include/ipa_manager.h\n@@ -32,8 +32,10 @@ private:\n \tIPAManager();\n \t~IPAManager();\n \n-\tint addDir(const char *libDir);\n-\tint addPath(const char *path);\n+\tint parseDir(const char *libDir, std::vector &paths,\n+\t\t unsigned int subdirs);\n+\tint addDir(const char *libDir, unsigned int subdirs = 0);\n+\tint addPath(const char *path, unsigned int subdirs = 0);\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\nindex 048465c37772..24fe709108fe 100644\n--- a/src/libcamera/ipa_manager.cpp\n+++ b/src/libcamera/ipa_manager.cpp\n@@ -140,16 +140,17 @@ IPAManager *IPAManager::instance()\n }\n \n /**\n- * \\brief Load IPA modules from a directory\n+ * \\brief Identify shared library objects within a directory\n * \\param[in] libDir directory to search for IPA modules\n+ * \\param[in] subdirs maximum number of sub-directories to parse\n *\n- * This method tries to create an IPAModule instance for every shared object\n- * found in \\a libDir, and skips invalid IPA modules.\n+ * Search a directory for .so files. allowing recursion down to\n+ * subdirectories no further than the quantity specified by \\a subdirs\n *\n- * \\return Number of modules loaded by this call, or a negative error code\n- * otherwise\n+ * \\return 0 on success or a negative error code otherwise\n */\n-int IPAManager::addDir(const char *libDir)\n+int IPAManager::parseDir(const char *libDir, std::vector &paths,\n+\t\t\t unsigned int subdirs)\n {\n \tstruct dirent *ent;\n \tDIR *dir;\n@@ -158,8 +159,20 @@ int IPAManager::addDir(const char *libDir)\n \tif (!dir)\n \t\treturn -errno;\n \n-\tstd::vector paths;\n \twhile ((ent = readdir(dir)) != nullptr) {\n+\t\tif (ent->d_type == DT_DIR && subdirs) {\n+\t\t\tif (strcmp(ent->d_name, \".\") == 0 ||\n+\t\t\t strcmp(ent->d_name, \"..\") == 0)\n+\t\t\t\tcontinue;\n+\n+\t\t\tstd::string subdir = std::string(libDir) + \"/\" + ent->d_name;\n+\n+\t\t\t/* Only recurse to the limit specified by subdirs */\n+\t\t\tparseDir(subdir.c_str(), paths, subdirs - 1);\n+\n+\t\t\tcontinue;\n+\t\t}\n+\n \t\tint offset = strlen(ent->d_name) - 3;\n \t\tif (offset < 0)\n \t\t\tcontinue;\n@@ -170,6 +183,28 @@ int IPAManager::addDir(const char *libDir)\n \t}\n \tclosedir(dir);\n \n+\treturn 0;\n+}\n+\n+/**\n+ * \\brief Load IPA modules from a directory\n+ * \\param[in] libDir directory to search for IPA modules\n+ * \\param[in] subdirs maximum number of sub-directories to parse\n+ *\n+ * This method tries to create an IPAModule instance for every shared object\n+ * found in \\a libDir, and skips invalid IPA modules.\n+ *\n+ * \\return Number of modules loaded by this call, or a negative error code\n+ * otherwise\n+ */\n+int IPAManager::addDir(const char *libDir, unsigned int subdirs)\n+{\n+\tstd::vector paths;\n+\n+\tint ret = parseDir(libDir, paths, subdirs);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n \t/* Ensure a stable ordering of modules. */\n \tstd::sort(paths.begin(), paths.end());\n \n@@ -193,6 +228,7 @@ int IPAManager::addDir(const char *libDir)\n /**\n * \\brief Load IPA modules from a colon separated PATH variable\n * \\param[in] path string to split to search for IPA modules\n+ * \\param[in] subdirs maximum number of sub-directories to parse\n *\n * This method tries to create an IPAModule instance for every shared object\n * found in the directories described by \\a paths.\n@@ -200,7 +236,7 @@ int IPAManager::addDir(const char *libDir)\n * \\return Number of modules loaded by this call, or a negative error code\n * otherwise\n */\n-int IPAManager::addPath(const char *paths)\n+int IPAManager::addPath(const char *paths, unsigned int subdirs)\n {\n \tint ipaCount = 0;\n \n@@ -210,7 +246,7 @@ int IPAManager::addPath(const char *paths)\n \n \t\tif (count) {\n \t\t\tstd::string path(paths, count);\n-\t\t\tint ret = addDir(path.c_str());\n+\t\t\tint ret = addDir(path.c_str(), subdirs);\n \t\t\tif (ret > 0)\n \t\t\t\tipaCount += ret;\n \t\t}\n","prefixes":["libcamera-devel","3/5"]}