[{"id":4060,"web_url":"https://patchwork.libcamera.org/comment/4060/","msgid":"","date":"2020-03-17T20:29:12","subject":"Re: [libcamera-devel] [PATCH LIBCAMERA 3/4] libcamera: ipa_proxy:\n\tsearch for proxy in build tree","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Kaaira\n\nOn 17/03/2020 17:31, Kaaira Gupta wrote:\n> When libcamera is build and tested before installing, it will\n\ns/build/built/\n\n> be unable to locate the path to proxy files,or previously\n\ns/files,or/files, or/\n\n> installed files in the system path may be incorrect to load.\n> \n> Hence, when libcamera is not installed and running from a build\n> tree, identify the location of that tree by finding the path of\n> active libcamera.so, and from that point add the relative path to\n> the proxy file.\n> \n> Signed-off-by: Kaaira Gupta \n> ---\n> src/libcamera/ipa_proxy.cpp | 54 +++++++++++++++++++++++++++++++++----\n> 1 file changed, 49 insertions(+), 5 deletions(-)\n> \n> diff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp\n> index 363d034..d7c32a1 100644\n> --- a/src/libcamera/ipa_proxy.cpp\n> +++ b/src/libcamera/ipa_proxy.cpp\n> @@ -9,7 +9,9 @@\n> \n> #include \n> #include \n> -\n> +#include \n> +#include \n> +#include \n\nAha, we shouldn't need to bring this in here ... I'm sorry - I should\nhave spotted this in advance and we'll need to move the\nisLibcameraInstalled() and libcameraPath() functions into\n src/libcamera/utils.cpp\n\nFor that extra patch (which would then be patch 3 in the series), we\nneed to move the two fucntions below to utils.cpp, and add appropriate\ndoxygen briefs as they are then 'global' functions, and put the function\nprototypes into src/libcamera/include/utils.h\n\nAt that point, the functions will be in the libcamera utils:: namespace\nso we'll have to do a fixup in IPAManager::IPAManager() to call\n utils::isLibcameraInstalled()\ninstead...\n\nAnd of course as part of the code move, the headers that you had to\nbring in here, can be removed from the ipa_manager.cpp file too.\n\n\n> #include \"log.h\"\n> #include \"utils.h\"\n> \n> @@ -20,6 +22,35 @@\n> * \\brief IPA Proxy\n> */\n> \n> +static bool isLibcameraInstalled()\n> +{\n> +\t/* musl doesn't declare _DYNAMIC in link.h, declare it manually. */\n> +\textern ElfW(Dyn) _DYNAMIC[];\n> +\n> +\t/*\n> +\t * DT_RUNPATH (DT_RPATH when the linker uses old dtags) is removed on\n> +\t * install.\n> +\t */\n> +\tfor (const ElfW(Dyn) *dyn = _DYNAMIC; dyn->d_tag != DT_NULL; ++dyn) {\n> +\t\tif (dyn->d_tag == DT_RUNPATH || dyn->d_tag == DT_RPATH)\n> +\t\t\treturn false;\n> +\t}\n> +\n> +\treturn true;\n> +}\n> +\n> +static std::string libcameraPath()\n> +{\n> +\tDl_info info;\n> +\n> +\t/* Look up our own symbol. */\n> +\tint ret = dladdr(reinterpret_cast(libcameraPath), &info);\n> +\tif (ret == 0)\n> +\t\treturn nullptr;\n> +\n> +\treturn info.dli_fname;\n> +}\n> +\n\nAs described above, isLibcameraInstalled() and libcameraPath() should\nbecome utils::isLibcameraInstalled() and utils::libcameraPath() and then\nthese do not need to be added here.\n\n\n> namespace libcamera {\n> \n> LOG_DEFINE_CATEGORY(IPAProxy)\n> @@ -89,10 +120,23 @@ std::string IPAProxy::resolvePath(const std::string &file) const\n> \t\t}\n> \t}\n> \n> -\t/*Try finding the exec target from the install directory.*/\n> - std::string proxyPath = std::string(IPA_PROXY_DIR) + proxyFile;\n> - if (!access(proxyPath.c_str(), X_OK))\n> - return proxyPath;\n> +\t/*\n> +\t *When libcamera is used before it is installed, load proxies from the\n> +\t *same build directory as the libcamera directory itself. This requires\n> +\t *identifying the path of the libcamera.so, and referencing a relative\n> +\t *path for the proxies from that point.\n> +\t */\n\nThere should always be a space after the * in a comment to separate the\nwords from the comment markers.\n\n\n> +\tif (!isLibcameraInstalled()){\n> +\t\tstd::string ipaProxyDir = utils::dirname(libcameraPath()) + \"/../../proxy\";\n> +\n> +\t\tLOG(IPAProxy, Info)\n> +\t\t\t<< \"libcamera is not installed. Adding '\"\n> +\t\t\t<< ipaProxyDir << \"' to the Proxy search path\";\n> +\n> +\t\tstd::string proxyPath = ipaProxyDir + proxyFile;\n> +\t\tif (!access(proxyPath.c_str(), X_OK))\n> +\t\t\treturn proxyPath;\n> +\t}\n> \n\nThe actual additions here are good, and as I expected, so its' just some\nwhitespace fixes, and to remove the static helpers here so they aren't\nduplicated.\n\n> \treturn std::string();\n> }\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5EAE762923\n\tfor ;\n\tTue, 17 Mar 2020 21:29:16 +0100 (CET)","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 AC905F9;\n\tTue, 17 Mar 2020 21:29:15 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1584476955;\n\tbh=OWBBbqTaRCOSHEx+VFT5pD52Epy9YUX+yQcUt9bB5Zw=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=q7eMVYy7jbodeXKvZmnk9xnaNVrU5hdAIVO01Ktu1F5aPwRC981pNCQPeVY8vMg6H\n\t0L7Kf0Aw/bXceMelaT0PLCpsLLBY8hbdpiIxKxnh3ihTUbMmdvyYjBkkEj7LFz05d1\n\teM9PX4SnOdQ9YRqxV713ROFTLNIENo+GU6g6RR4g=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Kaaira Gupta , libcamera-devel@lists.libcamera.org,\n\tHelen Koike ,\n\tVaishali Thakkar ","References":"<20200317173145.18226-1-kgupta@es.iitr.ac.in>\n\t<20200317173145.18226-4-kgupta@es.iitr.ac.in>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\tmQINBFYE/WYBEACs1PwjMD9rgCu1hlIiUA1AXR4rv2v+BCLUq//vrX5S5bjzxKAryRf0uHat\n\tV/zwz6hiDrZuHUACDB7X8OaQcwhLaVlq6byfoBr25+hbZG7G3+5EUl9cQ7dQEdvNj6V6y/SC\n\trRanWfelwQThCHckbobWiQJfK9n7rYNcPMq9B8e9F020LFH7Kj6YmO95ewJGgLm+idg1Kb3C\n\tpotzWkXc1xmPzcQ1fvQMOfMwdS+4SNw4rY9f07Xb2K99rjMwZVDgESKIzhsDB5GY465sCsiQ\n\tcSAZRxqE49RTBq2+EQsbrQpIc8XiffAB8qexh5/QPzCmR4kJgCGeHIXBtgRj+nIkCJPZvZtf\n\tKr2EAbc6tgg6DkAEHJb+1okosV09+0+TXywYvtEop/WUOWQ+zo+Y/OBd+8Ptgt1pDRyOBzL8\n\tRXa8ZqRf0Mwg75D+dKntZeJHzPRJyrlfQokngAAs4PaFt6UfS+ypMAF37T6CeDArQC41V3ko\n\tlPn1yMsVD0p+6i3DPvA/GPIksDC4owjnzVX9kM8Zc5Cx+XoAN0w5Eqo4t6qEVbuettxx55gq\n\t8K8FieAjgjMSxngo/HST8TpFeqI5nVeq0/lqtBRQKumuIqDg+Bkr4L1V/PSB6XgQcOdhtd36\n\tOe9X9dXB8YSNt7VjOcO7BTmFn/Z8r92mSAfHXpb07YJWJosQOQARAQABtDBLaWVyYW4gQmlu\n\tZ2hhbSA8a2llcmFuLmJpbmdoYW1AaWRlYXNvbmJvYXJkLmNvbT6JAlcEEwEKAEECGwMFCwkI\n\tBwIGFQgJCgsCBBYCAwECHgECF4ACGQEWIQSQLdeYP70o/eNy1HqhHkZyEKRh/QUCXWTtygUJ\n\tCyJXZAAKCRChHkZyEKRh/f8dEACTDsbLN2nioNZMwyLuQRUAFcXNolDX48xcUXsWS2QjxaPm\n\tVsJx8Uy8aYkS85mdPBh0C83OovQR/OVbr8AxhGvYqBs3nQvbWuTl/+4od7DfK2VZOoKBAu5S\n\tQK2FYuUcikDqYcFWJ8DQnubxfE8dvzojHEkXw0sA4igINHDDFX3HJGZtLio+WpEFQtCbfTAG\n\tYZslasz1YZRbwEdSsmO3/kqy5eMnczlm8a21A3fKUo3g8oAZEFM+f4DUNzqIltg31OAB/kZS\n\tenKZQ/SWC8PmLg/ZXBrReYakxXtkP6w3FwMlzOlhGxqhIRNiAJfXJBaRhuUWzPOpEDE9q5YJ\n\tBmqQL2WJm1VSNNVxbXJHpaWMH1sA2R00vmvRrPXGwyIO0IPYeUYQa3gsy6k+En/aMQJd27dp\n\taScf9am9PFICPY5T4ppneeJLif2lyLojo0mcHOV+uyrds9XkLpp14GfTkeKPdPMrLLTsHRfH\n\tfA4I4OBpRrEPiGIZB/0im98MkGY/Mu6qxeZmYLCcgD6qz4idOvfgVOrNh+aA8HzIVR+RMW8H\n\tQGBN9f0E3kfwxuhl3omo6V7lDw8XOdmuWZNC9zPq1UfryVHANYbLGz9KJ4Aw6M+OgBC2JpkD\n\thXMdHUkC+d20dwXrwHTlrJi1YNp6rBc+xald3wsUPOZ5z8moTHUX/uPA/qhGsbkCDQRWBP1m\n\tARAAzijkb+Sau4hAncr1JjOY+KyFEdUNxRy+hqTJdJfaYihxyaj0Ee0P0zEi35CbE6lgU0Uz\n\ttih9fiUbSV3wfsWqg1Ut3/5rTKu7kLFp15kF7eqvV4uezXRD3Qu4yjv/rMmEJbbD4cTvGCYI\n\td6MDC417f7vK3hCbCVIZSp3GXxyC1LU+UQr3fFcOyCwmP9vDUR9JV0BSqHHxRDdpUXE26Dk6\n\tmhf0V1YkspE5St814ETXpEus2urZE5yJIUROlWPIL+hm3NEWfAP06vsQUyLvr/GtbOT79vXl\n\tEn1aulcYyu20dRRxhkQ6iILaURcxIAVJJKPi8dsoMnS8pB0QW12AHWuirPF0g6DiuUfPmrA5\n\tPKe56IGlpkjc8cO51lIxHkWTpCMWigRdPDexKX+Sb+W9QWK/0JjIc4t3KBaiG8O4yRX8ml2R\n\t+rxfAVKM6V769P/hWoRGdgUMgYHFpHGSgEt80OKK5HeUPy2cngDUXzwrqiM5Sz6Od0qw5pCk\n\tNlXqI0W/who0iSVM+8+RmyY0OEkxEcci7rRLsGnM15B5PjLJjh1f2ULYkv8s4SnDwMZ/kE04\n\t/UqCMK/KnX8pwXEMCjz0h6qWNpGwJ0/tYIgQJZh6bqkvBrDogAvuhf60Sogw+mH8b+PBlx1L\n\toeTK396wc+4c3BfiC6pNtUS5GpsPMMjYMk7kVvEAEQEAAYkCPAQYAQoAJgIbDBYhBJAt15g/\n\tvSj943LUeqEeRnIQpGH9BQJdizzIBQkLSKZiAAoJEKEeRnIQpGH9eYgQAJpjaWNgqNOnMTmD\n\tMJggbwjIotypzIXfhHNCeTkG7+qCDlSaBPclcPGYrTwCt0YWPU2TgGgJrVhYT20ierN8LUvj\n\t6qOPTd+Uk7NFzL65qkh80ZKNBFddx1AabQpSVQKbdcLb8OFs85kuSvFdgqZwgxA1vl4TFhNz\n\tPZ79NAmXLackAx3sOVFhk4WQaKRshCB7cSl+RIng5S/ThOBlwNlcKG7j7W2MC06BlTbdEkUp\n\tECzuuRBv8wX4OQl+hbWbB/VKIx5HKlLu1eypen/5lNVzSqMMIYkkZcjV2SWQyUGxSwq0O/sx\n\tS0A8/atCHUXOboUsn54qdxrVDaK+6jIAuo8JiRWctP16KjzUM7MO0/+4zllM8EY57rXrj48j\n\tsbEYX0YQnzaj+jO6kJtoZsIaYR7rMMq9aUAjyiaEZpmP1qF/2sYenDx0Fg2BSlLvLvXM0vU8\n\tpQk3kgDu7kb/7PRYrZvBsr21EIQoIjXbZxDz/o7z95frkP71EaICttZ6k9q5oxxA5WC6sTXc\n\tMW8zs8avFNuA9VpXt0YupJd2ijtZy2mpZNG02fFVXhIn4G807G7+9mhuC4XG5rKlBBUXTvPU\n\tAfYnB4JBDLmLzBFavQfvonSfbitgXwCG3vS+9HEwAjU30Bar1PEOmIbiAoMzuKeRm2LVpmq4\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Tue, 17 Mar 2020 20:29:12 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.1","MIME-Version":"1.0","In-Reply-To":"<20200317173145.18226-4-kgupta@es.iitr.ac.in>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH LIBCAMERA 3/4] libcamera: ipa_proxy:\n\tsearch for proxy in build 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":"Tue, 17 Mar 2020 20:29:16 -0000"}}]