From e985f56b122a883a767348aa0b911c5e915ab878 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 29 Apr 2015 15:30:13 -0700 Subject: [PATCH] cleanups --- assignment-client/src/AssignmentClient.cpp | 4 ---- assignment-client/src/AssignmentClientApp.cpp | 1 + .../src/octree/OctreeInboundPacketProcessor.h | 1 - assignment-client/src/octree/OctreeServer.cpp | 6 +----- assignment-client/src/octree/OctreeServer.h | 3 --- libraries/networking/src/LimitedNodeList.h | 4 ---- libraries/networking/src/NodeList.h | 5 ----- libraries/networking/src/ThreadedAssignment.cpp | 9 --------- libraries/networking/src/ThreadedAssignment.h | 1 - libraries/shared/src/DependencyManager.h | 10 +--------- libraries/shared/src/LogHandler.h | 6 ------ 11 files changed, 3 insertions(+), 47 deletions(-) diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp index 4f00b30f42..594805c7c2 100644 --- a/assignment-client/src/AssignmentClient.cpp +++ b/assignment-client/src/AssignmentClient.cpp @@ -117,18 +117,14 @@ void AssignmentClient::stopAssignmentClient() { if (_currentAssignment) { _currentAssignment->aboutToQuit(); QThread* currentAssignmentThread = _currentAssignment->thread(); - qDebug() << "main thread waiting on _currentAssignment->thread()" << currentAssignmentThread->objectName(); currentAssignmentThread->quit(); currentAssignmentThread->wait(); - qDebug() << "done waiting."; } } void AssignmentClient::aboutToQuit() { - qDebug() << "AssignmentClient::aboutToQuit start"; stopAssignmentClient(); - qDebug() << "AssignmentClient::aboutToQuit end"; // clear the log handler so that Qt doesn't call the destructor on LogHandler qInstallMessageHandler(0); // clear out pointer to the assignment so the destructor gets called. if we don't do this here, diff --git a/assignment-client/src/AssignmentClientApp.cpp b/assignment-client/src/AssignmentClientApp.cpp index d8e4306ec5..2de349ca4e 100644 --- a/assignment-client/src/AssignmentClientApp.cpp +++ b/assignment-client/src/AssignmentClientApp.cpp @@ -167,6 +167,7 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) : } + if (parser.isSet(numChildsOption)) { if (minForks && minForks > numForks) { qCritical() << "--min can't be more than -n"; diff --git a/assignment-client/src/octree/OctreeInboundPacketProcessor.h b/assignment-client/src/octree/OctreeInboundPacketProcessor.h index 2f9c060183..156e09b493 100644 --- a/assignment-client/src/octree/OctreeInboundPacketProcessor.h +++ b/assignment-client/src/octree/OctreeInboundPacketProcessor.h @@ -74,7 +74,6 @@ public: NodeToSenderStatsMap& getSingleSenderStats() { return _singleSenderStats; } - // void shuttingDown() { _shuttingDown = true;} virtual void terminating() { _shuttingDown = true; ReceivedPacketProcessor::terminating(); } protected: diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp index 11509192ad..f6f1c486b5 100644 --- a/assignment-client/src/octree/OctreeServer.cpp +++ b/assignment-client/src/octree/OctreeServer.cpp @@ -239,10 +239,8 @@ OctreeServer::OctreeServer(const QByteArray& packet) : _octreeInboundPacketProcessor(NULL), _persistThread(NULL), _started(time(0)), - _startedUSecs(usecTimestampNow()), - _nodeList(DependencyManager::get()) + _startedUSecs(usecTimestampNow()) { - if (_instance) { qDebug() << "Octree Server starting... while old instance still running _instance=["<<_instance<<"] this=[" << this << "]"; } @@ -1100,8 +1098,6 @@ void OctreeServer::readConfiguration() { } void OctreeServer::run() { - // qInstallMessageHandler(LogHandler::verboseMessageHandler); - _safeServerName = getMyServerName(); // Before we do anything else, create our tree... diff --git a/assignment-client/src/octree/OctreeServer.h b/assignment-client/src/octree/OctreeServer.h index 09368fbe4d..41cd3259cf 100644 --- a/assignment-client/src/octree/OctreeServer.h +++ b/assignment-client/src/octree/OctreeServer.h @@ -238,9 +238,6 @@ protected: static QMutex _threadsDidPacketDistributorMutex; static QMutex _threadsDidHandlePacketSendMutex; static QMutex _threadsDidCallWriteDatagramMutex; - - // keep a pointer to node list so that it doesn't get shut down before this class. - QSharedPointer _nodeList; }; #endif // hifi_OctreeServer_h diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h index f541a29d01..a7057b4ed8 100644 --- a/libraries/networking/src/LimitedNodeList.h +++ b/libraries/networking/src/LimitedNodeList.h @@ -221,10 +221,6 @@ protected: LimitedNodeList(unsigned short socketListenPort = 0, unsigned short dtlsListenPort = 0); LimitedNodeList(LimitedNodeList const&); // Don't implement, needed to avoid copies of singleton void operator=(LimitedNodeList const&); // Don't implement, needed to avoid copies of singleton - - virtual ~LimitedNodeList() { - qDebug() << "XXXXXXXXXXXXXXXXXXXX ~LimitedNodeList called"; - } qint64 writeDatagram(const QByteArray& datagram, const HifiSockAddr& destinationSockAddr, const QUuid& connectionSecret); diff --git a/libraries/networking/src/NodeList.h b/libraries/networking/src/NodeList.h index 4cb3fb8ea2..ccfaa7a4cf 100644 --- a/libraries/networking/src/NodeList.h +++ b/libraries/networking/src/NodeList.h @@ -45,11 +45,6 @@ class NodeList : public LimitedNodeList { SINGLETON_DEPENDENCY public: - virtual ~NodeList() { - qDebug() << "XXXXXXXXXXXXXXXXXXXX ~NodeList called"; - } - - NodeType_t getOwnerType() const { return _ownerType; } void setOwnerType(NodeType_t ownerType) { _ownerType = ownerType; } diff --git a/libraries/networking/src/ThreadedAssignment.cpp b/libraries/networking/src/ThreadedAssignment.cpp index 6ec47d7cdd..eda3da8479 100644 --- a/libraries/networking/src/ThreadedAssignment.cpp +++ b/libraries/networking/src/ThreadedAssignment.cpp @@ -26,14 +26,7 @@ ThreadedAssignment::ThreadedAssignment(const QByteArray& packet) : } -ThreadedAssignment::~ThreadedAssignment() { - // setFinished(true); -} - void ThreadedAssignment::setFinished(bool isFinished) { - - qDebug() << "------------- ThreadedAssignment::setFinished" << isFinished << " -------------------"; - _isFinished = isFinished; if (_isFinished) { @@ -57,10 +50,8 @@ void ThreadedAssignment::setFinished(bool isFinished) { if (_datagramProcessingThread) { // tell the datagram processing thread to quit and wait until it is done, then return the node socket to the NodeList - qDebug() << "stopping datagramProcessingThread..."; _datagramProcessingThread->quit(); _datagramProcessingThread->wait(); - qDebug() << "done stopping datagramProcessingThread."; // set node socket parent back to NodeList nodeList->getNodeSocket().setParent(nodeList.data()); diff --git a/libraries/networking/src/ThreadedAssignment.h b/libraries/networking/src/ThreadedAssignment.h index e2c6e0a1b6..590c2f56ca 100644 --- a/libraries/networking/src/ThreadedAssignment.h +++ b/libraries/networking/src/ThreadedAssignment.h @@ -20,7 +20,6 @@ class ThreadedAssignment : public Assignment { Q_OBJECT public: ThreadedAssignment(const QByteArray& packet); - virtual ~ThreadedAssignment(); void setFinished(bool isFinished); virtual void aboutToFinish() { }; diff --git a/libraries/shared/src/DependencyManager.h b/libraries/shared/src/DependencyManager.h index 1d91872940..cdda72438a 100644 --- a/libraries/shared/src/DependencyManager.h +++ b/libraries/shared/src/DependencyManager.h @@ -26,12 +26,9 @@ class Dependency { public: typedef std::function DeleterFunction; - const QString& getDependencyName() { return _name; } protected: - virtual ~Dependency() { - qDebug() << "DESTRUCTING" << _name; - } + virtual ~Dependency() {} virtual void customDeleter() { _customDeleter(this); } @@ -39,9 +36,6 @@ protected: void setCustomDeleter(DeleterFunction customDeleter) { _customDeleter = customDeleter; } DeleterFunction _customDeleter = [](Dependency* pointer) { delete pointer; }; - void setDependencyName(QString name) { _name = name; } - QString _name; - friend class DependencyManager; }; @@ -101,7 +95,6 @@ QSharedPointer DependencyManager::set(Args&&... args) { QSharedPointer newInstance(new T(args...), &T::customDeleter); QSharedPointer storedInstance = qSharedPointerCast(newInstance); instance.swap(storedInstance); - newInstance->setDependencyName(typeid(T).name()); return newInstance; } @@ -109,7 +102,6 @@ QSharedPointer DependencyManager::set(Args&&... args) { template void DependencyManager::destroy() { static size_t hashCode = _manager.getHashCode(); - qDebug() << "DESTROYING" << _manager.safeGet(hashCode)->getDependencyName(); _manager.safeGet(hashCode).clear(); } diff --git a/libraries/shared/src/LogHandler.h b/libraries/shared/src/LogHandler.h index 1e9567b4d7..914cad212d 100644 --- a/libraries/shared/src/LogHandler.h +++ b/libraries/shared/src/LogHandler.h @@ -19,8 +19,6 @@ #include #include -#include - const int VERBOSE_LOG_INTERVAL_SECONDS = 5; enum LogMsgType { @@ -36,10 +34,6 @@ class LogHandler : public QObject { Q_OBJECT public: static LogHandler& getInstance(); - - virtual ~LogHandler() { - std::cerr << "XXXXXXXX ~LogHandler()\n"; - } /// sets the target name to output via the verboseMessageHandler, called once before logging begins /// \param targetName the desired target name to output in logs