From patchwork Thu Oct 3 21:01:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 2094 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2696260BE8 for ; Thu, 3 Oct 2019 23:01:30 +0200 (CEST) Received: from pendragon.wireless.concordia.ca (unknown [132.205.229.214]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 42D912E5 for ; Thu, 3 Oct 2019 23:01:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1570136489; bh=Z4yK8lQZefrW9t8+6tizovPsfyyO+BLYDmKfOFs6Z9c=; h=From:To:Subject:Date:From; b=r5tvtO7UubYQDe3utaATA4lc6R7L6EudhwyrnN7wsX9HmmHez+jZn3J5mrYDS6dYY WScWXG5nzM96AjebfQ8ONd1UztNbosYTXlRkVTqPsQ/7W67wmwhll7r5nCYlvPqky2 ob6CRVo1DxLXYpAXPi8TVQL2a0ShaVPJNe8AbbhU= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 4 Oct 2019 00:01:13 +0300 Message-Id: <20191003210113.13366-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: ipa_manager: Sort IPA modules by name X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Oct 2019 21:01:30 -0000 Sort IPA modules by name when enumerating modules in a directory in order to guarantee a stable ordering. This eases debugging by making issues more reproducible. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- src/libcamera/ipa_manager.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp index 708233e8a9c7..27aa17920bab 100644 --- a/src/libcamera/ipa_manager.cpp +++ b/src/libcamera/ipa_manager.cpp @@ -7,6 +7,7 @@ #include "ipa_manager.h" +#include #include #include #include @@ -112,7 +113,7 @@ int IPAManager::addDir(const char *libDir) if (!dir) return -errno; - unsigned int count = 0; + std::vector paths; while ((ent = readdir(dir)) != nullptr) { int offset = strlen(ent->d_name) - 3; if (offset < 0) @@ -120,8 +121,16 @@ int IPAManager::addDir(const char *libDir) if (strcmp(&ent->d_name[offset], ".so")) continue; - IPAModule *ipaModule = new IPAModule(std::string(libDir) + - "/" + ent->d_name); + paths.push_back(std::string(libDir) + "/" + ent->d_name); + } + closedir(dir); + + /* Ensure a stable ordering of modules. */ + std::sort(paths.begin(), paths.end()); + + unsigned int count = 0; + for (const std::string &path : paths) { + IPAModule *ipaModule = new IPAModule(path); if (!ipaModule->isValid()) { delete ipaModule; continue; @@ -131,7 +140,6 @@ int IPAManager::addDir(const char *libDir) count++; } - closedir(dir); return count; }