support dynamic loading on Windows

Author: jll63

doc/modules/ROOT/examples/shared_libs/dynamic_main.cpp

@@ -59,7 +59,7 @@ int main() {
     try {
         std::cout << "Before loading the shared library.\n";
 
-        boost::openmethod::initialize();
+        boost::openmethod::initialize(trace::from_env());
         BOOST_ASSERT(default_registry::static_vptr<Carnivore> != nullptr);
 
         std::cout << "cow meets wolf -> "
@@ -79,7 +79,7 @@ int main() {
         boost::dll::shared_library lib(
             boost::dll::program_location().parent_path() / LIBRARY_NAME,
             boost::dll::load_mode::rtld_now);
-        boost::openmethod::initialize();
+        boost::openmethod::initialize(trace::from_env());
 
         std::cout << "cow meets wolf -> "
                   << meet(*std::make_unique<Cow>(), *std::make_unique<Wolf>())
@@ -102,7 +102,7 @@ int main() {
         std::cout << "\nAfter unloading the shared library.\n";
 
         lib.unload();
-        boost::openmethod::initialize();
+        boost::openmethod::initialize(trace::from_env());
 
         std::cout << "cow meets wolf -> "
                   << meet(*std::make_unique<Cow>(), *std::make_unique<Wolf>())

include/boost/openmethod/initialize.hpp

@@ -100,23 +100,6 @@ struct initialize_policies<Registry, mp11::mp_list<Policies...>> {
     }
 };
 
-// template<typename Registry, typename Policy, typename... Policies>
-// struct initialize_policies<Registry, mp11::mp_list<Policy, Policies...>> {
-//     template<typename Context, typename Options>
-//     static void fn(const Context& ctx, const Options& options) {
-//         initialize_policy<Policy, Registry>(ctx, options);
-//         initialize_policies<Registry, mp11::mp_list<Policies...>>::fn(
-//             ctx, options);
-//     }
-// };
-
-// template<typename Registry>
-// struct initialize_policies<Registry, mp11::mp_list<>> {
-//     template<typename Context, typename Options>
-//     static void fn(const Context& ctx, const Options& options) {
-//     }
-// };
-
 inline void merge_into(boost::dynamic_bitset<>& a, boost::dynamic_bitset<>& b) {
     if (b.size() < a.size()) {
         b.resize(a.size());
@@ -679,7 +662,9 @@ void registry<Policies...>::compiler<Options...>::augment_classes() {
             {
                 indent _(tr);
                 ++tr << type_name(cr.type) << ": "
-                     << range{cr.first_base, cr.last_base} << "\n";
+                     << range{cr.first_base, cr.last_base}
+                     << ", type = " << cr.type << ", &vptr = " << &cr.vptr()
+                     << "\n";
             }
 
             auto& rtc = class_map[rtti::type_index(cr.type)];
@@ -688,7 +673,18 @@ void registry<Policies...>::compiler<Options...>::augment_classes() {
                 rtc = &classes.emplace_back();
             }
 
-            rtc->ci.push_back(&cr);
+            bool new_type_id = true;
+
+            for (auto ci : rtc->ci) {
+                if (ci->type == cr.type) {
+                    new_type_id = false;
+                    break;
+                }
+            }
+
+            if (new_type_id) {
+                rtc->ci.push_back(&cr);
+            }
         }
     }
 

include/boost/openmethod/policies/fast_perfect_hash.hpp

@@ -186,7 +186,7 @@ void fast_perfect_hash::fn<Registry>::initialize_aux(
 
     std::uniform_int_distribution<std::size_t> uniform_dist;
 
-    for (std::size_t pass = 0; pass < 4; ++pass, ++M) {
+    for (std::size_t pass = 0; pass < 5; ++pass, ++M) {
         hash_fn.shift = 8 * sizeof(type_id) - M;
         auto hash_size = 1 << M;
         hash_fn.min_value = (std::numeric_limits<std::size_t>::max)();
@@ -200,7 +200,7 @@ void fast_perfect_hash::fn<Registry>::initialize_aux(
         std::size_t attempts = 0;
         buckets.resize(hash_size);
 
-        while (attempts < 100000) {
+        while (attempts < 1'00'000) {
             std::fill(
                 buckets.begin(), buckets.end(), type_id(detail::uintptr_max));
             ++attempts;
@@ -266,8 +266,8 @@ void fast_perfect_hash::fn<Registry>::check(std::size_t index, type_id type) {
 
 template<class Registry, class Stream>
 auto fast_perfect_hash::search_error::write(Stream& os) const -> void {
-    os << "could not find hash factors after " << attempts << "s using "
-       << buckets << " buckets\n";
+    os << "could not find hash factors after " << attempts
+       << " attempts using up to " << buckets << " buckets\n";
 }
 
 } // namespace policies