[{"id":2778,"web_url":"https://patchwork.libcamera.org/comment/2778/","msgid":"<20191004150346.cgblimovgz5xrwzh@uno.localdomain>","date":"2019-10-04T15:03:46","subject":"Re: [libcamera-devel] [PATCH] libcamera: ipa_manager: Sort IPA\n\tmodules by name","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n\nOn Fri, Oct 04, 2019 at 12:01:13AM +0300, Laurent Pinchart wrote:\n> Sort IPA modules by name when enumerating modules in a directory in\n> order to guarantee a stable ordering. This eases debugging by making\n> issues more reproducible.\n>\n\nThis is welcome and I think you should simply add\n+ LOG(IPAManager, Debug) << \"Loaded IPA module '\" << path << \"'\";\n\nSo that we drop my: \"ipa: ipa_manager: Print the loaded IPA modules path\"\n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> Signed-off-by: Laurent Pinchart \n> ---\n> src/libcamera/ipa_manager.cpp | 16 ++++++++++++----\n> 1 file changed, 12 insertions(+), 4 deletions(-)\n>\n> diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\n> index 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> --\n> Regards,\n>\n> Laurent Pinchart\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net\n\t[217.70.183.194])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 807A86101A\n\tfor ;\n\tFri, 4 Oct 2019 17:02:03 +0200 (CEST)","from uno.localdomain (2-224-242-101.ip172.fastwebnet.it\n\t[2.224.242.101]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay2-d.mail.gandi.net (Postfix) with ESMTPSA id EEC094000E;\n\tFri, 4 Oct 2019 15:02:02 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","Date":"Fri, 4 Oct 2019 17:03:46 +0200","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20191004150346.cgblimovgz5xrwzh@uno.localdomain>","References":"<20191003210113.13366-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"4oi5hqtzxdgh4saw\"","Content-Disposition":"inline","In-Reply-To":"<20191003210113.13366-1-laurent.pinchart@ideasonboard.com>","User-Agent":"NeoMutt/20180716","Subject":"Re: [libcamera-devel] [PATCH] libcamera: ipa_manager: Sort IPA\n\tmodules by 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":"Fri, 04 Oct 2019 15:02:03 -0000"}},{"id":2780,"web_url":"https://patchwork.libcamera.org/comment/2780/","msgid":"<20191004160202.GC8579@pendragon.ideasonboard.com>","date":"2019-10-04T16:02:02","subject":"Re: [libcamera-devel] [PATCH] libcamera: ipa_manager: Sort IPA\n\tmodules by name","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn Fri, Oct 04, 2019 at 05:03:46PM +0200, Jacopo Mondi wrote:\n> On Fri, Oct 04, 2019 at 12:01:13AM +0300, Laurent Pinchart wrote:\n> > Sort IPA modules by name when enumerating modules in a directory in\n> > order to guarantee a stable ordering. This eases debugging by making\n> > issues more reproducible.\n> \n> This is welcome and I think you should simply add\n> + LOG(IPAManager, Debug) << \"Loaded IPA module '\" << path << \"'\";\n> \n> So that we drop my: \"ipa: ipa_manager: Print the loaded IPA modules path\"\n\nNiklas also keeps asking us to split patches, are you proposing doing\nthe opposite ? :-) I'll push your patch on top of this.\n\n> Reviewed-by: Jacopo Mondi \n> \n> > Signed-off-by: Laurent Pinchart \n> > ---\n> > src/libcamera/ipa_manager.cpp | 16 ++++++++++++----\n> > 1 file changed, 12 insertions(+), 4 deletions(-)\n> >\n> > diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\n> > index 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> >","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 638986101A\n\tfor ;\n\tFri, 4 Oct 2019 18:02:16 +0200 (CEST)","from pendragon.ideasonboard.com (unknown [132.205.230.4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9775C2E5;\n\tFri, 4 Oct 2019 18:02:15 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1570204936;\n\tbh=gfEMhKkQtwzm858nh1oG2Ki15SMDp7ssSb8isKl3zCc=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=DV8RBZ7v1MjePU5hFrmZeAwGN55Q6fpRUkmy2JyyMZ735qvsA73j/xguRzXN19vdX\n\t5srvytuNi25AwPhjxJn3wPaGb2ZySXDghd5+nSMXrO76/4tiOWbziLG4mP0MWCb+Gu\n\tRj6f26wM7KpOUCBvzW4z7de5Aow+094vi0sihYn4=","Date":"Fri, 4 Oct 2019 19:02:02 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20191004160202.GC8579@pendragon.ideasonboard.com>","References":"<20191003210113.13366-1-laurent.pinchart@ideasonboard.com>\n\t<20191004150346.cgblimovgz5xrwzh@uno.localdomain>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20191004150346.cgblimovgz5xrwzh@uno.localdomain>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH] libcamera: ipa_manager: Sort IPA\n\tmodules by 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":"Fri, 04 Oct 2019 16:02:16 -0000"}}]