add support to abort evaluation of long running scripts on shutdown

Brad Hefta-Gaub committed 10 years ago

Commit 48e63ea1 parent a21bc661 file · +4 −2Browse 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+4−2

         // we want the application thread to continue to process events, because the scripts will likely need to
         // marshall messages across to the main thread. For example if they access Settings or Menu in any of their
         // shutdown code.
+        QString scriptName = getFilename();
         auto startedWaiting = usecTimestampNow();
         while (thread()->isRunning()) {
             // process events for the main application thread, allowing invokeMethod calls to pass between threads
             // if we've been waiting a second or more, then tell the script engine to stop evaluating
             if (elapsed > USECS_PER_SECOND) {
-                qDebug() << __FUNCTION__ << "...giving up on evaluation elapsed:" << elapsed << "calling abortEvaluation()";
+                qDebug() << "giving up on evaluation elapsed:" << elapsed << "calling abortEvaluation() script:" << scriptName;
                 abortEvaluation();
             }
             // if we've been waiting for more than 5 seconds then we should be more aggessive about stopping
             static const auto WAITING_TOO_LONG = USECS_PER_SECOND * 5;
             if (elapsed > WAITING_TOO_LONG) {
-                qDebug() << __FUNCTION__ << "...giving up on thread elapsed:" << elapsed << "calling thread->quit()";
+                qDebug() << "giving up on thread elapsed:" << elapsed << "calling thread->quit() script:" << scriptName;
                 thread()->quit();
                 break;
             }