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

debugging

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-12-30 12:02:48 -08:00
parent 74384a69ae
commit 82ab8635d7
3 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -526,6 +526,8 @@ void EntityScriptingInterface::setEntitiesScriptEngine(EntitiesScriptEngineProvi
} }
void EntityScriptingInterface::callEntityMethod(QUuid id, const QString& method, const QStringList& params) { void EntityScriptingInterface::callEntityMethod(QUuid id, const QString& method, const QStringList& params) {
qDebug() << __FUNCTION__ << "method:" << method << "now:" << usecTimestampNow();
std::lock_guard<std::recursive_mutex> lock(_entitiesScriptEngineLock); std::lock_guard<std::recursive_mutex> lock(_entitiesScriptEngineLock);
if (_entitiesScriptEngine) { if (_entitiesScriptEngine) {
EntityItemID entityID{ id }; EntityItemID entityID{ id };

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

@ -928,22 +928,23 @@ void ScriptEngine::run() {
auto remainingSleepUntil = std::chrono::duration_cast<std::chrono::microseconds>(sleepUntil - clock::now()); auto remainingSleepUntil = std::chrono::duration_cast<std::chrono::microseconds>(sleepUntil - clock::now());
auto closestUntil = std::min(remainingSleepUntil, untilTimer); auto closestUntil = std::min(remainingSleepUntil, untilTimer);
auto thisSleepUntil = std::min(sleepUntil, clock::now() + closestUntil); auto thisSleepUntil = std::min(sleepUntil, clock::now() + closestUntil);
auto untilThisSleepUntil = std::chrono::duration_cast<std::chrono::microseconds>(thisSleepUntil - clock::now());
// if the sleep until is more than 1 ms away, then don't sleep, and instead use a wait condition // if the sleep until is more than 1 ms away, then don't sleep, and instead use a wait condition
// for any possible invoke methods that might also be pending. // for any possible invoke methods that might also be pending.
const std::chrono::microseconds MAX_USECS_TO_SLEEP(USECS_PER_MSEC); const std::chrono::microseconds MAX_USECS_TO_SLEEP(USECS_PER_MSEC);
if (closestUntil < MAX_USECS_TO_SLEEP) { if (untilThisSleepUntil < MAX_USECS_TO_SLEEP) {
qDebug() << "about to sleep:" << closestUntil.count() << "usec"; qDebug() << "[" << getFilename() << "]" << "about to sleep untilThisSleepUntil:" << untilThisSleepUntil.count() << "usec -- averageTimerPerFrame:" << averageTimerPerFrame.count();
std::this_thread::sleep_until(thisSleepUntil); std::this_thread::sleep_until(thisSleepUntil);
} else { } else {
// FIXME - we might want to make this 1 less ms to wait // FIXME - we might want to make this 1 less ms to wait
unsigned long maxWait = closestUntil.count() / USECS_PER_MSEC; unsigned long maxWait = untilThisSleepUntil.count() / USECS_PER_MSEC;
qDebug() << "about to wait:" << maxWait << "ms --- closestUntil:" << closestUntil.count() << "usec"; qDebug() << "[" << getFilename() << "]" << "about to wait:" << maxWait << "ms --- untilThisSleepUntil:" << untilThisSleepUntil.count() << "usec -- averageTimerPerFrame:" << averageTimerPerFrame.count();
_waitingOnInvokeMethod.lock(); _waitingOnInvokeMethod.lock();
bool signalled = _hasInvokeMethod.wait(&_waitingOnInvokeMethod, maxWait); bool signalled = _hasInvokeMethod.wait(&_waitingOnInvokeMethod, maxWait);
_waitingOnInvokeMethod.unlock(); _waitingOnInvokeMethod.unlock();
if (signalled) { if (signalled) {
qDebug() << "SIGNALLED!! done waiting... now:" << usecTimestampNow(); qDebug() << "[" << getFilename() << "]" << "SIGNALLED!! done waiting... now:" << usecTimestampNow();
} }
} }
@ -1664,13 +1665,15 @@ void ScriptEngine::callWithEnvironment(const EntityItemID& entityID, const QUrl&
} }
void ScriptEngine::callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const QStringList& params) { void ScriptEngine::callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const QStringList& params) {
qDebug() << "[" << getFilename() << "]" << __FUNCTION__ << "method:" << methodName << "now:" << usecTimestampNow();
if (QThread::currentThread() != thread()) { if (QThread::currentThread() != thread()) {
#ifdef THREAD_DEBUGGING #ifdef THREAD_DEBUGGING
qCDebug(scriptengine) << "*** WARNING *** ScriptEngine::callEntityScriptMethod() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] " qCDebug(scriptengine) << "*** WARNING *** ScriptEngine::callEntityScriptMethod() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] "
"entityID:" << entityID << "methodName:" << methodName; "entityID:" << entityID << "methodName:" << methodName;
#endif #endif
qDebug() << "about to invokeMethod callEntityScriptMethod() now:" << usecTimestampNow(); qDebug() << "[" << getFilename() << "]" << "about to invokeMethod callEntityScriptMethod() now:" << usecTimestampNow();
QMetaObject::invokeMethod(this, "callEntityScriptMethod", QMetaObject::invokeMethod(this, "callEntityScriptMethod",
Q_ARG(const EntityItemID&, entityID), Q_ARG(const EntityItemID&, entityID),
@ -1692,6 +1695,8 @@ void ScriptEngine::callEntityScriptMethod(const EntityItemID& entityID, const QS
QScriptValueList args; QScriptValueList args;
args << entityID.toScriptValue(this); args << entityID.toScriptValue(this);
args << qScriptValueFromSequence(this, params); args << qScriptValueFromSequence(this, params);
qDebug() << "[" << getFilename() << "]" << __FUNCTION__ << "about to callWithEnvironment()... method:" << methodName << "now:" << usecTimestampNow();
callWithEnvironment(entityID, details.definingSandboxURL, entityScript.property(methodName), entityScript, args); callWithEnvironment(entityID, details.definingSandboxURL, entityScript.property(methodName), entityScript, args);
} }

13
scripts/system/controllers/handControllerGrab.js
View file

@ -816,6 +816,7 @@ function MyController(hand) {
}; };
this.update = function(deltaTime, timestamp) { this.update = function(deltaTime, timestamp) {
print("this.update() deltaTime:" + deltaTime + " timestamp:" + timestamp + " now:" + Date.now());
this.updateSmoothedTrigger(); this.updateSmoothedTrigger();
@ -844,6 +845,7 @@ function MyController(hand) {
this.callEntityMethodOnGrabbed = function(entityMethodName) { this.callEntityMethodOnGrabbed = function(entityMethodName) {
var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID]; var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
print("this.callEntityMethodOnGrabbed() entityMethodName:" + entityMethodName + " now:" + Date.now());
Entities.callEntityMethod(this.grabbedEntity, entityMethodName, args); Entities.callEntityMethod(this.grabbedEntity, entityMethodName, args);
}; };
@ -2141,7 +2143,7 @@ function MyController(hand) {
}; };
this.nearGrabbing = function(deltaTime, timestamp) { this.nearGrabbing = function(deltaTime, timestamp) {
print("nearGrabbing() deltaTime:" + deltaTime); print("nearGrabbing() deltaTime:" + deltaTime + " now:" + Date.now());
this.grabPointSphereOff(); this.grabPointSphereOff();
@ -3068,8 +3070,15 @@ var handleHandMessages = function(channel, message, sender) {
Messages.messageReceived.connect(handleHandMessages); Messages.messageReceived.connect(handleHandMessages);
var BASIC_TIMER_INTERVAL_MS = 20; // 20ms = 50hz good enough var BASIC_TIMER_INTERVAL_MS = 20; // 20ms = 50hz good enough
var lastInterval = Date.now();
var updateIntervalTimer = Script.setInterval(function(){ var updateIntervalTimer = Script.setInterval(function(){
update(BASIC_TIMER_INTERVAL_MS / 1000); var thisInterval = Date.now();
var deltaTimeMsec = thisInterval - lastInterval;
var deltaTime = deltaTimeMsec / 1000;
lastInterval = thisInterval;
print("setInterval function() deltaTimeMsec:" + deltaTimeMsec + " deltaTime:" + deltaTime + "(sec) now:" + Date.now());
update(deltaTime);
}, BASIC_TIMER_INTERVAL_MS); }, BASIC_TIMER_INTERVAL_MS);
function cleanup() { function cleanup() {