Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 03:38:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

log cleanup per CR; add more specific hints (instead of relying on __FUNCTION__)

Browse source
This commit is contained in:
humbletim 2017-03-13 16:33:42 -04:00
parent c559838dbb
commit 075574b428
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -564,7 +564,6 @@ void ScriptEngine::resetModuleCache(bool deleteScriptCache) {
if (it.flags() & QScriptValue::SkipInEnumeration) { if (it.flags() & QScriptValue::SkipInEnumeration) {
continue; continue;
} }
//scriptCache->deleteScript(it.name());
qCDebug(scriptengine) << "resetModuleCache(true) -- staging " << it.name() << " for cache reset at next require"; qCDebug(scriptengine) << "resetModuleCache(true) -- staging " << it.name() << " for cache reset at next require";
cacheMeta.setProperty(it.name(), true); cacheMeta.setProperty(it.name(), true);
} }
@ -594,8 +593,8 @@ void ScriptEngine::init() {
entityScriptingInterface->init(); entityScriptingInterface->init();
connect(entityScriptingInterface.data(), &EntityScriptingInterface::deletingEntity, this, [this](const EntityItemID& entityID) { connect(entityScriptingInterface.data(), &EntityScriptingInterface::deletingEntity, this, [this](const EntityItemID& entityID) {
if (_entityScripts.contains(entityID)) { if (_entityScripts.contains(entityID)) {
if (isEntityScriptRunning(entityID)) { if (isEntityScriptRunning(entityID) && !isStopping()) {
qCWarning(scriptengine) << "deletingEntity while entity script is still running!" << entityID; qCWarning(scriptengine) << "deletingEntity while entity script is still running" << entityID;
} }
_entityScripts.remove(entityID); _entityScripts.remove(entityID);
emit entityScriptDetailsUpdated(); emit entityScriptDetailsUpdated();
@ -954,7 +953,7 @@ QScriptValue ScriptEngine::evaluate(const QString& sourceCode, const QString& fi
syntaxError.setProperty("detail", "evaluate"); syntaxError.setProperty("detail", "evaluate");
} }
raiseException(syntaxError); raiseException(syntaxError);
maybeEmitUncaughtException(__FUNCTION__); maybeEmitUncaughtException("lint");
return syntaxError; return syntaxError;
} }
QScriptProgram program { sourceCode, fileName, lineNumber }; QScriptProgram program { sourceCode, fileName, lineNumber };
@ -962,14 +961,14 @@ QScriptValue ScriptEngine::evaluate(const QString& sourceCode, const QString& fi
// can this happen? // can this happen?
auto err = makeError("could not create QScriptProgram for " + fileName); auto err = makeError("could not create QScriptProgram for " + fileName);
raiseException(err); raiseException(err);
maybeEmitUncaughtException(__FUNCTION__); maybeEmitUncaughtException("compile");
return err; return err;
} }
QScriptValue result; QScriptValue result;
{ {
result = BaseScriptEngine::evaluate(program); result = BaseScriptEngine::evaluate(program);
maybeEmitUncaughtException(__FUNCTION__); maybeEmitUncaughtException("evaluate");
} }
return result; return result;
} }
@ -1644,11 +1643,11 @@ QScriptValue ScriptEngine::require(const QString& moduleId) {
auto exports = module.property("exports"); auto exports = module.property("exports");
if (!invalidateCache && exports.isObject()) { if (!invalidateCache && exports.isObject()) {
// we have found a cacheed module -- just need to possibly register it with current parent // we have found a cached module -- just need to possibly register it with current parent
qCDebug(scriptengine_module) << QString("require - using cached module '%1' for '%2' (loaded: %3)") qCDebug(scriptengine_module) << QString("require - using cached module '%1' for '%2' (loaded: %3)")
.arg(modulePath).arg(moduleId).arg(module.property("loaded").toString()); .arg(modulePath).arg(moduleId).arg(module.property("loaded").toString());
registerModuleWithParent(module, parent); registerModuleWithParent(module, parent);
maybeEmitUncaughtException(__FUNCTION__); maybeEmitUncaughtException("cached module");
return exports; return exports;
} }
@ -2380,9 +2379,12 @@ void ScriptEngine::unloadEntityScript(const EntityItemID& entityID) {
const EntityScriptDetails &oldDetails = _entityScripts[entityID]; const EntityScriptDetails &oldDetails = _entityScripts[entityID];
if (isEntityScriptRunning(entityID)) { if (isEntityScriptRunning(entityID)) {
callEntityScriptMethod(entityID, "unload"); callEntityScriptMethod(entityID, "unload");
} else { }
#ifdef DEBUG_ENTITY_STATES
else {
qCDebug(scriptengine) << "unload called while !running" << entityID << oldDetails.status; qCDebug(scriptengine) << "unload called while !running" << entityID << oldDetails.status;
} }
#endif
if (oldDetails.status != EntityScriptStatus::UNLOADED) { if (oldDetails.status != EntityScriptStatus::UNLOADED) {
EntityScriptDetails newDetails; EntityScriptDetails newDetails;
newDetails.status = EntityScriptStatus::UNLOADED; newDetails.status = EntityScriptStatus::UNLOADED;