Add thread specific cache of type info

Reduces the number of locks necessary to check of a user defined type
conversion should be scanned for / applied.
This commit is contained in:
Jason Turner 2014-10-28 22:12:03 -06:00
parent e85be6eb3d
commit 7c766f87a4
3 changed files with 51 additions and 3 deletions

View File

@ -86,7 +86,7 @@ namespace chaiscript
#pragma warning(disable : 4127) #pragma warning(disable : 4127)
#endif #endif
if ( /*std::is_polymorphic<typename detail::Bare_Type<Type>::type>::value && */ t_conversions) if (t_conversions && t_conversions->convertable_type<Type>())
{ {
try { try {
// std::cout << "trying an up conversion " << typeid(Type).name() << std::endl; // std::cout << "trying an up conversion " << typeid(Type).name() << std::endl;

View File

@ -7,6 +7,7 @@
#ifndef CHAISCRIPT_DYNAMIC_CAST_CONVERSION_HPP_ #ifndef CHAISCRIPT_DYNAMIC_CAST_CONVERSION_HPP_
#define CHAISCRIPT_DYNAMIC_CAST_CONVERSION_HPP_ #define CHAISCRIPT_DYNAMIC_CAST_CONVERSION_HPP_
#include <atomic>
#include <memory> #include <memory>
#include <set> #include <set>
#include <stdexcept> #include <stdexcept>
@ -203,20 +204,51 @@ namespace chaiscript
class Type_Conversions class Type_Conversions
{ {
public: public:
struct Less_Than
{
bool operator()(const std::type_info *t_lhs, const std::type_info *t_rhs) const
{
return *t_lhs != *t_rhs && t_lhs->before(*t_rhs);
}
};
Type_Conversions() Type_Conversions()
: m_num_types(0),
m_thread_cache(this)
{ {
} }
Type_Conversions(const Type_Conversions &t_other) Type_Conversions(const Type_Conversions &t_other)
: m_conversions(t_other.get_conversions()) : m_conversions(t_other.get_conversions()), m_num_types(m_conversions.size()),
m_thread_cache(this)
{ {
} }
const std::set<const std::type_info *, Less_Than> &thread_cache() const
{
auto &cache = *m_thread_cache;
if (cache.size() != m_num_types)
{
chaiscript::detail::threading::shared_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex);
cache = m_convertableTypes;
}
return cache;
}
void add_conversion(const std::shared_ptr<detail::Type_Conversion_Base> &conversion) void add_conversion(const std::shared_ptr<detail::Type_Conversion_Base> &conversion)
{ {
chaiscript::detail::threading::unique_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex); chaiscript::detail::threading::unique_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex);
/// \todo error if a conversion already exists /// \todo error if a conversion already exists
m_conversions.insert(conversion); m_conversions.insert(conversion);
m_convertableTypes.insert({conversion->to().bare_type_info(), conversion->from().bare_type_info()});
m_num_types = m_convertableTypes.size();
}
template<typename T>
bool convertable_type() const
{
return thread_cache().count(user_type<T>().bare_type_info()) != 0;
} }
template<typename To, typename From> template<typename To, typename From>
@ -226,8 +258,15 @@ namespace chaiscript
} }
bool converts(const Type_Info &to, const Type_Info &from) const bool converts(const Type_Info &to, const Type_Info &from) const
{
const auto &types = thread_cache();
if (types.count(to.bare_type_info()) != 0 && types.count(to.bare_type_info()) != 0)
{ {
return has_conversion(to, from) || has_conversion(from, to); return has_conversion(to, from) || has_conversion(from, to);
} else {
return false;
}
} }
template<typename To> template<typename To>
@ -294,8 +333,12 @@ namespace chaiscript
return m_conversions; return m_conversions;
} }
mutable chaiscript::detail::threading::shared_mutex m_mutex; mutable chaiscript::detail::threading::shared_mutex m_mutex;
std::set<std::shared_ptr<detail::Type_Conversion_Base>> m_conversions; std::set<std::shared_ptr<detail::Type_Conversion_Base>> m_conversions;
std::set<const std::type_info *, Less_Than> m_convertableTypes;
std::atomic_size_t m_num_types;
chaiscript::detail::threading::Thread_Storage<std::set<const std::type_info *, Less_Than>> m_thread_cache;
}; };
typedef std::shared_ptr<chaiscript::detail::Type_Conversion_Base> Type_Conversion; typedef std::shared_ptr<chaiscript::detail::Type_Conversion_Base> Type_Conversion;

View File

@ -111,6 +111,11 @@ namespace chaiscript
} }
} }
CHAISCRIPT_CONSTEXPR const std::type_info *bare_type_info() const
{
return m_bare_type_info;
}
private: private:
const std::type_info *m_type_info; const std::type_info *m_type_info;
const std::type_info *m_bare_type_info; const std::type_info *m_bare_type_info;