Skip to content

[Defaulttype] TypeInfoRegistry: Fix crash at exit in TypeInfoRegistry deleter #6183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fredroy wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −14
Open

[Defaulttype] TypeInfoRegistry: Fix crash at exit in TypeInfoRegistry deleter #6183

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions Sofa/framework/DefaultType/src/sofa/defaulttype/TypeInfoRegistry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
******************************************************************************/
#include <typeindex>
#include <map>
#include <memory>
#include <iostream>
#include <sofa/helper/logging/Messaging.h>
#include <sofa/defaulttype/AbstractTypeInfo.h>
Expand All @@ -38,21 +39,24 @@
namespace sofa::defaulttype
{

/// Non-owning list of registered type infos, indexed by TypeInfoId.
/// Most entries are borrowed pointers to function-local static singletons
/// (e.g. NoTypeInfo::Get() or DataTypeInfoDynamicWrapper<...>::get()) that
/// must never be deleted here. The few objects actually allocated by this
/// registry are owned by getOwnedStorage() instead.
static std::vector<const AbstractTypeInfo*>& getStorage()
{
static auto deleter = [](const std::vector<const AbstractTypeInfo*>* v)
{
for (const auto* info : *v)
{
if (info != NoTypeInfo::Get())
{
delete info;
}
}
};
static std::unique_ptr<std::vector<const AbstractTypeInfo*>, decltype(deleter)> type_infos(
new std::vector<const AbstractTypeInfo*>{NoTypeInfo::Get()}, deleter);
return *type_infos;
static std::vector<const AbstractTypeInfo*> type_infos{NoTypeInfo::Get()};
return type_infos;
}

/// Owns the type infos allocated by this registry itself (see AllocateNewTypeId).
/// The raw pointers stored in getStorage() alias these objects, so ownership is
/// kept here to release them at exit without deleting borrowed singletons.
static std::vector<std::unique_ptr<const AbstractTypeInfo>>& getOwnedStorage()
{
static std::vector<std::unique_ptr<const AbstractTypeInfo>> owned_type_infos;
return owned_type_infos;
}

std::vector<const AbstractTypeInfo*> TypeInfoRegistry::GetRegisteredTypes(const std::string& target)
Expand Down Expand Up @@ -89,7 +93,8 @@ int TypeInfoRegistry::AllocateNewTypeId(const std::type_info& nfo)
auto& typeinfos = getStorage();
const std::string name = sofa::helper::NameDecoder::decodeTypeName(nfo);
const std::string typeName = sofa::helper::NameDecoder::decodeTypeName(nfo);
typeinfos.push_back(new NameOnlyTypeInfo(name, typeName));
auto& owned = getOwnedStorage().emplace_back(std::make_unique<NameOnlyTypeInfo>(name, typeName));
typeinfos.push_back(owned.get());
return static_cast<int>(typeinfos.size()-1);
}

Expand Down
Loading