{"id":2094,"url":"https://patchwork.libcamera.org/api/1.1/patches/2094/?format=json","web_url":"https://patchwork.libcamera.org/patch/2094/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20191003210113.13366-1-laurent.pinchart@ideasonboard.com>","date":"2019-10-03T21:01:13","name":"[libcamera-devel] libcamera: ipa_manager: Sort IPA modules by name","commit_ref":"200bb4c60fa4bca408c94e5964f02de496401611","pull_url":null,"state":"accepted","archived":false,"hash":"d8eeca309f0e0f92b9f5ec20d45fbd6ca8996b2c","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2094/mbox/","series":[{"id":517,"url":"https://patchwork.libcamera.org/api/1.1/series/517/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=517","date":"2019-10-03T21:01:13","name":"[libcamera-devel] libcamera: ipa_manager: Sort IPA modules by name","version":1,"mbox":"https://patchwork.libcamera.org/series/517/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2094/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2094/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 2696260BE8\n\tfor ;\n\tThu, 3 Oct 2019 23:01:30 +0200 (CEST)","from pendragon.wireless.concordia.ca (unknown [132.205.229.214])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 42D912E5\n\tfor ;\n\tThu, 3 Oct 2019 23:01:29 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1570136489;\n\tbh=Z4yK8lQZefrW9t8+6tizovPsfyyO+BLYDmKfOFs6Z9c=;\n\th=From:To:Subject:Date:From;\n\tb=r5tvtO7UubYQDe3utaATA4lc6R7L6EudhwyrnN7wsX9HmmHez+jZn3J5mrYDS6dYY\n\tWScWXG5nzM96AjebfQ8ONd1UztNbosYTXlRkVTqPsQ/7W67wmwhll7r5nCYlvPqky2\n\tob6CRVo1DxLXYpAXPi8TVQL2a0ShaVPJNe8AbbhU=","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","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] libcamera: ipa_manager: Sort IPA modules\n\tby name","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, 03 Oct 2019 21:01:30 -0000"},"content":"Sort IPA modules by name when enumerating modules in a directory in\norder to guarantee a stable ordering. This eases debugging by making\nissues more reproducible.\n\nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/ipa_manager.cpp | 16 ++++++++++++----\n 1 file changed, 12 insertions(+), 4 deletions(-)","diff":"diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\nindex 708233e8a9c7..27aa17920bab 100644\n--- a/src/libcamera/ipa_manager.cpp\n+++ b/src/libcamera/ipa_manager.cpp\n@@ -7,6 +7,7 @@\n \n #include \"ipa_manager.h\"\n \n+#include \n #include \n #include \n #include \n@@ -112,7 +113,7 @@ int IPAManager::addDir(const char *libDir)\n \tif (!dir)\n \t\treturn -errno;\n \n-\tunsigned int count = 0;\n+\tstd::vector paths;\n \twhile ((ent = readdir(dir)) != nullptr) {\n \t\tint offset = strlen(ent->d_name) - 3;\n \t\tif (offset < 0)\n@@ -120,8 +121,16 @@ int IPAManager::addDir(const char *libDir)\n \t\tif (strcmp(&ent->d_name[offset], \".so\"))\n \t\t\tcontinue;\n \n-\t\tIPAModule *ipaModule = new IPAModule(std::string(libDir) +\n-\t\t\t\t\t\t \"/\" + ent->d_name);\n+\t\tpaths.push_back(std::string(libDir) + \"/\" + ent->d_name);\n+\t}\n+\tclosedir(dir);\n+\n+\t/* Ensure a stable ordering of modules. */\n+\tstd::sort(paths.begin(), paths.end());\n+\n+\tunsigned int count = 0;\n+\tfor (const std::string &path : paths) {\n+\t\tIPAModule *ipaModule = new IPAModule(path);\n \t\tif (!ipaModule->isValid()) {\n \t\t\tdelete ipaModule;\n \t\t\tcontinue;\n@@ -131,7 +140,6 @@ int IPAManager::addDir(const char *libDir)\n \t\tcount++;\n \t}\n \n-\tclosedir(dir);\n \treturn count;\n }\n \n","prefixes":["libcamera-devel"]}