townforge/dll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added overloads that accept error_code for runtime symbols info functions

Browse Source
This commit is contained in:
Antony Polukhin 2015-10-27 00:27:40 +03:00
parent 6c5e0958d0
commit 4002ca0645
2 changed files with 99 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
include/boost/dll/runtime_symbol_info.hpp
View File

@ -29,28 +29,39 @@ namespace boost { namespace dll {
namespace detail {
#if BOOST_OS_WINDOWS
inline boost::filesystem::path symbol_location_impl(const void* symbol) {
inline boost::filesystem::path symbol_location_impl(const void* symbol, boost::system::error_code& ec) {
boost::filesystem::path ret;
boost::detail::winapi::MEMORY_BASIC_INFORMATION_ mbi;
if (!boost::detail::winapi::VirtualQuery(symbol, &mbi, sizeof(mbi))) {
ec = boost::dll::detail::last_error_code();
return ret;
}
boost::system::error_code ignore;
return boost::dll::detail::path_from_handle(reinterpret_cast<boost::detail::winapi::HMODULE_>(mbi.AllocationBase), ignore);
return boost::dll::detail::path_from_handle(reinterpret_cast<boost::detail::winapi::HMODULE_>(mbi.AllocationBase), ec);
}
inline boost::filesystem::path program_location_impl(boost::system::error_code& ec) {
return boost::dll::detail::path_from_handle(NULL, ec);
}
}
#else
inline boost::filesystem::path symbol_location_impl(const void* symbol) {
inline boost::filesystem::path symbol_location_impl(const void* symbol, boost::system::error_code& ec) {
boost::filesystem::path ret;
Dl_info info;
// Some of the libc headers miss `const` in `dladdr(const void*, Dl_info*)`
const int res = dladdr(const_cast<void*>(symbol), &info);
return res ? boost::filesystem::path(info.dli_fname) : boost::filesystem::path();
if (res) {
ret = info.dli_fname;
} else {
ec = boost::system::error_code(
boost::system::errc::not_supported,
boost::system::generic_category()
);
}
return ret;
}
#endif
} // namespace detail
@ -59,8 +70,9 @@ namespace detail {
* On success returns full path and name of the binary object that holds symbol.
* \tparam T Type of the symbol, must not be explicitly specified.
* \param symbol Symbol which location is to be determined.
* \param ec Variable that will be set to the result of the operation.
* \return Path to the binary object that holds symbol or empty path in case error.
* \throws std::bad_alloc in case of insufficient memory.
* \throws std::bad_alloc in case of insufficient memory. Overload that does not accept boost::system::error_code also throws boost::system::system_error.
*
* \b Examples:
* \code
@ -77,12 +89,31 @@ namespace detail {
* \endcode
*/
template <class T>
inline boost::filesystem::path symbol_location(const T& symbol) {
inline boost::filesystem::path symbol_location(const T& symbol, boost::system::error_code& ec) {
ec.clear();
return boost::dll::detail::symbol_location_impl(
boost::dll::detail::aggressive_ptr_cast<const void*>(boost::addressof(symbol))
boost::dll::detail::aggressive_ptr_cast<const void*>(boost::addressof(symbol)),
ec
);
}
//! \overload symbol_location(const T& symbol, boost::system::error_code& ec)
template <class T>
inline boost::filesystem::path symbol_location(const T& symbol) {
boost::filesystem::path ret;
boost::system::error_code ec;
ret = boost::dll::detail::symbol_location_impl(
boost::dll::detail::aggressive_ptr_cast<const void*>(boost::addressof(symbol)),
ec
);
if (ec) {
boost::dll::detail::report_error(ec, "boost::dll::symbol_location(const T& symbol) failed");
}
return ret;
}
/// @cond
// We have anonymous namespace here to make sure that `this_line_location()` method is instantiated in
// current translation module and is not shadowed by instantiations from other modules.
@ -93,10 +124,25 @@ namespace detail {
* On success returns full path and name of the binary object that holds the current line of code
* (the line in which the `this_line_location()` method was called).
*
* \throws std::bad_alloc in case of insufficient memory.
* \param ec Variable that will be set to the result of the operation.
* \throws std::bad_alloc in case of insufficient memory. Overload that does not accept boost::system::error_code also throws boost::system::system_error.
*/
static inline boost::filesystem::path this_line_location(boost::system::error_code& ec) {
ec.clear();
return boost::dll::symbol_location<boost::filesystem::path(boost::system::error_code& )>(this_line_location, ec);
}
//! \overload this_line_location(boost::system::error_code& ec)
static inline boost::filesystem::path this_line_location() {
return boost::dll::symbol_location(this_line_location);
boost::filesystem::path ret;
boost::system::error_code ec;
ret = boost::dll::symbol_location<boost::filesystem::path()>(this_line_location, ec);
if (ec) {
boost::dll::detail::report_error(ec, "boost::dll::this_line_location() failed");
}
return ret;
}
/// @cond
@ -110,11 +156,24 @@ namespace detail {
* for usage example. Flag '-rdynamic' must be used when linking the plugin into the executable
* on Linux OS.
*
* \throws std::bad_alloc in case of insufficient memory.
* \param ec Variable that will be set to the result of the operation.
* \throws std::bad_alloc in case of insufficient memory. Overload that does not accept boost::system::error_code also throws boost::system::system_error.
*/
static inline boost::filesystem::path program_location() {
boost::system::error_code ignore;
return boost::dll::detail::program_location_impl(ignore);
inline boost::filesystem::path program_location(boost::system::error_code& ec) {
return boost::dll::detail::program_location_impl(ec);
}
//! \overload program_location(boost::system::error_code& ec) {
inline boost::filesystem::path program_location() {
boost::filesystem::path ret;
boost::system::error_code ec;
ret = boost::dll::detail::program_location_impl(ec);
if (ec) {
boost::dll::detail::report_error(ec, "boost::dll::program_location() failed");
}
return ret;
}
}} // namespace boost::dll

27
test/symbol_runtime_info_test.cpp
View File

@ -39,8 +39,8 @@ int main(int argc, char* argv[]) {
shared_library lib(shared_library_path);
std::cout << std::endl;
std::cout << "shared_library_: " << shared_library_path << std::endl;
std::cout << "symbol_location: " << symbol_location(&lib.get<int>("integer_g")) << std::endl;
std::cout << "shared_library: " << shared_library_path << std::endl;
std::cout << "symbol_location: " << symbol_location(lib.get<int>("integer_g")) << std::endl;
std::cout << "lib.location(): " << lib.location() << std::endl;
BOOST_TEST(
symbol_location(lib.get<int>("integer_g")) == lib.location()
@ -88,6 +88,20 @@ int main(int argc, char* argv[]) {
);
}
{ // self with error_code
boost::system::error_code ec;
shared_library sl(program_location(ec));
BOOST_TEST(!ec);
BOOST_TEST(
(boost::filesystem::equivalent(symbol_location(sl.get<int(void)>("exef"), ec), argv[0]))
);
BOOST_TEST(!ec);
symbol_location(&sl.get<int(void)>("exef"), ec);
BOOST_TEST(ec);
}
std::cout << "\ninternal_function: " << symbol_location(internal_function);
std::cout << "\nargv[0] : " << boost::filesystem::absolute(argv[0]);
BOOST_TEST(
@ -102,6 +116,15 @@ int main(int argc, char* argv[]) {
BOOST_TEST(
(boost::filesystem::equivalent(this_line_location(), argv[0]))
);
{ // this_line_location with error_code
boost::system::error_code ec;
BOOST_TEST(
(boost::filesystem::equivalent(this_line_location(ec), argv[0]))
);
BOOST_TEST(!ec);
}
BOOST_TEST(
lib.get_alias<boost::filesystem::path()>("module_location_from_itself")() == lib.location()
);