Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 1 file). Show all
Unified · Split
| @@ -201,6 +201,8 @@ void ScriptEngine::waitTillDoneRunning() { · 200 unmodified lines | ||
| 201 | 201 | // we want the application thread to continue to process events, because the scripts will likely need to |
| 202 | 202 | // marshall messages across to the main thread. For example if they access Settings or Menu in any of their |
| 203 | 203 | // shutdown code. |
| 204 | + QString scriptName = getFilename(); | |
| 205 | + | |
| 204 | 206 | auto startedWaiting = usecTimestampNow(); |
| 205 | 207 | while (thread()->isRunning()) { |
| 206 | 208 | // process events for the main application thread, allowing invokeMethod calls to pass between threads |
| @@ -210,14 +212,14 @@ void ScriptEngine::waitTillDoneRunning() { · 3 unmodified lines | ||
| 210 | 212 | |
| 211 | 213 | // if we've been waiting a second or more, then tell the script engine to stop evaluating |
| 212 | 214 | if (elapsed > USECS_PER_SECOND) { |
| 213 | − qDebug() << __FUNCTION__ << "...giving up on evaluation elapsed:" << elapsed << "calling abortEvaluation()"; | |
| 215 | + qDebug() << "giving up on evaluation elapsed:" << elapsed << "calling abortEvaluation() script:" << scriptName; | |
| 214 | 216 | abortEvaluation(); |
| 215 | 217 | } |
| 216 | 218 | |
| 217 | 219 | // if we've been waiting for more than 5 seconds then we should be more aggessive about stopping |
| 218 | 220 | static const auto WAITING_TOO_LONG = USECS_PER_SECOND * 5; |
| 219 | 221 | if (elapsed > WAITING_TOO_LONG) { |
| 220 | − qDebug() << __FUNCTION__ << "...giving up on thread elapsed:" << elapsed << "calling thread->quit()"; | |
| 222 | + qDebug() << "giving up on thread elapsed:" << elapsed << "calling thread->quit() script:" << scriptName; | |
| 221 | 223 | thread()->quit(); |
| 222 | 224 | break; |
| 223 | 225 | } |