TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 17:35:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock issues with type registry

Browse Source
This commit is contained in:
rdb 2014-11-21 16:51:36 +00:00
parent 1082e75d87
commit 3490be94b7
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dtool/src/dtoolbase/typeRegistry.cxx
View File

@ -204,11 +204,15 @@ record_alternate_name(TypeHandle type, const string &name) {
if (rnode != (TypeRegistryNode *)NULL) { if (rnode != (TypeRegistryNode *)NULL) {
NameRegistry::iterator ri = NameRegistry::iterator ri =
_name_registry.insert(NameRegistry::value_type(name, rnode)).first; _name_registry.insert(NameRegistry::value_type(name, rnode)).first;
if ((*ri).second != rnode) { if ((*ri).second != rnode) {
_lock->release();
cerr cerr
<< "Name " << name << " already assigned to TypeHandle " << "Name " << name << " already assigned to TypeHandle "
<< rnode->_name << "; cannot reassign to " << type << "\n"; << rnode->_name << "; cannot reassign to " << type << "\n";
return;
} }
} }
_lock->release(); _lock->release();
@ -303,8 +307,10 @@ is_derived_from(TypeHandle child, TypeHandle base,
const TypeRegistryNode *child_node = look_up(child, child_object); const TypeRegistryNode *child_node = look_up(child, child_object);
const TypeRegistryNode *base_node = look_up(base, (TypedObject *)NULL); const TypeRegistryNode *base_node = look_up(base, (TypedObject *)NULL);
assert(child_node != (TypeRegistryNode *)NULL &&
base_node != (TypeRegistryNode *)NULL); assert(child_node != (TypeRegistryNode *)NULL);
assert(base_node != (TypeRegistryNode *)NULL);
freshen_derivations(); freshen_derivations();
bool result = TypeRegistryNode::is_derived_from(child_node, base_node); bool result = TypeRegistryNode::is_derived_from(child_node, base_node);
@ -622,7 +628,7 @@ rebuild_derivations() {
node->clear_subtree(); node->clear_subtree();
} }
} }
// Start by getting the list of root classes: those classes which do // Start by getting the list of root classes: those classes which do
// not derive from anything. // not derive from anything.
for (hi = _handle_registry.begin(); for (hi = _handle_registry.begin();
@ -709,24 +715,41 @@ look_up(TypeHandle handle, TypedObject *object) const {
_lock->release(); _lock->release();
handle = object->force_init_type(); handle = object->force_init_type();
_lock->acquire(); _lock->acquire();
if (handle._index == 0) { if (handle._index == 0) {
// Strange. // Strange.
cerr cerr
<< "Unable to force_init_type() on unregistered TypeHandle.\n"; << "Unable to force_init_type() on unregistered TypeHandle.\n";
return NULL; return NULL;
} }
// Now get the name for printing. We can't use TypeHandle::
// get_name() since that recursively calls look_up().
ostringstream name;
if (handle._index > 0 && handle._index < (int)_handle_registry.size()) {
TypeRegistryNode *rnode = _handle_registry[handle._index];
if (rnode != (TypeRegistryNode *)NULL) {
name << rnode->_name;
name << " (index " << handle._index << ")";
} else {
name << "NULL (index " << handle._index << ")";
}
} else {
name << "index " << handle._index;
}
if (handle == object->get_type()) { if (handle == object->get_type()) {
// Problem solved! // Problem solved!
cerr cerr
<< "Type " << handle << " was unregistered!\n"; << "Type " << name.str() << " was unregistered!\n";
} else { } else {
// No good; it looks like the TypeHandle belongs to a class // No good; it looks like the TypeHandle belongs to a class
// that defined get_type(), but didn't define // that defined get_type(), but didn't define
// force_init_type(). // force_init_type().
cerr cerr
<< "Attempt to reference unregistered TypeHandle. Type is of some\n" << "Attempt to reference unregistered TypeHandle. Type is of some\n"
<< "class derived from " << handle << " that doesn't define a good\n" << "class derived from type " << name.str() << " that doesn't define\n"
<< "force_init_type() method.\n"; << "a good force_init_type() method.\n";
return NULL; return NULL;
} }
@ -736,7 +759,7 @@ look_up(TypeHandle handle, TypedObject *object) const {
cerr cerr
<< "Attempt to reference unregistered TypeHandle!\n" << "Attempt to reference unregistered TypeHandle!\n"
<< "Registered TypeHandles are:\n"; << "Registered TypeHandles are:\n";
write(cerr); do_write(cerr);
return NULL; return NULL;
} }
} }
@ -757,7 +780,7 @@ look_up(TypeHandle handle, TypedObject *object) const {
// Function: get_best_parent_from_Set // Function: get_best_parent_from_Set
// Access: Private // Access: Private
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
extern "C" int extern "C" int
get_best_parent_from_Set(int id, const std::set<int> &this_set) { get_best_parent_from_Set(int id, const std::set<int> &this_set) {
// most common case.. // most common case..
if (this_set.find(id) != this_set.end()) { if (this_set.find(id) != this_set.end()) {
@ -771,4 +794,3 @@ get_best_parent_from_Set(int id, const std::set<int> &this_set) {
return th.get_best_parent_from_Set(this_set); return th.get_best_parent_from_Set(this_set);
} }