separate out supporting changes into 21114-part2 branch

humbletim committed 9 years ago

Commit b1595621 parent 9b0bee910 files · +833 −223Browse files

Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 10 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngines.cpp+27−8

 }
 void ScriptEngines::stopAllScripts(bool restart) {
+    QVector<QString> toReload;
     QReadLocker lock(&_scriptEnginesHashLock);
     for (QHash<QUrl, ScriptEngine*>::const_iterator it = _scriptEnginesHash.constBegin();
         it != _scriptEnginesHash.constEnd(); it++) {
+        ScriptEngine *scriptEngine = it.value();
         // skip already stopped scripts
-        if (it.value()->isFinished() || it.value()->isStopping()) {
+        if (scriptEngine->isFinished() || scriptEngine->isStopping()) {
             continue;
         }
         // queue user scripts if restarting
-        if (restart && it.value()->isUserLoaded()) {
+        if (restart && scriptEngine->isUserLoaded()) {
-            connect(it.value(), &ScriptEngine::finished, this, [this](QString scriptName, ScriptEngine* engine) {
+            toReload << it.key().toString();
-                reloadScript(scriptName);
-            });
         }
         // stop all scripts
-        it.value()->stop(true);
         qCDebug(scriptengine) << "stopping script..." << it.key();
+        scriptEngine->stop();
     }
+    // wait for engines to stop (ie: providing time for .scriptEnding cleanup handlers to run) before
+    // triggering reload of any Client scripts / Entity scripts
+    QTimer::singleShot(500, this, [=]() {
+        for(const auto &scriptName : toReload) {
+            auto scriptEngine = getScriptEngine(scriptName);
+            if (scriptEngine && !scriptEngine->isFinished()) {
+                qCDebug(scriptengine) << "waiting on script:" << scriptName;
+                scriptEngine->waitTillDoneRunning();
+                qCDebug(scriptengine) << "done waiting on script:" << scriptName;
+            }
+            qCDebug(scriptengine) << "reloading script..." << scriptName;
+            reloadScript(scriptName);
+        }
+        if (restart) {
+            qCDebug(scriptengine) << "stopAllScripts -- emitting scriptsReloading";
+            emit scriptsReloading();
+        }
+    });
 }
 bool ScriptEngines::stopScript(const QString& rawScriptURL, bool restart) {
 }
 void ScriptEngines::reloadAllScripts() {
+    qCDebug(scriptengine) << "reloadAllScripts -- clearing caches";
     DependencyManager::get<ScriptCache>()->clearCache();
     DependencyManager::get<OffscreenUi>()->clearCache();
-    emit scriptsReloading();
+    qCDebug(scriptengine) << "reloadAllScripts -- stopping all scripts";
     stopAllScripts(true);
 }
         return scriptEngine;
     }
-    scriptEngine = new ScriptEngine(_context, NO_SCRIPT, "");
+    scriptEngine = new ScriptEngine(_context, NO_SCRIPT, "about:" + scriptFilename.fileName());
     scriptEngine->setUserLoaded(isUserLoaded);
     connect(scriptEngine, &ScriptEngine::doneRunning, this, [scriptEngine] {
         scriptEngine->deleteLater();