History

ifdef around massive debug output

ZappoMan committed 11 years ago

Commit 87576001 parent ca432a41 file · +76 −73Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 1 file). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+76−73
@@ -41,6 +41,13 @@ · 40 unmodified lines
4141
4242 #include "MIDIEvent.h"
4343
44+
45+#ifdef WANT_DEBUG_SCRIPT_ENDING
46+#define DEBUG_SCRIPT_ENDING(X) X
47+#else
48+#define DEBUG_SCRIPT_ENDING(x)
49+#endif
50+
4451 EntityScriptingInterface ScriptEngine::_entityScriptingInterface;
4552
4653 static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine){
@@ -100,7 +107,7 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNam · 53 unmodified lines
100107 }
101108
102109 ScriptEngine::~ScriptEngine() {
103− qDebug() << "ScriptEngine::~ScriptEngine() ------- BEGIN ------- script:" << getFilename();
110+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::~ScriptEngine() ------- BEGIN ------- script:" << getFilename();)
104111 // If we're not already in the middle of stopping all scripts, then we should remove ourselves
105112 // from the list of running scripts. We don't do this if we're in the process of stopping all scripts
106113 // because that method removes scripts from its list as it iterates them
@@ -109,7 +116,7 @@ ScriptEngine::~ScriptEngine() { · 2 unmodified lines
109116 _allKnownScriptEngines.remove(this);
110117 _allScriptsMutex.unlock();
111118 }
112− qDebug() << "ScriptEngine::~ScriptEngine() ------- END ------- script:" << getFilename();
119+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::~ScriptEngine() ------- END ------- script:" << getFilename();)
113120 }
114121
115122 QSet<ScriptEngine*> ScriptEngine::_allKnownScriptEngines;
@@ -118,7 +125,7 @@ bool ScriptEngine::_stoppingAllScripts = false; · 2 unmodified lines
118125 bool ScriptEngine::_doneRunningThisScript = false;
119126
120127 void ScriptEngine::stopAllScripts(QObject* application) {
121− qDebug() << "ScriptEngine::stopAllScripts() ------- BEGIN -------";
128+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::stopAllScripts() ------- BEGIN -------";)
122129
123130 _allScriptsMutex.lock();
124131 _stoppingAllScripts = true;
@@ -129,9 +136,9 @@ void ScriptEngine::stopAllScripts(QObject* application) { · 4 unmodified lines
129136
130137 QString scriptName = scriptEngine->getFilename();
131138
132− qDebug() << "ScriptEngine::stopAllScripts() considering:" << scriptName
139+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::stopAllScripts() considering:" << scriptName
133140 << "isRunning():" << scriptEngine->isRunning()
134− << "evaluatePending():" << scriptEngine->evaluatePending();
141+ << "evaluatePending():" << scriptEngine->evaluatePending();)
135142
136143 // NOTE: typically all script engines are running. But there's at least one known exception to this, the
137144 // "entities sandbox" which is only used to evaluate entities scripts to test their validity before using
@@ -144,38 +151,34 @@ void ScriptEngine::stopAllScripts(QObject* application) { · 6 unmodified lines
144151 while (scriptEngine->evaluatePending()) {
145152 QEventLoop loop;
146153 QObject::connect(scriptEngine, &ScriptEngine::evaluationFinished, &loop, &QEventLoop::quit);
147− qDebug() << "ScriptEngine::stopAllScripts() while(evaluatePending()) STARTING loop.exec() script:" << scriptName;
154+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::stopAllScripts() while(evaluatePending()) STARTING loop.exec() script:" << scriptName;)
148155 loop.exec();
149− qDebug() << "ScriptEngine::stopAllScripts() while(evaluatePending()) AFTER loop.exec() script:" << scriptName;
156+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::stopAllScripts() while(evaluatePending()) AFTER loop.exec() script:" << scriptName;)
150157 }
151158 }
152159
153160 scriptEngine->disconnect(application);
154161 scriptEngine->stop();
155162
156− qDebug() << "ScriptEngine::stopAllScripts() -- WAITING for waitTillDoneRunning() script:" << scriptName;
163+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::stopAllScripts() -- WAITING for waitTillDoneRunning() script:" << scriptName;)
157164 scriptEngine->waitTillDoneRunning();
158− qDebug() << "ScriptEngine::stopAllScripts() -- AFTER waitTillDoneRunning() script:" << scriptName;
165+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::stopAllScripts() -- AFTER waitTillDoneRunning() script:" << scriptName;)
159166 i.remove();
160167 } else {
161168 }
162169 }
163170 _stoppingAllScripts = false;
164171 _allScriptsMutex.unlock();
165− qDebug() << "ScriptEngine::stopAllScripts() ------- DONE -------";
172+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::stopAllScripts() ------- DONE -------";)
166173 }
167174
168175
169176 void ScriptEngine::waitTillDoneRunning() {
170177 QString scriptName = getFilename();
171− qDebug() << "ScriptEngine::waitTillDoneRunning() ------- BEGIN ------- script:" << scriptName;
172− qDebug() << " _isFinished:" << _isFinished;
173− qDebug() << " _isRunning:" << _isRunning;
174− qDebug() << " _isInitialized:" << _isInitialized;
175− qDebug() << " _evaluatesPending:" << _evaluatesPending;
178+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::waitTillDoneRunning() ------- BEGIN ------- script:" << scriptName;)
176179
177180 if (_isRunning) {
178− qDebug() << "ScriptEngine::waitTillDoneRunning() SETTING _doneRunningThisScript = false ################################### line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
181+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::waitTillDoneRunning() SETTING _doneRunningThisScript = false ################################### line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
179182 _doneRunningThisScript = false;
180183 _isWaitingForDoneRunning = true;
181184
@@ -188,23 +191,23 @@ void ScriptEngine::waitTillDoneRunning() { · 6 unmodified lines
188191 // and run a QEventLoop???
189192 QEventLoop loop;
190193 QObject::connect(this, &ScriptEngine::doneRunning, &loop, &QEventLoop::quit);
191− qDebug() << "ScriptEngine::waitTillDoneRunning() STARTING loop.exec() script:" << scriptName;
192− qDebug() << " _doneRunningThisScript:" << _doneRunningThisScript;
193− qDebug() << " _isRunning:" << _isRunning;
194− qDebug() << " _isWaitingForDoneRunning:" << _isWaitingForDoneRunning;
195− qDebug() << " _isFinished:" << _isFinished;
196− qDebug() << " _isInitialized:" << _isInitialized;
197− qDebug() << " _evaluatesPending:" << _evaluatesPending;
194+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::waitTillDoneRunning() STARTING loop.exec() script:" << scriptName;)
195+ DEBUG_SCRIPT_ENDING(qDebug() << " _doneRunningThisScript:" << _doneRunningThisScript;)
196+ DEBUG_SCRIPT_ENDING(qDebug() << " _isRunning:" << _isRunning;)
197+ DEBUG_SCRIPT_ENDING(qDebug() << " _isWaitingForDoneRunning:" << _isWaitingForDoneRunning;)
198+ DEBUG_SCRIPT_ENDING(qDebug() << " _isFinished:" << _isFinished;)
199+ DEBUG_SCRIPT_ENDING(qDebug() << " _isInitialized:" << _isInitialized;)
200+ DEBUG_SCRIPT_ENDING(qDebug() << " _evaluatesPending:" << _evaluatesPending;)
198201 loop.exec();
199− qDebug() << "ScriptEngine::waitTillDoneRunning() AFTER loop.exec() script:" << scriptName;
202+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::waitTillDoneRunning() AFTER loop.exec() script:" << scriptName;)
200203
201204 // process events
202− qDebug() << "ScriptEngine::waitTillDoneRunning() STARTING QCoreApplication::processEvents() script:" << scriptName;
205+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::waitTillDoneRunning() STARTING QCoreApplication::processEvents() script:" << scriptName;)
203206 QCoreApplication::processEvents();
204− qDebug() << "ScriptEngine::waitTillDoneRunning() AFTER QCoreApplication::processEvents() script:" << scriptName;
207+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::waitTillDoneRunning() AFTER QCoreApplication::processEvents() script:" << scriptName;)
205208
206209 if (_doneRunningThisScript) {
207− qDebug() << "ScriptEngine::waitTillDoneRunning() _doneRunningThisScript after processEvents... breaking!!! script:" << scriptName;
210+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::waitTillDoneRunning() _doneRunningThisScript after processEvents... breaking!!! script:" << scriptName;)
208211 break;
209212 }
210213 }
@@ -212,7 +215,7 @@ void ScriptEngine::waitTillDoneRunning() { · 1 unmodified line
212215 _isWaitingForDoneRunning = false;
213216 }
214217
215− qDebug() << "ScriptEngine::waitTillDoneRunning() ------- DONE ------- script:" << scriptName;
218+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::waitTillDoneRunning() ------- DONE ------- script:" << scriptName;)
216219 }
217220
218221 QString ScriptEngine::getFilename() const {
@@ -430,20 +433,20 @@ void ScriptEngine::evaluate() { · 211 unmodified lines
430433 return; // bail early
431434 }
432435
433− qDebug() << "ScriptEngine::evaluate() -- BEGIN script:" << getFilename() << "[" << this << "]";
436+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::evaluate() -- BEGIN script:" << getFilename() << "[" << this << "]";)
434437 if (!_isInitialized) {
435438 init();
436439 }
437440
438− qDebug() << "ScriptEngine::evaluate() -- about to call own evaluate(program) script:" << getFilename() << "[" << this << "]";
441+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::evaluate() -- about to call own evaluate(program) script:" << getFilename() << "[" << this << "]";)
439442 QScriptValue result = evaluate(_scriptContents);
440− qDebug() << "ScriptEngine::evaluate() -- AFTER own evaluate(program) script:" << getFilename() << "[" << this << "]";
443+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::evaluate() -- AFTER own evaluate(program) script:" << getFilename() << "[" << this << "]";)
441444
442445 // TODO: why do we check this twice? It seems like the call to clearExcpetions() in the lower level evaluate call
443446 // will cause this code to never actually run...
444447 if (hasUncaughtException()) {
445448 int line = uncaughtExceptionLineNumber();
446− qDebug() << "Uncaught exception at (" << _fileNameString << ") line" << line << ":" << result.toString();
449+ DEBUG_SCRIPT_ENDING(qDebug() << "Uncaught exception at (" << _fileNameString << ") line" << line << ":" << result.toString();)
447450 emit errorMessage("Uncaught exception at (" + _fileNameString + ") line" + QString::number(line) + ":" + result.toString());
448451 clearExceptions();
449452 }
@@ -456,24 +459,24 @@ QScriptValue ScriptEngine::evaluate(const QString& program, const QString& fileN · 6 unmodified lines
456459 return QScriptValue(); // bail early
457460 }
458461
459− qDebug() << "ScriptEngine::evaluate(program) -- BEGIN script:" << getFilename() << "_evaluatesPending:" << _evaluatesPending << "[" << this << "]";
462+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::evaluate(program) -- BEGIN script:" << getFilename() << "_evaluatesPending:" << _evaluatesPending << "[" << this << "]";)
460463 _evaluatesPending++;
461− qDebug() << "ScriptEngine::evaluate(program) -- after _evaluatesPending++ script:" << getFilename() << "_evaluatesPending:" << _evaluatesPending << "[" << this << "]";
462− qDebug() << "ScriptEngine::evaluate(program) -- BEFORE QScriptEngine::evaluate() script:" << getFilename() << "_evaluatesPending:" << _evaluatesPending << "[" << this << "]";
464+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::evaluate(program) -- after _evaluatesPending++ script:" << getFilename() << "_evaluatesPending:" << _evaluatesPending << "[" << this << "]";)
465+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::evaluate(program) -- BEFORE QScriptEngine::evaluate() script:" << getFilename() << "_evaluatesPending:" << _evaluatesPending << "[" << this << "]";)
463466 QScriptValue result = QScriptEngine::evaluate(program, fileName, lineNumber);
464− qDebug() << "ScriptEngine::evaluate(program) -- AFTER QScriptEngine::evaluate() script:" << getFilename() << "_evaluatesPending:" << _evaluatesPending << "[" << this << "]";
467+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::evaluate(program) -- AFTER QScriptEngine::evaluate() script:" << getFilename() << "_evaluatesPending:" << _evaluatesPending << "[" << this << "]";)
465468 if (hasUncaughtException()) {
466469 int line = uncaughtExceptionLineNumber();
467470 qDebug() << "Uncaught exception at (" << _fileNameString << " : " << fileName << ") line" << line << ": " << result.toString();
468471 }
469472 _evaluatesPending--;
470− qDebug() << "ScriptEngine::evaluate(program) -- after _evaluatesPending-- script:" << getFilename() << "_evaluatesPending:" << _evaluatesPending << "[" << this << "]";
473+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::evaluate(program) -- after _evaluatesPending-- script:" << getFilename() << "_evaluatesPending:" << _evaluatesPending << "[" << this << "]";)
471474
472− qDebug() << "ScriptEngine::evaluate(program) -- ABOUT TO emit evaluationFinished() script:" << getFilename() << "_evaluatesPending:" << _evaluatesPending << "[" << this << "]";
475+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::evaluate(program) -- ABOUT TO emit evaluationFinished() script:" << getFilename() << "_evaluatesPending:" << _evaluatesPending << "[" << this << "]";)
473476 emit evaluationFinished(result, hasUncaughtException());
474− qDebug() << "ScriptEngine::evaluate(program) -- AFTER emit evaluationFinished() script:" << getFilename() << "_evaluatesPending:" << _evaluatesPending << "[" << this << "]";
477+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::evaluate(program) -- AFTER emit evaluationFinished() script:" << getFilename() << "_evaluatesPending:" << _evaluatesPending << "[" << this << "]";)
475478 clearExceptions();
476− qDebug() << "ScriptEngine::evaluate(program) -- DONE script:" << getFilename() << "_evaluatesPending:" << _evaluatesPending << "[" << this << "]";
479+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::evaluate(program) -- DONE script:" << getFilename() << "_evaluatesPending:" << _evaluatesPending << "[" << this << "]";)
477480 return result;
478481 }
479482
@@ -493,18 +496,18 @@ void ScriptEngine::run() { · 13 unmodified lines
493496 // TODO: can we add a short circuit for _stoppingAllScripts here? What does it mean to not start running if
494497 // we're in the process of stopping?
495498
496− qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
499+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
497500 if (!_isInitialized) {
498501 init();
499502 }
500− qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
503+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
501504 _isRunning = true;
502505 _isFinished = false;
503506 emit runningStateChanged();
504507
505− qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
508+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
506509 QScriptValue result = evaluate(_scriptContents);
507− qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
510+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
508511
509512 QElapsedTimer startTime;
510513 startTime.start();
@@ -515,11 +518,11 @@ void ScriptEngine::run() { · 4 unmodified lines
515518
516519 qint64 lastUpdate = usecTimestampNow();
517520
518− qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
521+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
519522
520523 while (!_isFinished) {
521524 if (_isWaitingForDoneRunning) {
522− qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
525+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
523526 }
524527
525528 int usecToSleep = (thisFrame++ * SCRIPT_DATA_CALLBACK_USECS) - startTime.nsecsElapsed() / 1000; // nsec to usec
@@ -528,22 +531,22 @@ void ScriptEngine::run() { · 2 unmodified lines
528531 }
529532
530533 if (_isFinished) {
531− qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
534+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
532535 break;
533536 }
534537
535538 if (_isWaitingForDoneRunning) {
536− qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
539+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
537540 }
538541
539542 QCoreApplication::processEvents();
540543
541544 if (_isWaitingForDoneRunning) {
542− qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
545+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
543546 }
544547
545548 if (_isFinished) {
546− qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
549+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
547550 break;
548551 }
549552
@@ -673,34 +676,34 @@ void ScriptEngine::run() { · 123 unmodified lines
673676 lastUpdate = now;
674677
675678 if (_isWaitingForDoneRunning) {
676− qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
679+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
677680 }
678681
679682 }
680683
681684 if (_isWaitingForDoneRunning) {
682− qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
685+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
683686 }
684687
685− qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
688+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
686689
687690 stopAllTimers(); // make sure all our timers are stopped if the script is ending
688− qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename();
691+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename();)
689692
690693 if (_isWaitingForDoneRunning) {
691− qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
694+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
692695 }
693696
694697 emit scriptEnding();
695− qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
698+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
696699
697700 // kill the avatar identity timer
698701 delete _avatarIdentityTimer;
699702
700− qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
703+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
701704
702705 if (_isWaitingForDoneRunning) {
703− qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
706+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
704707 }
705708
706709 if (_entityScriptingInterface.getEntityPacketSender()->serversExist()) {
@@ -713,43 +716,43 @@ void ScriptEngine::run() { · 6 unmodified lines
713716 }
714717 }
715718
716− qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
719+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
717720
718721 // If we were on a thread, then wait till it's done
719722 if (thread()) {
720− qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
723+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
721724 thread()->quit();
722− qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
725+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
723726 }
724727
725− qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
728+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
726729
727730 if (_isWaitingForDoneRunning) {
728− qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
731+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
729732 }
730733
731734 emit finished(_fileNameString);
732735
733736 if (_isWaitingForDoneRunning) {
734− qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
737+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
735738 }
736739
737740 _isRunning = false;
738741 emit runningStateChanged();
739742
740− qDebug() << "ABOUT TO emit doneRunning() script:" << getFilename() << "[" << this << "]";
743+ DEBUG_SCRIPT_ENDING(qDebug() << "ABOUT TO emit doneRunning() script:" << getFilename() << "[" << this << "]";)
741744 emit doneRunning();
742− qDebug() << "AFTER emit doneRunning() script:" << getFilename() << "[" << this << "]";
745+ DEBUG_SCRIPT_ENDING(qDebug() << "AFTER emit doneRunning() script:" << getFilename() << "[" << this << "]";)
743746
744747 if (_isWaitingForDoneRunning) {
745− qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
748+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
746749 }
747750
748− qDebug() << "ScriptEngine::run() SETTING _doneRunningThisScript = true ################################### line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
751+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() SETTING _doneRunningThisScript = true ################################### line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
749752 _doneRunningThisScript = true;
750753
751754 if (_isWaitingForDoneRunning) {
752− qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";
755+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::run() ** _isWaitingForDoneRunning == true ** line:" << __LINE__ << " script:" << getFilename() << "[" << this << "]";)
753756 }
754757 }
755758
@@ -765,10 +768,10 @@ void ScriptEngine::stopAllTimers() { · 9 unmodified lines
765768 }
766769
767770 void ScriptEngine::stop() {
768− qDebug() << "ScriptEngine::stop() -- START -- line:" << __LINE__ << " script:" << getFilename();
771+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::stop() -- START -- line:" << __LINE__ << " script:" << getFilename();)
769772 _isFinished = true;
770773 emit runningStateChanged();
771− qDebug() << "ScriptEngine::stop() -- DONE -- line:" << __LINE__ << " script:" << getFilename();
774+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::stop() -- DONE -- line:" << __LINE__ << " script:" << getFilename();)
772775 }
773776
774777 void ScriptEngine::timerFired() {
@@ -884,9 +887,9 @@ void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callbac · 109 unmodified lines
884887 if (contents.isNull()) {
885888 qDebug() << "Error loading file: " << url;
886889 } else {
887− qDebug() << "ScriptEngine::include() BEFORE evaluate() line:" << __LINE__ << " parent script:" << getFilename() << "[" << this << "]" << " url:" << url << "_evaluatesPending:" << _evaluatesPending;
890+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::include() BEFORE evaluate() line:" << __LINE__ << " parent script:" << getFilename() << "[" << this << "]" << " url:" << url << "_evaluatesPending:" << _evaluatesPending;)
888891 QScriptValue result = evaluate(contents, url.toString());
889− qDebug() << "ScriptEngine::include() AFTER evaluate() line:" << __LINE__ << " parent script:" << getFilename() << "[" << this << "]" << " url:" << url << "_evaluatesPending:" << _evaluatesPending;
892+ DEBUG_SCRIPT_ENDING(qDebug() << "ScriptEngine::include() AFTER evaluate() line:" << __LINE__ << " parent script:" << getFilename() << "[" << this << "]" << " url:" << url << "_evaluatesPending:" << _evaluatesPending;)
890893 }
891894 }
892895