Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-26 03:55:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove OctreeServer's static instance

Browse source
This commit is contained in:
Atlante45 2015-12-15 15:02:04 -08:00
parent 09701fdcf1
commit 346c28f9e2
3 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
assignment-client/src/octree/OctreeServer.cpp
View file

@ -28,7 +28,6 @@
#include "OctreeQueryNode.h" #include "OctreeQueryNode.h"
#include "OctreeServerConsts.h" #include "OctreeServerConsts.h"
OctreeServer* OctreeServer::_instance = NULL;
int OctreeServer::_clientCount = 0; int OctreeServer::_clientCount = 0;
const int MOVING_AVERAGE_SAMPLE_COUNTS = 1000000; const int MOVING_AVERAGE_SAMPLE_COUNTS = 1000000;
@ -232,13 +231,6 @@ OctreeServer::OctreeServer(ReceivedMessage& message) :
_started(time(0)), _started(time(0)),
_startedUSecs(usecTimestampNow()) _startedUSecs(usecTimestampNow())
{ {
if (_instance) {
qDebug() << "Octree Server starting... while old instance still running _instance=["<<_instance<<"] this=[" << this << "]";
}
qDebug() << "Octree Server starting... setting _instance to=[" << this << "]";
_instance = this;
_averageLoopTime.updateAverage(0); _averageLoopTime.updateAverage(0);
qDebug() << "Octree server starting... [" << this << "]"; qDebug() << "Octree server starting... [" << this << "]";
@ -282,9 +274,6 @@ OctreeServer::~OctreeServer() {
_tree.reset(); _tree.reset();
qDebug() << qPrintable(_safeServerName) << "server DONE cleaning up octree... [" << this << "]"; qDebug() << qPrintable(_safeServerName) << "server DONE cleaning up octree... [" << this << "]";
if (_instance == this) {
_instance = NULL; // we are gone
}
qDebug() << qPrintable(_safeServerName) << "server DONE shutting down... [" << this << "]"; qDebug() << qPrintable(_safeServerName) << "server DONE shutting down... [" << this << "]";
} }
@ -1118,8 +1107,8 @@ void OctreeServer::domainSettingsRequestComplete() {
setvbuf(stdout, NULL, _IOLBF, 0); setvbuf(stdout, NULL, _IOLBF, 0);
#endif #endif
nodeList->linkedDataCreateCallback = [] (Node* node) { nodeList->linkedDataCreateCallback = [this](Node* node) {
auto queryNodeData = _instance->createOctreeQueryNode(); auto queryNodeData = createOctreeQueryNode();
queryNodeData->init(); queryNodeData->init();
node->setLinkedData(std::move(queryNodeData)); node->setLinkedData(std::move(queryNodeData));
}; };

2
assignment-client/src/octree/OctreeServer.h
View file

@ -187,8 +187,6 @@ protected:
int _backupInterval; int _backupInterval;
int _maxBackupVersions; int _maxBackupVersions;
static OctreeServer* _instance;
time_t _started; time_t _started;
quint64 _startedUSecs; quint64 _startedUSecs;
QString _safeServerName; QString _safeServerName;

2
libraries/networking/src/LimitedNodeList.h
View file

@ -129,7 +129,7 @@ public:
qint64 sendPacketList(std::unique_ptr<NLPacketList> packetList, const HifiSockAddr& sockAddr); qint64 sendPacketList(std::unique_ptr<NLPacketList> packetList, const HifiSockAddr& sockAddr);
qint64 sendPacketList(std::unique_ptr<NLPacketList> packetList, const Node& destinationNode); qint64 sendPacketList(std::unique_ptr<NLPacketList> packetList, const Node& destinationNode);
void (*linkedDataCreateCallback)(Node *); std::function<void(Node*)> linkedDataCreateCallback;
size_t size() const { return _nodeHash.size(); } size_t size() const { return _nodeHash.size(); }