[libcamera-devel,v2] libcamera: ipa_manager: Rework error messages when enumerating IPAs
diff mbox series

Message ID 20190918132014.11412-1-laurent.pinchart@ideasonboard.com
State Accepted
Headers show
Series
  • [libcamera-devel,v2] libcamera: ipa_manager: Rework error messages when enumerating IPAs
Related show

Commit Message

Laurent Pinchart Sept. 18, 2019, 1:20 p.m. UTC 
When enumerating IPAs, the system IPA directory and all the directories
listed in the LIBCAMERA_IPA_MODULE_PATH environment variable are listed
in turn. Failing to list any of those directories results in an error
message being printed for every failure. This is particularly common
when developing libcamera, as IPAs may not have been installed locally.

To avoid unnecessarily worrying error messages, rework the enumeration
procedure to only print a message when no IPA can be found at all.
Individual missing directories are not considered as an issue anymore.
The message is also downgraded from an error to a warning as the
situation may still be normal.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
---
Changes since v1:

- Only print a warning when LIBCAMERA_IPA_MODULE_PATH is not set if no
  module can be found in the system IPA directory
- Add a new temporary paths variable to keep modulePaths unmodified for
  the warning message
---
 src/libcamera/ipa_manager.cpp | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

Patch
diff mbox series 

diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp
index 4276d995bdd5..270e538a4d01 100644
--- a/src/libcamera/ipa_manager.cpp
+++ b/src/libcamera/ipa_manager.cpp
@@ -33,26 +33,43 @@  LOG_DEFINE_CATEGORY(IPAManager)
 
 IPAManager::IPAManager()
 {
-	addDir(IPA_MODULE_DIR);
+	unsigned int ipaCount = 0;
+	int ret;
+
+	ret = addDir(IPA_MODULE_DIR);
+	if (ret > 0)
+		ipaCount += ret;
 
 	const char *modulePaths = utils::secure_getenv("LIBCAMERA_IPA_MODULE_PATH");
-	if (!modulePaths)
+	if (!modulePaths) {
+		if (!ipaCount)
+			LOG(IPAManager, Warning)
+				<< "No IPA found in '" IPA_MODULE_DIR "'";
 		return;
+	}
 
+	const char *paths = modulePaths;
 	while (1) {
-		const char *delim = strchrnul(modulePaths, ':');
-		size_t count = delim - modulePaths;
+		const char *delim = strchrnul(paths, ':');
+		size_t count = delim - paths;
 
 		if (count) {
-			std::string path(modulePaths, count);
-			addDir(path.c_str());
+			std::string path(paths, count);
+			ret = addDir(path.c_str());
+			if (ret > 0)
+				ipaCount += ret;
 		}
 
 		if (*delim == '\0')
 			break;
 
-		modulePaths += count + 1;
+		paths += count + 1;
 	}
+
+	if (!ipaCount)
+		LOG(IPAManager, Warning)
+			<< "No IPA found in '" IPA_MODULE_DIR "' and '"
+			<< modulePaths << "'";
 }
 
 IPAManager::~IPAManager()
@@ -94,9 +111,6 @@  int IPAManager::addDir(const char *libDir)
 	dir = opendir(libDir);
 	if (!dir) {
 		int ret = -errno;
-		LOG(IPAManager, Error)
-			<< "Invalid path " << libDir << " for IPA modules: "
-			<< strerror(-ret);
 		return ret;
 	}