[{"id":4542,"web_url":"https://patchwork.libcamera.org/comment/4542/","msgid":"<20200427074404.dfqs3pfqzjybe5qz@uno.localdomain>","date":"2020-04-27T07:44:04","subject":"Re: [libcamera-devel] [PATCH 02/11] libcamera: utils: Add a\n\tfunction to retrieve the libcamera source tree","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n\nOn Mon, Apr 27, 2020 at 06:17:04AM +0300, Laurent Pinchart wrote:\n> Similarly to libcameraBuildPath(), there's a need to locate resources\n> within the source tree when running libcamera without installing it.\n> Support this use case with a new utils::libcameraSourcePath() function.\n>\n> The implementation currently leaks the path to the source tree in the\n> installed binary. The data is put in a separate section named .zero\n> which will need to be zeroed at installation time to fix this.\n>\n> Signed-off-by: Laurent Pinchart \n> ---\n> meson.build | 2 ++\n> src/libcamera/include/utils.h | 1 +\n> src/libcamera/utils.cpp | 37 ++++++++++++++++++++++++++++++++---\n> 3 files changed, 37 insertions(+), 3 deletions(-)\n>\n> diff --git a/meson.build b/meson.build\n> index c6e6a934e54e..2058a6a77ceb 100644\n> --- a/meson.build\n> +++ b/meson.build\n> @@ -26,6 +26,8 @@ libcamera_version = libcamera_git_version.split('+')[0]\n> cc = meson.get_compiler('c')\n> config_h = configuration_data()\n>\n> +config_h.set('LIBCAMERA_SOURCE_DIR', '\"' + meson.current_source_dir() + '\"')\n> +\n> if cc.has_header_symbol('execinfo.h', 'backtrace')\n> config_h.set('HAVE_BACKTRACE', 1)\n> endif\n> diff --git a/src/libcamera/include/utils.h b/src/libcamera/include/utils.h\n> index 242eeded9d50..3334ff16613d 100644\n> --- a/src/libcamera/include/utils.h\n> +++ b/src/libcamera/include/utils.h\n> @@ -188,6 +188,7 @@ private:\n> details::StringSplitter split(const std::string &str, const std::string &delim);\n>\n> std::string libcameraBuildPath();\n> +std::string libcameraSourcePath();\n>\n> } /* namespace utils */\n>\n> diff --git a/src/libcamera/utils.cpp b/src/libcamera/utils.cpp\n> index 97f9b632e45b..056a67e93e0f 100644\n> --- a/src/libcamera/utils.cpp\n> +++ b/src/libcamera/utils.cpp\n> @@ -360,9 +360,10 @@ bool isLibcameraInstalled()\n> *\n> * During development, it is useful to run libcamera binaries directly from the\n> * build directory without installing them. This function helps components that\n> - * need to locate resources, such as IPA modules or IPA proxy workers, by\n> - * providing them with the path to the root of the build directory. Callers can\n> - * then use it to complement or override searches in system-wide directories.\n> + * need to locate resources in the build tree, such as IPA modules or IPA proxy\n> + * workers, by providing them with the path to the root of the build directory.\n> + * Callers can then use it to complement or override searches in system-wide\n> + * directories.\n> *\n> * If libcamera has been installed, the build directory path is not available\n> * and this function returns an empty string.\n> @@ -385,6 +386,36 @@ std::string libcameraBuildPath()\n> \treturn dirname(info.dli_fname) + \"/../../\";\n> }\n>\n> +namespace {\n> +/* \\todo Figure out a way to zero this section at install time */\n> +__attribute__((section(\".zero\")))\n> +const char sourceDirectory[] = LIBCAMERA_SOURCE_DIR;\n> +} /* namespace */\n> +\n> +/**\n> + * \\brief Retrieve the path to the source directory\n> + *\n> + * During development, it is useful to run libcamera binaries directly from the\n> + * build directory without installing them. This function helps components that\n> + * need to locate resources in the source tree, such as IPA configuration\n> + * files, by providing them with the path to the root of the source directory.\n> + * Callers can then use it to complement or override searches in system-wide\n> + * directories.\n> + *\n> + * If libcamera has been installed, the source directory path is not available\n> + * and this function returns an empty string.\n> + *\n> + * \\return The path to the source directory if running from a build, or an empty\n\n\"from a build\" or \"from the build directory\" ?\n\nNit apart:\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> + * string otherwise\n> + */\n> +std::string libcameraSourcePath()\n> +{\n> +\tif (isLibcameraInstalled())\n> +\t\treturn std::string();\n> +\n> +\treturn std::string(sourceDirectory) + \"/\";\n> +}\n> +\n> } /* namespace utils */\n>\n> } /* namespace libcamera */\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 relay12.mail.gandi.net (relay12.mail.gandi.net\n\t[217.70.178.232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A41E3603F8\n\tfor ;\n\tMon, 27 Apr 2020 09:40:54 +0200 (CEST)","from uno.localdomain (a-ur1-85.tin.it [212.216.150.148])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay12.mail.gandi.net (Postfix) with ESMTPSA id E3B14200011;\n\tMon, 27 Apr 2020 07:40:53 +0000 (UTC)"],"Date":"Mon, 27 Apr 2020 09:44:04 +0200","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200427074404.dfqs3pfqzjybe5qz@uno.localdomain>","References":"<20200427031713.14013-1-laurent.pinchart@ideasonboard.com>\n\t<20200427031713.14013-3-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20200427031713.14013-3-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 02/11] libcamera: utils: Add a\n\tfunction to retrieve the libcamera source tree","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":"Mon, 27 Apr 2020 07:40:54 -0000"}},{"id":4557,"web_url":"https://patchwork.libcamera.org/comment/4557/","msgid":"<0e20fc3d-2d60-9d35-0b6a-ba591b17166f@ideasonboard.com>","date":"2020-04-27T10:11:35","subject":"Re: [libcamera-devel] [PATCH 02/11] libcamera: utils: Add a\n\tfunction to retrieve the libcamera source tree","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 27/04/2020 04:17, Laurent Pinchart wrote:\n> Similarly to libcameraBuildPath(), there's a need to locate resources\n> within the source tree when running libcamera without installing it.\n> Support this use case with a new utils::libcameraSourcePath() function.\n\nEeeep.\n\n\n> The implementation currently leaks the path to the source tree in the\n> installed binary. The data is put in a separate section named .zero\n> which will need to be zeroed at installation time to fix this.\n\nIndeed.\n\nI guess we can't get any of this from the debug symbols can we? That\nwon't be reliable.\n\n\n> Signed-off-by: Laurent Pinchart \n\nThis is always going to be painful... but I don't think we should block\nthis branch just because of leaking the source path - but we certainly\nwant to fix it soon after.\n\nReviewed-by: Kieran Bingham \n\n\n> ---\n> meson.build | 2 ++\n> src/libcamera/include/utils.h | 1 +\n> src/libcamera/utils.cpp | 37 ++++++++++++++++++++++++++++++++---\n> 3 files changed, 37 insertions(+), 3 deletions(-)\n> \n> diff --git a/meson.build b/meson.build\n> index c6e6a934e54e..2058a6a77ceb 100644\n> --- a/meson.build\n> +++ b/meson.build\n> @@ -26,6 +26,8 @@ libcamera_version = libcamera_git_version.split('+')[0]\n> cc = meson.get_compiler('c')\n> config_h = configuration_data()\n> \n> +config_h.set('LIBCAMERA_SOURCE_DIR', '\"' + meson.current_source_dir() + '\"')\n> +\n> if cc.has_header_symbol('execinfo.h', 'backtrace')\n> config_h.set('HAVE_BACKTRACE', 1)\n> endif\n> diff --git a/src/libcamera/include/utils.h b/src/libcamera/include/utils.h\n> index 242eeded9d50..3334ff16613d 100644\n> --- a/src/libcamera/include/utils.h\n> +++ b/src/libcamera/include/utils.h\n> @@ -188,6 +188,7 @@ private:\n> details::StringSplitter split(const std::string &str, const std::string &delim);\n> \n> std::string libcameraBuildPath();\n> +std::string libcameraSourcePath();\n> \n> } /* namespace utils */\n> \n> diff --git a/src/libcamera/utils.cpp b/src/libcamera/utils.cpp\n> index 97f9b632e45b..056a67e93e0f 100644\n> --- a/src/libcamera/utils.cpp\n> +++ b/src/libcamera/utils.cpp\n> @@ -360,9 +360,10 @@ bool isLibcameraInstalled()\n> *\n> * During development, it is useful to run libcamera binaries directly from the\n> * build directory without installing them. This function helps components that\n> - * need to locate resources, such as IPA modules or IPA proxy workers, by\n> - * providing them with the path to the root of the build directory. Callers can\n> - * then use it to complement or override searches in system-wide directories.\n> + * need to locate resources in the build tree, such as IPA modules or IPA proxy\n> + * workers, by providing them with the path to the root of the build directory.\n> + * Callers can then use it to complement or override searches in system-wide\n> + * directories.\n> *\n> * If libcamera has been installed, the build directory path is not available\n> * and this function returns an empty string.\n> @@ -385,6 +386,36 @@ std::string libcameraBuildPath()\n> \treturn dirname(info.dli_fname) + \"/../../\";\n> }\n> \n> +namespace {\n> +/* \\todo Figure out a way to zero this section at install time */\n> +__attribute__((section(\".zero\")))\n> +const char sourceDirectory[] = LIBCAMERA_SOURCE_DIR;\n\nEven if we can zero this out - it won't give us reproducible builds, as\nthe section size will be dependant upon the size of the\nLIBCAMERA_SOURCE_DIR string.\n\nNow I think about it - I can't recall if we hit the same issue on the\nbuildPath too.\n\nIf this 'works for now' we can defer though.\n\n> +} /* namespace */\n> +\n> +/**\n> + * \\brief Retrieve the path to the source directory\n> + *\n> + * During development, it is useful to run libcamera binaries directly from the\n> + * build directory without installing them. This function helps components that\n> + * need to locate resources in the source tree, such as IPA configuration\n> + * files, by providing them with the path to the root of the source directory.\n> + * Callers can then use it to complement or override searches in system-wide\n> + * directories.\n> + *\n> + * If libcamera has been installed, the source directory path is not available\n> + * and this function returns an empty string.\n> + *\n> + * \\return The path to the source directory if running from a build, or an empty\n> + * string otherwise\n> + */\n> +std::string libcameraSourcePath()\n> +{\n> +\tif (isLibcameraInstalled())\n> +\t\treturn std::string();\n> +\n> +\treturn std::string(sourceDirectory) + \"/\";\n> +}\n> +\n> } /* namespace utils */\n> \n> } /* namespace libcamera */\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 6FC64603F9\n\tfor ;\n\tMon, 27 Apr 2020 12:11:38 +0200 (CEST)","from [192.168.0.20]\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 C310A72C;\n\tMon, 27 Apr 2020 12:11:37 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"EJfHWoxQ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1587982298;\n\tbh=7MKueGb/bPh0jcW+xgF2ajYC0dck3W/R9xtfOgexbpQ=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=EJfHWoxQwitlSJj7jvk2UUPxHrkXB2iM+okryv06Q2N9/WJafs5p/21XwdpdVdrjc\n\tfyMLM4rwWOawCAFg152CDU1gZ9JJm4J8jGZbAK94fRg9Vqdsmq4H+dHm53AUa7iI4Z\n\tgaMbVU/5mvBc7RnDYgvEFx5IvG6Te1i3cNkfxu8I=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200427031713.14013-1-laurent.pinchart@ideasonboard.com>\n\t<20200427031713.14013-3-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<0e20fc3d-2d60-9d35-0b6a-ba591b17166f@ideasonboard.com>","Date":"Mon, 27 Apr 2020 11:11:35 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.7.0","MIME-Version":"1.0","In-Reply-To":"<20200427031713.14013-3-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH 02/11] libcamera: utils: Add a\n\tfunction to retrieve the libcamera source tree","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":"Mon, 27 Apr 2020 10:11:38 -0000"}},{"id":4561,"web_url":"https://patchwork.libcamera.org/comment/4561/","msgid":"<20200427104540.GB5849@pendragon.ideasonboard.com>","date":"2020-04-27T10:45:40","subject":"Re: [libcamera-devel] [PATCH 02/11] libcamera: utils: Add a\n\tfunction to retrieve the libcamera source tree","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Mon, Apr 27, 2020 at 11:11:35AM +0100, Kieran Bingham wrote:\n> On 27/04/2020 04:17, Laurent Pinchart wrote:\n> > Similarly to libcameraBuildPath(), there's a need to locate resources\n> > within the source tree when running libcamera without installing it.\n> > Support this use case with a new utils::libcameraSourcePath() function.\n> \n> Eeeep.\n\nI know :-S\n\n> > The implementation currently leaks the path to the source tree in the\n> > installed binary. The data is put in a separate section named .zero\n> > which will need to be zeroed at installation time to fix this.\n> \n> Indeed.\n> \n> I guess we can't get any of this from the debug symbols can we? That\n> won't be reliable.\n\nDo we really want a debug symbols parser inside libcamera ? :-)\n\n> > Signed-off-by: Laurent Pinchart \n> \n> This is always going to be painful... but I don't think we should block\n> this branch just because of leaking the source path - but we certainly\n> want to fix it soon after.\n> \n> Reviewed-by: Kieran Bingham \n\nI'll try another approach, based on a symlink to the source tree inside\nthe build directory. If I can't do so in a reasonable amount of time\nI'll merge this patch as-is and fix the issue on top.\n\n> > ---\n> > meson.build | 2 ++\n> > src/libcamera/include/utils.h | 1 +\n> > src/libcamera/utils.cpp | 37 ++++++++++++++++++++++++++++++++---\n> > 3 files changed, 37 insertions(+), 3 deletions(-)\n> > \n> > diff --git a/meson.build b/meson.build\n> > index c6e6a934e54e..2058a6a77ceb 100644\n> > --- a/meson.build\n> > +++ b/meson.build\n> > @@ -26,6 +26,8 @@ libcamera_version = libcamera_git_version.split('+')[0]\n> > cc = meson.get_compiler('c')\n> > config_h = configuration_data()\n> > \n> > +config_h.set('LIBCAMERA_SOURCE_DIR', '\"' + meson.current_source_dir() + '\"')\n> > +\n> > if cc.has_header_symbol('execinfo.h', 'backtrace')\n> > config_h.set('HAVE_BACKTRACE', 1)\n> > endif\n> > diff --git a/src/libcamera/include/utils.h b/src/libcamera/include/utils.h\n> > index 242eeded9d50..3334ff16613d 100644\n> > --- a/src/libcamera/include/utils.h\n> > +++ b/src/libcamera/include/utils.h\n> > @@ -188,6 +188,7 @@ private:\n> > details::StringSplitter split(const std::string &str, const std::string &delim);\n> > \n> > std::string libcameraBuildPath();\n> > +std::string libcameraSourcePath();\n> > \n> > } /* namespace utils */\n> > \n> > diff --git a/src/libcamera/utils.cpp b/src/libcamera/utils.cpp\n> > index 97f9b632e45b..056a67e93e0f 100644\n> > --- a/src/libcamera/utils.cpp\n> > +++ b/src/libcamera/utils.cpp\n> > @@ -360,9 +360,10 @@ bool isLibcameraInstalled()\n> > *\n> > * During development, it is useful to run libcamera binaries directly from the\n> > * build directory without installing them. This function helps components that\n> > - * need to locate resources, such as IPA modules or IPA proxy workers, by\n> > - * providing them with the path to the root of the build directory. Callers can\n> > - * then use it to complement or override searches in system-wide directories.\n> > + * need to locate resources in the build tree, such as IPA modules or IPA proxy\n> > + * workers, by providing them with the path to the root of the build directory.\n> > + * Callers can then use it to complement or override searches in system-wide\n> > + * directories.\n> > *\n> > * If libcamera has been installed, the build directory path is not available\n> > * and this function returns an empty string.\n> > @@ -385,6 +386,36 @@ std::string libcameraBuildPath()\n> > \treturn dirname(info.dli_fname) + \"/../../\";\n> > }\n> > \n> > +namespace {\n> > +/* \\todo Figure out a way to zero this section at install time */\n> > +__attribute__((section(\".zero\")))\n> > +const char sourceDirectory[] = LIBCAMERA_SOURCE_DIR;\n> \n> Even if we can zero this out - it won't give us reproducible builds, as\n> the section size will be dependant upon the size of the\n> LIBCAMERA_SOURCE_DIR string.\n> \n> Now I think about it - I can't recall if we hit the same issue on the\n> buildPath too.\n> \n> If this 'works for now' we can defer though.\n> \n> > +} /* namespace */\n> > +\n> > +/**\n> > + * \\brief Retrieve the path to the source directory\n> > + *\n> > + * During development, it is useful to run libcamera binaries directly from the\n> > + * build directory without installing them. This function helps components that\n> > + * need to locate resources in the source tree, such as IPA configuration\n> > + * files, by providing them with the path to the root of the source directory.\n> > + * Callers can then use it to complement or override searches in system-wide\n> > + * directories.\n> > + *\n> > + * If libcamera has been installed, the source directory path is not available\n> > + * and this function returns an empty string.\n> > + *\n> > + * \\return The path to the source directory if running from a build, or an empty\n> > + * string otherwise\n> > + */\n> > +std::string libcameraSourcePath()\n> > +{\n> > +\tif (isLibcameraInstalled())\n> > +\t\treturn std::string();\n> > +\n> > +\treturn std::string(sourceDirectory) + \"/\";\n> > +}\n> > +\n> > } /* namespace utils */\n> > \n> > } /* namespace libcamera */","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 CD77F603F9\n\tfor ;\n\tMon, 27 Apr 2020 12:45:55 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2DBB672C;\n\tMon, 27 Apr 2020 12:45:55 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"bpG6cP4h\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1587984355;\n\tbh=2EEvU7cPBSohbVueD6uw9aQOHxntpzZQyHBDoTFa+xQ=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=bpG6cP4h3B/rppnVBfHPt0rB7IPpwPQ0oUtRY3H8hUTFGJXhYCSyiOKI17L1Pkxyy\n\txKSeJFNFhKf9CBG0imWzG6OWxLtrZvCrwPlvzusKDPnLz8B56tdO/vZbtHbEx0UrEd\n\thyYigeKQ6u0cQGWsLYSkPYYbBSX7PNgYmZ8uFcdg=","Date":"Mon, 27 Apr 2020 13:45:40 +0300","From":"Laurent Pinchart ","To":"Kieran Bingham ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200427104540.GB5849@pendragon.ideasonboard.com>","References":"<20200427031713.14013-1-laurent.pinchart@ideasonboard.com>\n\t<20200427031713.14013-3-laurent.pinchart@ideasonboard.com>\n\t<0e20fc3d-2d60-9d35-0b6a-ba591b17166f@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<0e20fc3d-2d60-9d35-0b6a-ba591b17166f@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 02/11] libcamera: utils: Add a\n\tfunction to retrieve the libcamera source tree","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":"Mon, 27 Apr 2020 10:45:56 -0000"}}]