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

temp remove debug verbosity

Browse source
This commit is contained in:
ZappoMan 2013-12-16 11:36:19 -08:00
parent f9b7c23857
commit 32c2aef29b
6 changed files with 16 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/src/Application.cpp
View file

@ -248,7 +248,6 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
} }
Application::~Application() { Application::~Application() {
qDebug() << "START Application::~Application()...\n";
// make sure we don't call the idle timer any more // make sure we don't call the idle timer any more
delete idleTimer; delete idleTimer;
@ -269,7 +268,6 @@ Application::~Application() {
delete _settings; delete _settings;
delete _followMode; delete _followMode;
delete _glWidget; delete _glWidget;
qDebug() << "DONE Application::~Application()...\n";
} }
void Application::restoreSizeAndPosition() { void Application::restoreSizeAndPosition() {
@ -4429,9 +4427,7 @@ void Application::loadScript() {
bool wantMenuItems = true; // tells the ScriptEngine object to add menu items for itself 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()); ScriptEngine* scriptEngine = new ScriptEngine(script, wantMenuItems, fileName, Menu::getInstance());
qDebug("scriptEngine=%p\n",scriptEngine);
scriptEngine->setupMenuItems(); scriptEngine->setupMenuItems();
// setup the packet senders and jurisdiction listeners of the script engine's scripting interfaces so // 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->getVoxelScriptingInterface()->setPacketSender(&_voxelEditSender);
scriptEngine->getParticleScriptingInterface()->setPacketSender(&_particleEditSender); scriptEngine->getParticleScriptingInterface()->setPacketSender(&_particleEditSender);
qDebug("about to create workerThread\n");
QThread* workerThread = new QThread(this); QThread* workerThread = new QThread(this);
qDebug("workerThread=%p\n",workerThread);
// when the worker thread is started, call our engine's run.. // when the worker thread is started, call our engine's run..
connect(workerThread, SIGNAL(started()), scriptEngine, SLOT(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 // when the application is about to quit, stop our script engine so it unwinds properly
connect(this, SIGNAL(aboutToQuit()), scriptEngine, SLOT(stop())); connect(this, SIGNAL(aboutToQuit()), scriptEngine, SLOT(stop()));
qDebug("about to scriptEngine->moveToThread(workerThread)\n");
scriptEngine->moveToThread(workerThread); scriptEngine->moveToThread(workerThread);
qDebug("after scriptEngine->moveToThread(workerThread)\n");
// Starts an event loop, and emits workerThread->started() // Starts an event loop, and emits workerThread->started()
qDebug("about to workerThread->start()\n");
workerThread->start(); workerThread->start();
qDebug("after workerThread->start()\n");
// restore the main window's active state // restore the main window's active state
_window->activateWindow(); _window->activateWindow();

4
libraries/octree/src/OctreeEditPacketSender.cpp
View file

@ -35,7 +35,7 @@ OctreeEditPacketSender::OctreeEditPacketSender(PacketSenderNotify* notify) :
_serverJurisdictions(NULL), _serverJurisdictions(NULL),
_sequenceNumber(0), _sequenceNumber(0),
_maxPacketSize(MAX_PACKET_SIZE) { _maxPacketSize(MAX_PACKET_SIZE) {
printf("OctreeEditPacketSender::OctreeEditPacketSender() [%p] created... \n", this); //printf("OctreeEditPacketSender::OctreeEditPacketSender() [%p] created... \n", this);
} }
OctreeEditPacketSender::~OctreeEditPacketSender() { OctreeEditPacketSender::~OctreeEditPacketSender() {
@ -49,7 +49,7 @@ OctreeEditPacketSender::~OctreeEditPacketSender() {
delete packet; delete packet;
_preServerPackets.erase(_preServerPackets.begin()); _preServerPackets.erase(_preServerPackets.begin());
} }
printf("OctreeEditPacketSender::~OctreeEditPacketSender() [%p] destroyed... \n", this); //printf("OctreeEditPacketSender::~OctreeEditPacketSender() [%p] destroyed... \n", this);
} }

16
libraries/octree/src/OctreeScriptingInterface.cpp
View file

@ -16,17 +16,17 @@ OctreeScriptingInterface::OctreeScriptingInterface(OctreeEditPacketSender* packe
} }
OctreeScriptingInterface::~OctreeScriptingInterface() { OctreeScriptingInterface::~OctreeScriptingInterface() {
printf("OctreeScriptingInterface::~OctreeScriptingInterface()\n"); //printf("OctreeScriptingInterface::~OctreeScriptingInterface()\n");
if (_managedJuridiciontListerner) { if (_managedJuridiciontListerner) {
printf("OctreeScriptingInterface::~OctreeScriptingInterface() _managedJuridiciontListerner... _jurisdictionListener->terminate()\n"); //printf("OctreeScriptingInterface::~OctreeScriptingInterface() _managedJuridiciontListerner... _jurisdictionListener->terminate()\n");
_jurisdictionListener->terminate(); _jurisdictionListener->terminate();
printf("OctreeScriptingInterface::~OctreeScriptingInterface() _managedJuridiciontListerner... deleting _jurisdictionListener\n"); //printf("OctreeScriptingInterface::~OctreeScriptingInterface() _managedJuridiciontListerner... deleting _jurisdictionListener\n");
delete _jurisdictionListener; delete _jurisdictionListener;
} }
if (_managedPacketSender) { if (_managedPacketSender) {
printf("OctreeScriptingInterface::~OctreeScriptingInterface() _managedJuridiciontListerner... _packetSender->terminate()\n"); //printf("OctreeScriptingInterface::~OctreeScriptingInterface() _managedJuridiciontListerner... _packetSender->terminate()\n");
_packetSender->terminate(); _packetSender->terminate();
printf("OctreeScriptingInterface::~OctreeScriptingInterface() _managedPacketSender... deleting _packetSender\n"); //printf("OctreeScriptingInterface::~OctreeScriptingInterface() _managedPacketSender... deleting _packetSender\n");
delete _packetSender; delete _packetSender;
} }
} }
@ -40,13 +40,13 @@ void OctreeScriptingInterface::setJurisdictionListener(JurisdictionListener* jur
} }
void OctreeScriptingInterface::init() { void OctreeScriptingInterface::init() {
printf("OctreeScriptingInterface::init()\n"); //printf("OctreeScriptingInterface::init()\n");
if (_jurisdictionListener) { if (_jurisdictionListener) {
_managedJuridiciontListerner = false; _managedJuridiciontListerner = false;
} else { } else {
_managedJuridiciontListerner = true; _managedJuridiciontListerner = true;
_jurisdictionListener = new JurisdictionListener(getServerNodeType()); _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); _jurisdictionListener->initialize(true);
} }
@ -55,7 +55,7 @@ void OctreeScriptingInterface::init() {
} else { } else {
_managedPacketSender = true; _managedPacketSender = true;
_packetSender = createPacketSender(); _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()); _packetSender->setServerJurisdictions(_jurisdictionListener->getJurisdictions());
} }
} }

