Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-24 03:53:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

unhook node bag from element notifications on shutdown to speed up cleanup

Browse source
This commit is contained in:
ZappoMan 2014-04-21 15:45:12 -07:00
parent 779b5a6827
commit f3aa9d3b8f
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
assignment-client/src/octree/OctreeQueryNode.cpp
View file

@ -62,6 +62,7 @@ void OctreeQueryNode::nodeKilled() {
// while the thread actually shuts down
_octreeSendThread->setIsShuttingDown();
}
nodeBag.unhookNotifications(); // if our node is shutting down, then we no longer need octree element notifications
}
void OctreeQueryNode::forceNodeShutdown() {

9
libraries/octree/src/OctreeElementBag.cpp
View file

@ -16,13 +16,20 @@ OctreeElementBag::OctreeElementBag() :
_bagElements()
{
OctreeElement::addDeleteHook(this);
_hooked = true;
};
OctreeElementBag::~OctreeElementBag() {
OctreeElement::removeDeleteHook(this);
unhookNotifications();
deleteAll();
}
void OctreeElementBag::unhookNotifications() {
if (_hooked) {
OctreeElement::removeDeleteHook(this);
}
}
void OctreeElementBag::elementDeleted(OctreeElement* element) {
qDebug() << "OctreeElementBag::elementDeleted()...";
remove(element); // note: remove can safely handle nodes that aren't in it, so we don't need to check contains()

3
libraries/octree/src/OctreeElementBag.h
View file

@ -36,8 +36,11 @@ public:
void deleteAll();
virtual void elementDeleted(OctreeElement* element);
void unhookNotifications();
private:
QSet<OctreeElement*> _bagElements;
bool _hooked;
};
#endif // hifi_OctreeElementBag_h