Report library paths.

Author: anntzer

.github/workflows/build.yml

@@ -64,6 +64,7 @@ jobs:
       run: |
         set -x &&
         python -mpip list &&
+        python -c 'import mplcairo as m, pprint as p; p.pprint(m.get_versions())' &&
         # Skip tests triggering to-be-investigated fatal error on Windows :(
         (
           if [[ "$(python -c 'import sys; print(sys.platform)')" != win32 ]]; then

src/_mplcairo.cpp

@@ -13,6 +13,9 @@
 
 #include "_macros.h"
 
+using namespace pybind11::literals;
+using namespace std::string_literals;
+
 P11X_DECLARE_ENUM(
   "antialias_t", "enum.Enum",
   {"DEFAULT", CAIRO_ANTIALIAS_DEFAULT},
@@ -104,8 +107,6 @@ P11X_DECLARE_ENUM(
 
 namespace mplcairo {
 
-using namespace pybind11::literals;
-
 Region::Region(
     cairo_rectangle_int_t bbox, std::unique_ptr<uint8_t const[]> buffer) :
   bbox{bbox}, buffer{std::move(buffer)}
@@ -1952,7 +1953,7 @@ PYBIND11_MODULE(_mplcairo, m)
   auto const& ctypes = py::module::import("ctypes"),
             & _cairo = py::module::import("cairo._cairo");
   auto const& dll = ctypes.attr("CDLL")(_cairo.attr("__file__"));
-  auto const& load_ptr = [&](char const* name) -> uintptr_t {
+  auto const& load_ptr = [&](char const* name) -> os::symbol_t {
     return
       ctypes.attr("cast")(
         py::getattr(dll, name, py::int_(0)), ctypes.attr("c_void_p"))
@@ -1963,8 +1964,7 @@ PYBIND11_MODULE(_mplcairo, m)
     return os::dlsym(name);
   };
 #endif
-#define LOAD_API(name) \
-  detail::name = reinterpret_cast<decltype(detail::name)>(load_ptr(#name));
+#define LOAD_API(name) detail::name = load_ptr(#name);
   ITER_CAIRO_OPTIONAL_API(LOAD_API)
 #undef LOAD_API
 
@@ -2107,29 +2107,36 @@ straight RGBA8888.
 )__doc__");
   m.def(
     "get_versions", [] {
-      auto const& cairo_version = cairo_version_string();
+      auto const& cairo_version =
+        cairo_version_string() + " @ "s
+        + os::dladdr_fname(cairo_version_string);
       auto ft_major = 0, ft_minor = 0, ft_patch = 0;
       FT_Library_Version(detail::ft_library, &ft_major, &ft_minor, &ft_patch);
       auto const& freetype_version =
         std::to_string(ft_major) + "."
         + std::to_string(ft_minor) + "."
-        + std::to_string(ft_patch);
+        + std::to_string(ft_patch) + " @ "
+        + os::dladdr_fname(FT_Library_Version);
       auto const& pybind11_version =
         Py_STRINGIFY(PYBIND11_VERSION_MAJOR) "."
         Py_STRINGIFY(PYBIND11_VERSION_MINOR) "."
         Py_STRINGIFY(PYBIND11_VERSION_PATCH);
       auto const& raqm_version =
         has_raqm()
-        ? std::optional<std::string>{raqm::version_string()} : std::nullopt;
+        ? std::optional{raqm::version_string() + " @ "s
+        + os::dladdr_fname(raqm::version_string)}
+        : std::nullopt;
       auto const& hb_version =
         has_raqm() && hb::version_string
-        ? std::optional<std::string>{hb::version_string()} : std::nullopt;
+        ? std::optional{hb::version_string() + " @ "s
+        + os::dladdr_fname(hb::version_string)}
+      : std::nullopt;
       return py::dict(
         "cairo"_a=cairo_version,
         "freetype"_a=freetype_version,
         "pybind11"_a=pybind11_version,
         "raqm"_a=raqm_version,
-        "hb"_a=hb_version);
+        "harfbuzz"_a=hb_version);
     }, R"__doc__(
 Get library versions.
 

src/_os.cpp

@@ -18,9 +18,6 @@ namespace mplcairo::os {
 namespace py = pybind11;
 
 #if defined __linux__ || defined __APPLE__
-using library_t = void*;
-using symbol_t = void*;
-
 library_t dlopen(char const* filename)
 {
   return ::dlopen(filename, RTLD_LAZY);
@@ -42,6 +39,16 @@ void throw_dlerror()
   throw py::error_already_set{};
 }
 
+std::string dladdr_fname(symbol_t handle)
+{
+  auto dlinfo = Dl_info{};
+  return
+    ::dladdr(handle, &dlinfo)
+    ? py::module::import("os").attr("fsdecode")(
+        py::bytes(dlinfo.dli_fname)).cast<std::string>()
+    : "";
+}
+
 void install_abrt_handler()
 {
   signal(SIGABRT, [](int signal) {
@@ -54,9 +61,6 @@ void install_abrt_handler()
 }
 
 #elif defined _WIN32
-using library_t = HMODULE;
-using symbol_t = FARPROC;
-
 library_t dlopen(char const* filename)
 {
   // Respect os.add_dll_directory.
@@ -75,15 +79,15 @@ symbol_t dlsym(library_t handle, char const* symbol)
 
 symbol_t dlsym(char const* symbol)
 {
-  auto hProcess = GetCurrentProcess();
-  auto cbNeeded = DWORD{};
-  EnumProcessModules(hProcess, nullptr, 0, &cbNeeded);
-  auto n_modules = cbNeeded / sizeof(HMODULE);
-  auto lphModule = std::unique_ptr<HMODULE[]>{new HMODULE[n_modules]};
-  if (EnumProcessModules(hProcess, lphModule.get(), cbNeeded, &cbNeeded)) {
+  auto proc = GetCurrentProcess();
+  auto size = DWORD{};
+  EnumProcessModules(proc, nullptr, 0, &size);
+  auto n_modules = size / sizeof(HMODULE);
+  auto modules = std::unique_ptr<HMODULE[]>{new HMODULE[n_modules]};
+  if (EnumProcessModules(proc, modules.get(), size, &size)) {
     for (auto i = 0; i < n_modules; ++i) {
-      if (auto proc = GetProcAddress(lphModule[i], symbol)) {
-        return proc;
+      if (auto ptr = GetProcAddress(modules[i], symbol)) {
+        return ptr;
       }
     }
   }
@@ -96,6 +100,20 @@ void throw_dlerror()
   throw py::error_already_set{};
 }
 
+std::string dladdr_fname(symbol_t handle)
+{
+  auto proc = GetCurrentProcess();
+  HMODULE mod;
+  wchar_t wpath[MAX_PATH];
+  if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
+                        GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+                        handle, &mod)
+      && GetModuleFileNameEx(proc, mod, wpath, MAX_PATH)) {
+    return py::cast(wpath).cast<std::string>();
+  }
+  return "";
+}
+
 void install_abrt_handler()
 {
 }

src/_os.h

@@ -1,27 +1,44 @@
+#pragma once
+
 #include <iostream>
 
 #ifdef _WIN32
 #define NOMINMAX
+#define UNICODE
+#define _UNICODE
 #include <Windows.h>
 #endif
 
 namespace mplcairo::os {
 
 #if defined __linux__ || defined __APPLE__
 using library_t = void*;
-using symbol_t = void*;
+using symbol_ptr_t = void*;
 #elif defined _WIN32
 using library_t = HMODULE;
-using symbol_t = FARPROC;
-
-// Like dlsym, but looks through everything listed by EnumProcessModules.
-symbol_t dlsym(char const* symbol);
+using symbol_ptr_t = FARPROC;
 #endif
+
+class symbol_t {
+  symbol_ptr_t ptr;
+
+  public:
+  // Allow implicit cast from int (address) but not to int (only to pointers).
+  template<typename T> symbol_t(T ptr) : ptr{reinterpret_cast<symbol_ptr_t>(ptr)} {}
+  template<typename T> operator T*() const { return reinterpret_cast<T*>(ptr); }
+};
+
 library_t dlopen(char const* filename);
 bool dlclose(library_t handle);
 symbol_t dlsym(library_t handle, char const* symbol);
 void throw_dlerror();
+std::string dladdr_fname(symbol_t handle);
 
 void install_abrt_handler();
 
+#if defined _WIN32
+// Like dlsym, but looks through everything listed by EnumProcessModules.
+symbol_t dlsym(char const* symbol);
+#endif
+
 }

src/_raqm.cpp

@@ -35,9 +35,7 @@ void load_raqm() {
       os::throw_dlerror();
     }
     #define LOAD_API(name) \
-      if (!(raqm::name = \
-              reinterpret_cast<decltype(raqm::name)>( \
-                os::dlsym(raqm::_handle, "raqm_" #name)))) { \
+      if (!(raqm::name = os::dlsym(raqm::_handle, "raqm_" #name))) { \
         os::dlclose(raqm::_handle); \
         raqm::_handle = nullptr; \
         os::throw_dlerror(); \
@@ -56,8 +54,7 @@ void load_raqm() {
     // Trying to retrieve hb_version_string from the raqm shared object
     // normally only works on POSIX, so we just allow this to be nullptr and
     // check that at the call site.
-    hb::version_string = reinterpret_cast<decltype(hb::version_string)>(
-      os::dlsym(raqm::_handle, "hb_version_string"));
+    hb::version_string = os::dlsym(raqm::_handle, "hb_version_string");
   }
 }
 

src/_util.h

@@ -8,8 +8,8 @@
 #include <pybind11/stl.h>
 
 // Helper for std::visit.
-template<class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
-template<class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
+template<typename... Ts> struct overloaded : Ts... { using Ts::operator()...; };
+template<typename... Ts> overloaded(Ts...) -> overloaded<Ts...>;
 
 namespace mplcairo {