Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 11:29:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add support to abort evaluation of long running scripts on shutdown

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-04-26 16:21:11 -07:00
parent 28b5ef63b8
commit a21bc66fa3
2 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -199,11 +199,28 @@ void ScriptEngine::waitTillDoneRunning() {
// NOTE: waitTillDoneRunning() will be called on the main Application thread, inside of stopAllScripts()
// 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 Meny in any of their
// marshall messages across to the main thread. For example if they access Settings or Menu in any of their
// shutdown code.
auto startedWaiting = usecTimestampNow();
while (thread()->isRunning()) {
// process events for the main application thread, allowing invokeMethod calls to pass between threads
QCoreApplication::processEvents();
auto stillWaiting = usecTimestampNow();
auto elapsed = stillWaiting - startedWaiting;
// 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()";
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()";
thread()->quit();
break;
}
}
}
}

16
libraries/script-engine/src/ScriptEngines.cpp
View file

@ -129,19 +129,31 @@ void ScriptEngines::shutdownScripting() {
// "entities sandbox" which is only used to evaluate entities scripts to test their validity before using
// them. We don't need to stop scripts that aren't running.
if (scriptEngine->isRunning()) {
qCDebug(scriptengine) << "about to shutdown script:" << scriptName;
// If the script is running, but still evaluating then we need to wait for its evaluation step to
// complete. After that we can handle the stop process appropriately
if (scriptEngine->evaluatePending()) {
qCDebug(scriptengine) << "script still evaluating:" << scriptName;
auto startedWaiting = usecTimestampNow();
while (scriptEngine->evaluatePending()) {
// This event loop allows any started, but not yet finished evaluate() calls to complete
// we need to let these complete so that we can be guaranteed that the script engine isn't
// in a partially setup state, which can confuse our shutdown unwinding.
QEventLoop loop;
QObject::connect(scriptEngine, &ScriptEngine::evaluationFinished, &loop, &QEventLoop::quit);
loop.exec();
static const int MAX_PROCESSING_TIME = 500; // in MS
loop.processEvents(QEventLoop::AllEvents, MAX_PROCESSING_TIME);
auto stillWaiting = usecTimestampNow();
auto elapsed = stillWaiting - startedWaiting;
// if we've been waiting for more than 5 seconds, then tell the script engine to stop evaluating
static const auto WAITING_TOO_LONG = USECS_PER_SECOND * 5;
if (elapsed > WAITING_TOO_LONG) {
qCDebug(scriptengine) << "giving up on script evaluation elapsed:" << elapsed << "calling abortEvaluation() script:" << scriptName;
scriptEngine->abortEvaluation();
}
}
qCDebug(scriptengine) << "script DONE evaluating:" << scriptName;
}
// We disconnect any script engine signals from the application because we don't want to do any