Skip to content

ControllerEngine: do not use C++ assertions for JS issues #3650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Holzhaus merged 1 commit into from
Mar 3, 2021
Merged

ControllerEngine: do not use C++ assertions for JS issues #3650

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 4 additions & 24 deletions src/controllers/controllerengine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,6 @@ constexpr int kDecks = 16;
// timer.
constexpr int kScratchTimerMs = 1;
constexpr double kAlphaBetaDt = kScratchTimerMs / 1000.0;

inline ControlFlags onlyAssertOnControllerDebug() {
if (ControllerDebug::enabled()) {
return ControlFlag::None;
}

return ControlFlag::AllowMissingOrInvalid;
}
} // namespace

ControllerEngine::ControllerEngine(
Expand Down Expand Up @@ -99,16 +91,12 @@ void ControllerEngine::callFunctionOnObjects(const QList<QString>& scriptFunctio
QScriptValue prefix = global.property(prefixName);
if (!prefix.isValid() || !prefix.isObject()) {
qWarning() << "ControllerEngine: No" << prefixName << "object in script";
// Throw a debug assertion if controllerDebug is enabled
DEBUG_ASSERT(!ControllerDebug::enabled());
continue;
}

QScriptValue init = prefix.property(function);
if (!init.isValid() || !init.isFunction()) {
qWarning() << "ControllerEngine:" << prefixName << "has no" << function << " method";
// Throw a debug assertion if controllerDebug is enabled
DEBUG_ASSERT(!ControllerDebug::enabled());
continue;
}
controllerDebug("ControllerEngine: Executing" << prefixName << "." << function);
Expand Down Expand Up @@ -466,26 +454,20 @@ bool ControllerEngine::internalExecute(const QScriptValue& thisObject,
if (functionObject.isError()) {
qWarning() << "ControllerEngine::internalExecute:"
<< functionObject.toString();
// Throw a debug assertion if controllerDebug is enabled
DEBUG_ASSERT(!ControllerDebug::enabled());
return false;
}

// If it's not a function, we're done.
if (!functionObject.isFunction()) {
qWarning() << "ControllerEngine::internalExecute:"
<< functionObject.toVariant() << "Not a function";
// Throw a debug assertion if controllerDebug is enabled
DEBUG_ASSERT(!ControllerDebug::enabled());
return false;
}

// If it does happen to be a function, call it.
QScriptValue rc = functionObject.call(thisObject, args);
if (!rc.isValid()) {
qWarning() << "QScriptValue is not a function or ...";
// Throw a debug assertion if controllerDebug is enabled
DEBUG_ASSERT(!ControllerDebug::enabled());
return false;
}

Expand Down Expand Up @@ -665,8 +647,6 @@ ControlObjectScript* ControllerEngine::getControlObjectScript(const QString& gro

if (!key.isValid()) {
qWarning() << "ControllerEngine: Requested control with invalid key" << key;
// Throw a debug assertion if controllerDebug is enabled
DEBUG_ASSERT(!ControllerDebug::enabled());
return nullptr;
}

Expand Down Expand Up @@ -714,7 +694,7 @@ void ControllerEngine::setValue(const QString& group, const QString& name, doubl

if (coScript) {
ControlObject* pControl = ControlObject::getControl(
coScript->getKey(), onlyAssertOnControllerDebug());
coScript->getKey(), ControlFlag::AllowMissingOrInvalid);
if (pControl && !m_st.ignore(pControl, coScript->getParameterForValue(newValue))) {
coScript->slotSet(newValue);
}
Expand Down Expand Up @@ -752,7 +732,7 @@ void ControllerEngine::setParameter(

if (coScript) {
ControlObject* pControl = ControlObject::getControl(
coScript->getKey(), onlyAssertOnControllerDebug());
coScript->getKey(), ControlFlag::AllowMissingOrInvalid);
if (pControl && !m_st.ignore(pControl, newParameter)) {
coScript->setParameter(newParameter);
}
Expand Down Expand Up @@ -1483,7 +1463,7 @@ bool ControllerEngine::isScratching(int deck) {
-------- ------------------------------------------------------ */
void ControllerEngine::softTakeover(const QString& group, const QString& name, bool set) {
ConfigKey key = ConfigKey(group, name);
ControlObject* pControl = ControlObject::getControl(key, onlyAssertOnControllerDebug());
ControlObject* pControl = ControlObject::getControl(key, ControlFlag::AllowMissingOrInvalid);
if (!pControl) {
qWarning() << "Failed to" << (set ? "enable" : "disable")
<< "softTakeover for invalid control" << key;
Expand All @@ -1508,7 +1488,7 @@ void ControllerEngine::softTakeover(const QString& group, const QString& name, b
void ControllerEngine::softTakeoverIgnoreNextValue(
const QString& group, const QString& name) {
ConfigKey key = ConfigKey(group, name);
ControlObject* pControl = ControlObject::getControl(key, onlyAssertOnControllerDebug());
ControlObject* pControl = ControlObject::getControl(key, ControlFlag::AllowMissingOrInvalid);
if (!pControl) {
qWarning() << "Failed to call softTakeoverIgnoreNextValue for invalid control" << key;
return;
Expand Down