From 32c2aef29bb50b01e52789d9de1de4275756752f Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 16 Dec 2013 11:36:19 -0800 Subject: [PATCH] temp remove debug verbosity --- interface/src/Application.cpp | 11 ----------- libraries/octree/src/OctreeEditPacketSender.cpp | 4 ++-- .../octree/src/OctreeScriptingInterface.cpp | 16 ++++++++-------- libraries/scriptengine/src/ScriptEngine.cpp | 15 ++++----------- libraries/scriptengine/src/ScriptEngine.h | 1 - libraries/shared/src/PacketSender.cpp | 5 ++--- 6 files changed, 16 insertions(+), 36 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 1120b9d640..eff2af5c1c 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -248,7 +248,6 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : } Application::~Application() { - qDebug() << "START Application::~Application()...\n"; // make sure we don't call the idle timer any more delete idleTimer; @@ -269,7 +268,6 @@ Application::~Application() { delete _settings; delete _followMode; delete _glWidget; - qDebug() << "DONE Application::~Application()...\n"; } void Application::restoreSizeAndPosition() { @@ -4429,9 +4427,7 @@ void Application::loadScript() { bool wantMenuItems = true; // tells the ScriptEngine object to add menu items for itself - qDebug("about to create ScriptEngine\n"); ScriptEngine* scriptEngine = new ScriptEngine(script, wantMenuItems, fileName, Menu::getInstance()); - qDebug("scriptEngine=%p\n",scriptEngine); scriptEngine->setupMenuItems(); // setup the packet senders and jurisdiction listeners of the script engine's scripting interfaces so @@ -4439,9 +4435,7 @@ void Application::loadScript() { scriptEngine->getVoxelScriptingInterface()->setPacketSender(&_voxelEditSender); scriptEngine->getParticleScriptingInterface()->setPacketSender(&_particleEditSender); - qDebug("about to create workerThread\n"); QThread* workerThread = new QThread(this); - qDebug("workerThread=%p\n",workerThread); // when the worker thread is started, call our engine's run.. connect(workerThread, SIGNAL(started()), scriptEngine, SLOT(run())); @@ -4453,15 +4447,10 @@ void Application::loadScript() { // when the application is about to quit, stop our script engine so it unwinds properly connect(this, SIGNAL(aboutToQuit()), scriptEngine, SLOT(stop())); - qDebug("about to scriptEngine->moveToThread(workerThread)\n"); scriptEngine->moveToThread(workerThread); - qDebug("after scriptEngine->moveToThread(workerThread)\n"); // Starts an event loop, and emits workerThread->started() - qDebug("about to workerThread->start()\n"); workerThread->start(); - qDebug("after workerThread->start()\n"); - // restore the main window's active state _window->activateWindow(); diff --git a/libraries/octree/src/OctreeEditPacketSender.cpp b/libraries/octree/src/OctreeEditPacketSender.cpp index 4333e18684..752f7870df 100644 --- a/libraries/octree/src/OctreeEditPacketSender.cpp +++ b/libraries/octree/src/OctreeEditPacketSender.cpp @@ -35,7 +35,7 @@ OctreeEditPacketSender::OctreeEditPacketSender(PacketSenderNotify* notify) : _serverJurisdictions(NULL), _sequenceNumber(0), _maxPacketSize(MAX_PACKET_SIZE) { - printf("OctreeEditPacketSender::OctreeEditPacketSender() [%p] created... \n", this); + //printf("OctreeEditPacketSender::OctreeEditPacketSender() [%p] created... \n", this); } OctreeEditPacketSender::~OctreeEditPacketSender() { @@ -49,7 +49,7 @@ OctreeEditPacketSender::~OctreeEditPacketSender() { delete packet; _preServerPackets.erase(_preServerPackets.begin()); } - printf("OctreeEditPacketSender::~OctreeEditPacketSender() [%p] destroyed... \n", this); + //printf("OctreeEditPacketSender::~OctreeEditPacketSender() [%p] destroyed... \n", this); } diff --git a/libraries/octree/src/OctreeScriptingInterface.cpp b/libraries/octree/src/OctreeScriptingInterface.cpp index e67aa9bd1c..c324b94b3b 100644 --- a/libraries/octree/src/OctreeScriptingInterface.cpp +++ b/libraries/octree/src/OctreeScriptingInterface.cpp @@ -16,17 +16,17 @@ OctreeScriptingInterface::OctreeScriptingInterface(OctreeEditPacketSender* packe } OctreeScriptingInterface::~OctreeScriptingInterface() { - printf("OctreeScriptingInterface::~OctreeScriptingInterface()\n"); + //printf("OctreeScriptingInterface::~OctreeScriptingInterface()\n"); if (_managedJuridiciontListerner) { - printf("OctreeScriptingInterface::~OctreeScriptingInterface() _managedJuridiciontListerner... _jurisdictionListener->terminate()\n"); + //printf("OctreeScriptingInterface::~OctreeScriptingInterface() _managedJuridiciontListerner... _jurisdictionListener->terminate()\n"); _jurisdictionListener->terminate(); - printf("OctreeScriptingInterface::~OctreeScriptingInterface() _managedJuridiciontListerner... deleting _jurisdictionListener\n"); + //printf("OctreeScriptingInterface::~OctreeScriptingInterface() _managedJuridiciontListerner... deleting _jurisdictionListener\n"); delete _jurisdictionListener; } if (_managedPacketSender) { - printf("OctreeScriptingInterface::~OctreeScriptingInterface() _managedJuridiciontListerner... _packetSender->terminate()\n"); + //printf("OctreeScriptingInterface::~OctreeScriptingInterface() _managedJuridiciontListerner... _packetSender->terminate()\n"); _packetSender->terminate(); - printf("OctreeScriptingInterface::~OctreeScriptingInterface() _managedPacketSender... deleting _packetSender\n"); + //printf("OctreeScriptingInterface::~OctreeScriptingInterface() _managedPacketSender... deleting _packetSender\n"); delete _packetSender; } } @@ -40,13 +40,13 @@ void OctreeScriptingInterface::setJurisdictionListener(JurisdictionListener* jur } void OctreeScriptingInterface::init() { - printf("OctreeScriptingInterface::init()\n"); + //printf("OctreeScriptingInterface::init()\n"); if (_jurisdictionListener) { _managedJuridiciontListerner = false; } else { _managedJuridiciontListerner = true; _jurisdictionListener = new JurisdictionListener(getServerNodeType()); - printf("OctreeScriptingInterface::init() _managedJuridiciontListerner=true, creating _jurisdictionListener=%p\n", _jurisdictionListener); + //printf("OctreeScriptingInterface::init() _managedJuridiciontListerner=true, creating _jurisdictionListener=%p\n", _jurisdictionListener); _jurisdictionListener->initialize(true); } @@ -55,7 +55,7 @@ void OctreeScriptingInterface::init() { } else { _managedPacketSender = true; _packetSender = createPacketSender(); - printf("OctreeScriptingInterface::init() _managedPacketSender=true, creating _packetSender=%p\n", _packetSender); + //printf("OctreeScriptingInterface::init() _managedPacketSender=true, creating _packetSender=%p\n", _packetSender); _packetSender->setServerJurisdictions(_jurisdictionListener->getJurisdictions()); } } diff --git a/libraries/scriptengine/src/ScriptEngine.cpp b/libraries/scriptengine/src/ScriptEngine.cpp index c8df387e49..fe86924e57 100644 --- a/libraries/scriptengine/src/ScriptEngine.cpp +++ b/libraries/scriptengine/src/ScriptEngine.cpp @@ -41,7 +41,7 @@ ScriptEngine::ScriptEngine(QString scriptContents, bool wantMenuItems, } ScriptEngine::~ScriptEngine() { - printf("ScriptEngine::~ScriptEngine()...\n"); + //printf("ScriptEngine::~ScriptEngine()...\n"); } @@ -87,7 +87,7 @@ void ScriptEngine::run() { _voxelScriptingInterface.getVoxelPacketSender()->setProcessCallIntervalHint(VISUAL_DATA_CALLBACK_USECS); _particleScriptingInterface.getParticlePacketSender()->setProcessCallIntervalHint(VISUAL_DATA_CALLBACK_USECS); - qDebug() << "Script:\n" << _scriptContents << "\n"; + //qDebug() << "Script:\n" << _scriptContents << "\n"; QScriptValue result = engine.evaluate(_scriptContents); qDebug() << "Evaluated script.\n"; @@ -109,14 +109,14 @@ void ScriptEngine::run() { } if (_isFinished) { - qDebug() << "line: " << __LINE__ << " _isFinished... breaking loop\n"; + //qDebug() << "line: " << __LINE__ << " _isFinished... breaking loop\n"; break; } QCoreApplication::processEvents(); if (_isFinished) { - qDebug() << "line: " << __LINE__ << " _isFinished... breaking loop\n"; + //qDebug() << "line: " << __LINE__ << " _isFinished... breaking loop\n"; break; } @@ -157,20 +157,13 @@ void ScriptEngine::run() { // If we were on a thread, then wait till it's done if (thread()) { - qDebug() << "line: " << __LINE__ << " calling quit()...\n"; thread()->quit(); } - qDebug() << "line: " << __LINE__ << " emitting finished()...\n"; emit finished(); } void ScriptEngine::stop() { _isFinished = true; - qDebug() << "line: " << __LINE__ << " ScriptEngine::stop().. setting _isFinished = true...\n"; } -void ScriptEngine::applicationAboutToQuit() { - qDebug() << "line: " << __LINE__ << " ScriptEngine::applicationAboutToQuit().. setting _isFinished = true...\n"; - stop(); -} diff --git a/libraries/scriptengine/src/ScriptEngine.h b/libraries/scriptengine/src/ScriptEngine.h index 03734f6820..74c9b55559 100644 --- a/libraries/scriptengine/src/ScriptEngine.h +++ b/libraries/scriptengine/src/ScriptEngine.h @@ -39,7 +39,6 @@ public: public slots: void run(); void stop(); - void applicationAboutToQuit(); signals: void willSendAudioDataCallback(); diff --git a/libraries/shared/src/PacketSender.cpp b/libraries/shared/src/PacketSender.cpp index 45274a2a26..08049a9904 100644 --- a/libraries/shared/src/PacketSender.cpp +++ b/libraries/shared/src/PacketSender.cpp @@ -41,11 +41,11 @@ PacketSender::PacketSender(PacketSenderNotify* notify, int packetsPerSecond) : _totalPacketsQueued(0), _totalBytesQueued(0) { - printf("PacketSender[%p] created... \n", this); + //printf("PacketSender[%p] created... \n", this); } PacketSender::~PacketSender() { - printf("PacketSender::~PacketSender[%p] destroyed... \n", this); + //printf("PacketSender::~PacketSender[%p] destroyed... \n", this); } @@ -333,7 +333,6 @@ bool PacketSender::nonThreadedProcess() { while ((packetsSentThisCall < packetsToSendThisCall) && (packetsLeft > 0)) { lock(); NetworkPacket& packet = _packets.front(); - printf("PacketSender[%p], copying packet... \n", this); NetworkPacket temporary = packet; // make a copy _packets.erase(_packets.begin()); packetsLeft = _packets.size();