Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 13:07:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

migration to shared pointers

Browse source
This commit is contained in:
ZappoMan 2014-03-28 11:05:54 -07:00
parent ce6af9ecb8
commit 640dbaacab
3 changed files with 45 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
assignment-client/src/octree/OctreeSendThread.cpp
View file

@ -28,25 +28,34 @@ OctreeSendThread::OctreeSendThread(const SharedOctreeServerPointer& myServer, Sh
_processLock(),
_isShuttingDown(false)
{
QString safeServerName("Octree");
if (!_myServer.isNull()) {
safeServerName = _myServer->getMyServerName();
}
qDebug() << qPrintable(safeServerName) << "server [" << _myServer << "]: client connected "
qDebug() << qPrintable(_myServer->getMyServerName()) << "server [" << _myServer.data() << "]: client connected "
"- starting sending thread [" << this << "]";
OctreeServer::clientConnected();
}
OctreeSendThread::~OctreeSendThread() {
QString safeServerName("Octree");
if (!_myServer.isNull()) {
safeServerName = _myServer->getMyServerName();
}
qDebug() << qPrintable(safeServerName) << "server [" << _myServer << "]: client disconnected "
OctreeSendThread::~OctreeSendThread() {
QString serverName(_myServer->getMyServerName());
qDebug() << qPrintable(serverName) << "server [" << _myServer.data() << "]: client disconnected "
"- ending sending thread [" << this << "]";
OctreeServer::clientDisconnected();
qDebug() << qPrintable(serverName) << "server [" << _myServer.data() << "]: "
"- OctreeSendThread::~OctreeSendThread() this=[" << this << "]"
"line: " << __LINE__;
_node.clear();
qDebug() << qPrintable(serverName) << "server [" << _myServer.data() << "]: "
"- OctreeSendThread::~OctreeSendThread() this=[" << this << "]"
"line: " << __LINE__;
void* serverPtr = _myServer.data();
_myServer.clear();
qDebug() << qPrintable(serverName) << "server [" << serverPtr << "]: "
"- OctreeSendThread::~OctreeSendThread() this=[" << this << "]"
"line: " << __LINE__;
}
void OctreeSendThread::setIsShuttingDown() {

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

@ -19,7 +19,7 @@
#include "OctreeServer.h"
#include "OctreeServerConsts.h"
SharedOctreeServerPointer OctreeServer::_instance;
OctreeServer* OctreeServer::_instance;
int OctreeServer::_clientCount = 0;
const int MOVING_AVERAGE_SAMPLE_COUNTS = 1000000;
@ -203,7 +203,7 @@ void OctreeServer::trackProcessWaitTime(float time) {
}
void OctreeServer::attachQueryNodeToNode(Node* newNode) {
if (!newNode->getLinkedData() && !_instance.isNull()) {
if (!newNode->getLinkedData() && _instance) {
OctreeQueryNode* newQueryNodeData = _instance->createOctreeQueryNode();
newQueryNodeData->init();
newNode->setLinkedData(newQueryNodeData);
@ -231,8 +231,11 @@ OctreeServer::OctreeServer(const QByteArray& packet) :
_started(time(0)),
_startedUSecs(usecTimestampNow())
{
assert(_instance.isNull()); // you should only ever have one instance at a time!
_instance = SharedOctreeServerPointer(this);
assert(!_instance); // you should only ever have one instance at a time!
qDebug() << "Octree Server starting... setting _instance to=[" << this << "]";
_instance = this;
_averageLoopTime.updateAverage(0);
qDebug() << "Octree server starting... [" << this << "]";
}
@ -245,25 +248,40 @@ OctreeServer::~OctreeServer() {
}
delete[] _parsedArgV;
}
qDebug() << qPrintable(_safeServerName) << "server shutting down... [" << this << "] OctreeServer::~OctreeServer() line:" << __LINE__;
if (_jurisdictionSender) {
_jurisdictionSender->terminate();
_jurisdictionSender->deleteLater();
}
qDebug() << qPrintable(_safeServerName) << "server shutting down... [" << this << "] OctreeServer::~OctreeServer() line:" << __LINE__;
if (_octreeInboundPacketProcessor) {
_octreeInboundPacketProcessor->terminate();
_octreeInboundPacketProcessor->deleteLater();
}
qDebug() << qPrintable(_safeServerName) << "server shutting down... [" << this << "] OctreeServer::~OctreeServer() line:" << __LINE__;
if (_persistThread) {
qDebug() << qPrintable(_safeServerName) << "server shutting down... [" << this << "] OctreeServer::~OctreeServer() line:" << __LINE__;
_persistThread->terminate();
qDebug() << qPrintable(_safeServerName) << "server shutting down... [" << this << "] OctreeServer::~OctreeServer() line:" << __LINE__;
_persistThread->deleteLater();
qDebug() << qPrintable(_safeServerName) << "server shutting down... [" << this << "] OctreeServer::~OctreeServer() line:" << __LINE__;
}
qDebug() << qPrintable(_safeServerName) << "server shutting down... [" << this << "] OctreeServer::~OctreeServer() line:" << __LINE__;
delete _jurisdiction;
_jurisdiction = NULL;
qDebug() << qPrintable(_safeServerName) << "server DONE shutting down... [" << this << "]";
qDebug() << qPrintable(_safeServerName) << "server shutting down... [" << this << "] OctreeServer::~OctreeServer() line:" << __LINE__;
_instance = NULL; // we are gone
qDebug() << qPrintable(_safeServerName) << "server shutting down... [" << this << "] OctreeServer::~OctreeServer() line:" << __LINE__;
}
void OctreeServer::initHTTPManager(int port) {
@ -836,8 +854,7 @@ void OctreeServer::readPendingDatagrams() {
if (debug) {
qDebug() << "calling initializeOctreeSendThread()... node:" << *matchingNode;
}
SharedOctreeServerPointer myServer(this);
nodeData->initializeOctreeSendThread(myServer, matchingNode);
nodeData->initializeOctreeSendThread(SharedOctreeServerPointer(this), matchingNode);
}
}
} else if (packetType == PacketTypeJurisdictionRequest) {
@ -1059,10 +1076,8 @@ void OctreeServer::aboutToFinish() {
qDebug() << qPrintable(_safeServerName) << "server about to finish while node still connected node:" << *node;
nodeKilled(node);
}
qDebug() << qPrintable(_safeServerName) << "server ENDING about to finish...";
// release our reference to the instance, this will allow the shared pointers to properly unwind
_instance.clear();
}
QString OctreeServer::getUptime() {

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

@ -158,7 +158,7 @@ protected:
OctreeInboundPacketProcessor* _octreeInboundPacketProcessor;
OctreePersistThread* _persistThread;
static SharedOctreeServerPointer _instance;
static OctreeServer* _instance;
time_t _started;
quint64 _startedUSecs;