From e7d8bccd5d299887792b613e44f555cf749d225c Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 29 Apr 2015 12:03:54 -0700 Subject: [PATCH] cleanups --- assignment-client/src/audio/AudioMixer.h | 9 ----- assignment-client/src/avatars/AvatarMixer.cpp | 18 ++-------- assignment-client/src/avatars/AvatarMixer.h | 3 -- .../src/entities/EntityServer.cpp | 11 ------ assignment-client/src/entities/EntityServer.h | 1 - assignment-client/src/octree/OctreeServer.cpp | 34 ------------------- assignment-client/src/octree/OctreeServer.h | 1 - .../networking/src/ThreadedAssignment.cpp | 9 ----- 8 files changed, 2 insertions(+), 84 deletions(-) diff --git a/assignment-client/src/audio/AudioMixer.h b/assignment-client/src/audio/AudioMixer.h index 4894f91e01..6cee557ff9 100644 --- a/assignment-client/src/audio/AudioMixer.h +++ b/assignment-client/src/audio/AudioMixer.h @@ -110,15 +110,6 @@ private: MovingMinMaxAvg _timeSpentPerHashMatchCallStats; // update with usecs spent inside each packetVersionAndHashMatch call MovingMinMaxAvg _readPendingCallsPerSecondStats; // update with # of readPendingDatagrams calls in the last second - - /* // loop variables */ - /* // QTimer* _idleTimer = nullptr; */ - /* int _nextFrame = 0; */ - /* QElapsedTimer _timer; */ - /* char _clientMixBuffer[MAX_PACKET_SIZE]; */ - /* int _usecToSleep = AudioConstants::NETWORK_FRAME_USECS; */ - /* const int TRAILING_AVERAGE_FRAMES = 100; */ - /* int _framesSinceCutoffEvent = TRAILING_AVERAGE_FRAMES; */ }; #endif // hifi_AudioMixer_h diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index 8cff7d705d..5612450f1f 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -65,7 +65,9 @@ const float BILLBOARD_AND_IDENTITY_SEND_PROBABILITY = 1.0f / 300.0f; // 1) use the view frustum to cull those avatars that are out of view. Since avatar data doesn't need to be present // if the avatar is not in view or in the keyhole. void AvatarMixer::broadcastAvatarData() { + int idleTime = QDateTime::currentMSecsSinceEpoch() - _lastFrameTimestamp; + ++_numStatFrames; const float STRUGGLE_TRIGGER_SLEEP_PERCENTAGE_THRESHOLD = 0.10f; @@ -336,22 +338,6 @@ void AvatarMixer::sendStatsPacket() { _numStatFrames = 0; } -// void AvatarMixer::stop() { -// qDebug() << "AvatarMixer::stop"; -// if (_broadcastTimer) { -// // _broadcastTimer->stop(); -// // delete _broadcastTimer; -// _broadcastTimer->deleteLater(); -// // _broadcastTimer = nullptr; -// } - -// _broadcastThread.quit(); -// _broadcastThread.wait(); - -// ThreadedAssignment::stop(); -// } - - void AvatarMixer::run() { ThreadedAssignment::commonInit(AVATAR_MIXER_LOGGING_NAME, NodeType::AvatarMixer); diff --git a/assignment-client/src/avatars/AvatarMixer.h b/assignment-client/src/avatars/AvatarMixer.h index 2a659cface..4746f02d14 100644 --- a/assignment-client/src/avatars/AvatarMixer.h +++ b/assignment-client/src/avatars/AvatarMixer.h @@ -25,7 +25,6 @@ public: public slots: /// runs the avatar mixer void run(); - // Q_INVOKABLE virtual void stop(); void nodeAdded(SharedNodePointer nodeAdded); void nodeKilled(SharedNodePointer killedNode); @@ -33,8 +32,6 @@ public slots: void readPendingDatagrams(); void sendStatsPacket(); - - void finished(); private: void broadcastAvatarData(); diff --git a/assignment-client/src/entities/EntityServer.cpp b/assignment-client/src/entities/EntityServer.cpp index e38d0e3c65..b2a1c62ed4 100644 --- a/assignment-client/src/entities/EntityServer.cpp +++ b/assignment-client/src/entities/EntityServer.cpp @@ -163,14 +163,3 @@ void EntityServer::readAdditionalConfiguration(const QJsonObject& settingsSectio EntityTree* tree = static_cast(_tree); tree->setWantEditLogging(wantEditLogging); } - - -// void EntityServer::stop() { -// qDebug() << "EntityServer::stop"; -// if (_pruneDeletedEntitiesTimer) { -// _pruneDeletedEntitiesTimer->stop(); -// delete _pruneDeletedEntitiesTimer; -// _pruneDeletedEntitiesTimer = nullptr; -// } -// OctreeServer::stop(); -// } diff --git a/assignment-client/src/entities/EntityServer.h b/assignment-client/src/entities/EntityServer.h index 78c20d039c..9edec7b704 100644 --- a/assignment-client/src/entities/EntityServer.h +++ b/assignment-client/src/entities/EntityServer.h @@ -44,7 +44,6 @@ public: virtual void readAdditionalConfiguration(const QJsonObject& settingsSectionObject); public slots: - // Q_INVOKABLE virtual void stop(); void pruneDeletedEntities(); protected: diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp index 725f4eda2c..506733e13d 100644 --- a/assignment-client/src/octree/OctreeServer.cpp +++ b/assignment-client/src/octree/OctreeServer.cpp @@ -1236,40 +1236,6 @@ void OctreeServer::aboutToFinish() { qDebug() << qPrintable(_safeServerName) << "server ENDING about to finish..."; } - -// void OctreeServer::stop() { -// qDebug() << "OctreeServer::stop"; -// // setFinished(true); -// // QThread *thisThread = QThread::currentThread(); -// // thisThread->quit(); - -// if (_jurisdictionSender) { -// _jurisdictionSender->terminating(); -// _jurisdictionSender->terminate(); -// // delete _jurisdictionSender; -// // _jurisdictionSender = nullptr; -// } - -// _datagramProcessingThread->quit(); -// if (_octreeInboundPacketProcessor) { -// _octreeInboundPacketProcessor->terminating(); -// _octreeInboundPacketProcessor->terminate(); -// // delete _octreeInboundPacketProcessor; -// // _octreeInboundPacketProcessor = nullptr; -// } - -// // _persistThread -// if (_persistThread) { -// _persistThread->terminating(); -// _persistThread->terminate(); -// // delete _persistThread; -// // _persistThread = nullptr; -// } - -// ThreadedAssignment::stop(); -// } - - QString OctreeServer::getUptime() { QString formattedUptime; quint64 now = usecTimestampNow(); diff --git a/assignment-client/src/octree/OctreeServer.h b/assignment-client/src/octree/OctreeServer.h index 10c4e81262..41cd3259cf 100644 --- a/assignment-client/src/octree/OctreeServer.h +++ b/assignment-client/src/octree/OctreeServer.h @@ -123,7 +123,6 @@ public: public slots: /// runs the octree server assignment void run(); - // Q_INVOKABLE virtual void stop(); void nodeAdded(SharedNodePointer node); void nodeKilled(SharedNodePointer node); void sendStatsPacket(); diff --git a/libraries/networking/src/ThreadedAssignment.cpp b/libraries/networking/src/ThreadedAssignment.cpp index c212aab188..6ec47d7cdd 100644 --- a/libraries/networking/src/ThreadedAssignment.cpp +++ b/libraries/networking/src/ThreadedAssignment.cpp @@ -73,15 +73,6 @@ void ThreadedAssignment::setFinished(bool isFinished) { } } - -// void ThreadedAssignment::stop() { -// setFinished(true); -// qDebug() << "ThreadedAssignment::stop"; -// QThread *thisThread = QThread::currentThread(); -// thisThread->quit(); -// } - - void ThreadedAssignment::commonInit(const QString& targetName, NodeType_t nodeType, bool shouldSendStats) { // change the logging target name while the assignment is running LogHandler::getInstance().setTargetName(targetName);