{"id":2772,"url":"https://patchwork.libcamera.org/api/patches/2772/?format=json","web_url":"https://patchwork.libcamera.org/patch/2772/","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-3-kieran.bingham@ideasonboard.com>","date":"2020-02-05T13:04:17","name":"[libcamera-devel,2/5] libcamera: ipa_manager: Split path handling","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"8cf791add7ed8baf7383e441213c5cd29f2c4722","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/2772/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/2772/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2772/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 3EEB360443\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 DD08FA3B;\n\tWed, 5 Feb 2020 14:04:25 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1580907866;\n\tbh=U2Oldkn9fy3GFixU+eQ9nvu7IcEXlTNY+WEr64ZwhE8=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=NwGYpDYCnaISU800BaTQVS4mVuPx/9nRoMaesSY93Z3cR8mvhdvs7U+fFvJ2WAIm0\n\tof27DmGmRWsFWEcJcz5aBdfdGFSuLxBmo05jar30ZRyq+3vqBRh+nSYQnr4l6V+O2N\n\tIW9shWk1OkGkvJVoV6C4vQmR9wCUQbbWbEnVYn0g=","From":"Kieran Bingham ","To":"LibCamera Devel ","Date":"Wed, 5 Feb 2020 13:04:17 +0000","Message-Id":"<20200205130420.8736-3-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 2/5] 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":"Wed, 05 Feb 2020 13:04:26 -0000"},"content":"Move the iteration of a colon separated path to it's 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 | 52 +++++++++++++++++++----------\n 2 files changed, 36 insertions(+), 17 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 92adc6c45015..048465c37772 100644\n--- a/src/libcamera/ipa_manager.cpp\n+++ b/src/libcamera/ipa_manager.cpp\n@@ -110,23 +110,7 @@ IPAManager::IPAManager()\n \t\treturn;\n \t}\n \n-\tconst char *paths = modulePaths;\n-\twhile (1) {\n-\t\tconst char *delim = strchrnul(paths, ':');\n-\t\tsize_t count = delim - paths;\n-\n-\t\tif (count) {\n-\t\t\tstd::string path(paths, count);\n-\t\t\tret = addDir(path.c_str());\n-\t\t\tif (ret > 0)\n-\t\t\t\tipaCount += ret;\n-\t\t}\n-\n-\t\tif (*delim == '\\0')\n-\t\t\tbreak;\n-\n-\t\tpaths += count + 1;\n-\t}\n+\tipaCount += addPath(modulePaths);\n \n \tif (!ipaCount)\n \t\tLOG(IPAManager, Warning)\n@@ -206,6 +190,40 @@ int IPAManager::addDir(const char *libDir)\n \treturn count;\n }\n \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+ *\n+ * This method tries to create an IPAModule instance for every shared object\n+ * found in the directories described by \\a paths.\n+ *\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+{\n+\tint ipaCount = 0;\n+\n+\twhile (1) {\n+\t\tconst char *delim = strchrnul(paths, ':');\n+\t\tsize_t count = delim - 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\tif (ret > 0)\n+\t\t\t\tipaCount += ret;\n+\t\t}\n+\n+\t\tif (*delim == '\\0')\n+\t\t\tbreak;\n+\n+\t\tpaths += count + 1;\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","2/5"]}