15
libraries/scriptengine/src/ScriptEngine.cpp
View file

@ -41,7 +41,7 @@ ScriptEngine::ScriptEngine(QString scriptContents, bool wantMenuItems,
} }
ScriptEngine::~ScriptEngine() { ScriptEngine::~ScriptEngine() {
printf("ScriptEngine::~ScriptEngine()...\n"); //printf("ScriptEngine::~ScriptEngine()...\n");
} }
@ -87,7 +87,7 @@ void ScriptEngine::run() {
_voxelScriptingInterface.getVoxelPacketSender()->setProcessCallIntervalHint(VISUAL_DATA_CALLBACK_USECS); _voxelScriptingInterface.getVoxelPacketSender()->setProcessCallIntervalHint(VISUAL_DATA_CALLBACK_USECS);
_particleScriptingInterface.getParticlePacketSender()->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); QScriptValue result = engine.evaluate(_scriptContents);
qDebug() << "Evaluated script.\n"; qDebug() << "Evaluated script.\n";
@ -109,14 +109,14 @@ void ScriptEngine::run() {
} }
if (_isFinished) { if (_isFinished) {
qDebug() << "line: " << __LINE__ << " _isFinished... breaking loop\n"; //qDebug() << "line: " << __LINE__ << " _isFinished... breaking loop\n";
break; break;
} }
QCoreApplication::processEvents(); QCoreApplication::processEvents();
if (_isFinished) { if (_isFinished) {
qDebug() << "line: " << __LINE__ << " _isFinished... breaking loop\n"; //qDebug() << "line: " << __LINE__ << " _isFinished... breaking loop\n";
break; break;
} }
@ -157,20 +157,13 @@ void ScriptEngine::run() {
// If we were on a thread, then wait till it's done // If we were on a thread, then wait till it's done
if (thread()) { if (thread()) {
qDebug() << "line: " << __LINE__ << " calling quit()...\n";
thread()->quit(); thread()->quit();
} }
qDebug() << "line: " << __LINE__ << " emitting finished()...\n";
emit finished(); emit finished();
} }
void ScriptEngine::stop() { void ScriptEngine::stop() {
_isFinished = true; _isFinished = true;
qDebug() << "line: " << __LINE__ << " ScriptEngine::stop().. setting _isFinished = true...\n";
} }
void ScriptEngine::applicationAboutToQuit() {
qDebug() << "line: " << __LINE__ << " ScriptEngine::applicationAboutToQuit().. setting _isFinished = true...\n";
stop();
}

1
libraries/scriptengine/src/ScriptEngine.h
View file

@ -39,7 +39,6 @@ public:
public slots: public slots:
void run(); void run();
void stop(); void stop();
void applicationAboutToQuit();
signals: signals:
void willSendAudioDataCallback(); void willSendAudioDataCallback();

5
libraries/shared/src/PacketSender.cpp
View file

@ -41,11 +41,11 @@ PacketSender::PacketSender(PacketSenderNotify* notify, int packetsPerSecond) :
_totalPacketsQueued(0), _totalPacketsQueued(0),
_totalBytesQueued(0) _totalBytesQueued(0)
{ {
printf("PacketSender[%p] created... \n", this); //printf("PacketSender[%p] created... \n", this);
} }
PacketSender::~PacketSender() { 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)) { while ((packetsSentThisCall < packetsToSendThisCall) && (packetsLeft > 0)) {
lock(); lock();
NetworkPacket& packet = _packets.front(); NetworkPacket& packet = _packets.front();
printf("PacketSender[%p], copying packet... \n", this);
NetworkPacket temporary = packet; // make a copy NetworkPacket temporary = packet; // make a copy
_packets.erase(_packets.begin()); _packets.erase(_packets.begin());
packetsLeft = _packets.size(); packetsLeft = _packets.size();