History

Add V8 logging category

Rename logging category to overte Make all V8 code use logging categories

Dale Glass committed 3 years ago

Commit 0fc2ab81 parent 633319c10 files · +211 −161Browse files

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

Unified · Split

libraries/script-engine/src/v8/ScriptEngineV8.cpp+52−51
@@ -51,6 +51,7 @@ · 50 unmodified lines
5151 #include "ScriptProgramV8Wrapper.h"
5252 #include "ScriptValueV8Wrapper.h"
5353 #include "V8Lambda.h"
54+#include "ScriptEngineLoggingV8.h"
5455
5556 static const int MAX_DEBUG_VALUE_LENGTH { 80 };
5657
@@ -62,11 +63,11 @@ bool ScriptEngineV8::IS_THREADSAFE_INVOCATION(const QThread* thread, const QStri · 5 unmodified lines
6263 if (currentThread == thread) {
6364 return true;
6465 }
65− qCCritical(scriptengine) << QString("Scripting::%1 @ %2 -- ignoring thread-unsafe call from %3")
66+ qCCritical(scriptengine_v8) << QString("Scripting::%1 @ %2 -- ignoring thread-unsafe call from %3")
6667 .arg(method)
6768 .arg(thread ? thread->objectName() : "(!thread)")
6869 .arg(QThread::currentThread()->objectName());
69− qCDebug(scriptengine) << "(please resolve on the calling side by using invokeMethod, executeOnScriptThread, etc.)";
70+ qCDebug(scriptengine_v8) << "(please resolve on the calling side by using invokeMethod, executeOnScriptThread, etc.)";
7071 Q_ASSERT(false);
7172 return false;
7273 }
@@ -206,7 +207,7 @@ QString Lambda::toString() const { · 133 unmodified lines
206207
207208 Lambda::~Lambda() {
208209 #ifdef DEBUG_JS_LAMBDA_FUNCS
209− qDebug() << "~Lambda"
210+ qCDebug(scriptengine_v8) << "~Lambda"
210211 << "this" << this;
211212 #endif
212213 }
@@ -217,7 +218,7 @@ Lambda::Lambda(ScriptEngineV8* engine, · 4 unmodified lines
217218 _engine(engine),
218219 _operation(operation), _data(data) {
219220 #ifdef DEBUG_JS_LAMBDA_FUNCS
220− qDebug() << "Lambda" << data.toString();
221+ qCDebug(scriptengine_v8) << "Lambda" << data.toString();
221222 #endif
222223 }
223224 V8ScriptValue Lambda::call() {
@@ -285,10 +286,10 @@ ScriptEngineV8::ScriptEngineV8(ScriptManager *manager) : ScriptEngine(manager), · 61 unmodified lines
285286 //v8::V8::SetFlagsFromString("--stack-size=256 --single-threaded");
286287 v8::Platform* platform = getV8Platform();
287288 v8::V8::InitializePlatform(platform);
288− v8::V8::Initialize(); qCDebug(scriptengine) << "V8 platform initialized";
289+ v8::V8::Initialize(); qCDebug(scriptengine_v8) << "V8 platform initialized";
289290 } );
290291 _v8InitMutex.unlock();
291− qDebug() << "Creating new script engine";
292+ qCDebug(scriptengine_v8) << "Creating new script engine";
292293 {
293294 v8::Isolate::CreateParams isolateParams;
294295 isolateParams.array_buffer_allocator = v8::ArrayBuffer::Allocator::NewDefaultAllocator();
@@ -342,7 +343,7 @@ ScriptEngineV8::ScriptEngineV8(ScriptManager *manager) : ScriptEngine(manager), · 47 unmodified lines
342343
343344 void ScriptEngineV8::registerEnum(const QString& enumName, QMetaEnum newEnum) {
344345 if (!newEnum.isValid()) {
345− qCCritical(scriptengine) << "registerEnum called on invalid enum with name " << enumName;
346+ qCCritical(scriptengine_v8) << "registerEnum called on invalid enum with name " << enumName;
346347 return;
347348 }
348349 v8::Locker locker(_v8Isolate);
@@ -360,7 +361,7 @@ void ScriptEngineV8::registerEnum(const QString& enumName, QMetaEnum newEnum) { · 11 unmodified lines
360361 void ScriptEngineV8::registerValue(const QString& valueName, V8ScriptValue value) {
361362 if (QThread::currentThread() != thread()) {
362363 #ifdef THREAD_DEBUGGING
363− qCDebug(scriptengine) << "*** WARNING *** ScriptEngineV8::registerValue() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "]";
364+ qCDebug(scriptengine_v8) << "*** WARNING *** ScriptEngineV8::registerValue() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "]";
364365 #endif
365366 QMetaObject::invokeMethod(this, "registerValue",
366367 Q_ARG(const QString&, valueName),
@@ -412,7 +413,7 @@ void ScriptEngineV8::registerValue(const QString& valueName, V8ScriptValue value · 45 unmodified lines
412413 if (partsToGo > 0) {
413414 if (!child->IsObject()) {
414415 QString details = *v8::String::Utf8Value(_v8Isolate, child->ToDetailString(context).ToLocalChecked());
415− qCDebug(scriptengine) << "ScriptEngineV8::registerValue: Part of path is not an object: " << pathPart << " details: " << details;
416+ qCDebug(scriptengine_v8) << "ScriptEngineV8::registerValue: Part of path is not an object: " << pathPart << " details: " << details;
416417 Q_ASSERT(false);
417418 }
418419 partObject = v8::Local<v8::Object>::Cast(child);
@@ -423,7 +424,7 @@ void ScriptEngineV8::registerValue(const QString& valueName, V8ScriptValue value · 4 unmodified lines
423424 void ScriptEngineV8::registerGlobalObject(const QString& name, QObject* object) {
424425 if (QThread::currentThread() != thread()) {
425426 #ifdef THREAD_DEBUGGING
426− qCDebug(scriptengine) << "*** WARNING *** ScriptEngineV8::registerGlobalObject() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] name:" << name;
427+ qCDebug(scriptengine_v8) << "*** WARNING *** ScriptEngineV8::registerGlobalObject() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] name:" << name;
427428 #endif
428429 QMetaObject::invokeMethod(this, "registerGlobalObject",
429430 Q_ARG(const QString&, name),
@@ -431,7 +432,7 @@ void ScriptEngineV8::registerGlobalObject(const QString& name, QObject* object) · 1 unmodified line
431432 return;
432433 }
433434 #ifdef THREAD_DEBUGGING
434− qCDebug(scriptengine) << "ScriptEngineV8::registerGlobalObject() called on thread [" << QThread::currentThread() << "] name:" << name;
435+ qCDebug(scriptengine_v8) << "ScriptEngineV8::registerGlobalObject() called on thread [" << QThread::currentThread() << "] name:" << name;
435436 #endif
436437 /*bool is_isolate_exit_needed = false;
437438 if(!_v8Isolate->IsCurrent() && !_v8Locker) {
@@ -475,7 +476,7 @@ void ScriptEngineV8::registerFunction(const QString& name, ScriptEngine::Functio · 37 unmodified lines
475476 //}
476477 if (QThread::currentThread() != thread()) {
477478 #ifdef THREAD_DEBUGGING
478− qCDebug(scriptengine) << "*** WARNING *** ScriptEngineV8::registerFunction() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] name:" << name;
479+ qCDebug(scriptengine_v8) << "*** WARNING *** ScriptEngineV8::registerFunction() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] name:" << name;
479480 #endif
480481 QMetaObject::invokeMethod(this, "registerFunction",
481482 Q_ARG(const QString&, name),
@@ -484,7 +485,7 @@ void ScriptEngineV8::registerFunction(const QString& name, ScriptEngine::Functio · 2 unmodified lines
484485 return;
485486 }
486487 #ifdef THREAD_DEBUGGING
487− qCDebug(scriptengine) << "ScriptEngineV8::registerFunction() called on thread [" << QThread::currentThread() << "] name:" << name;
488+ qCDebug(scriptengine_v8) << "ScriptEngineV8::registerFunction() called on thread [" << QThread::currentThread() << "] name:" << name;
488489 #endif
489490
490491 /*bool is_isolate_exit_needed = false;
@@ -514,7 +515,7 @@ void ScriptEngineV8::registerFunction(const QString& name, ScriptEngine::Functio · 23 unmodified lines
514515 void ScriptEngineV8::registerFunction(const QString& parent, const QString& name, ScriptEngine::FunctionSignature functionSignature, int numArguments) {
515516 if (QThread::currentThread() != thread()) {
516517 #ifdef THREAD_DEBUGGING
517− qCDebug(scriptengine) << "*** WARNING *** ScriptEngineV8::registerFunction() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] parent:" << parent << "name:" << name;
518+ qCDebug(scriptengine_v8) << "*** WARNING *** ScriptEngineV8::registerFunction() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] parent:" << parent << "name:" << name;
518519 #endif
519520 QMetaObject::invokeMethod(this, "registerFunction",
520521 Q_ARG(const QString&, name),
@@ -523,7 +524,7 @@ void ScriptEngineV8::registerFunction(const QString& parent, const QString& name · 2 unmodified lines
523524 return;
524525 }
525526 #ifdef THREAD_DEBUGGING
526− qCDebug(scriptengine) << "ScriptEngineV8::registerFunction() called on thread [" << QThread::currentThread() << "] parent:" << parent << "name:" << name;
527+ qCDebug(scriptengine_v8) << "ScriptEngineV8::registerFunction() called on thread [" << QThread::currentThread() << "] parent:" << parent << "name:" << name;
527528 #endif
528529
529530 /*bool is_isolate_exit_needed = false;
@@ -554,7 +555,7 @@ void ScriptEngineV8::registerGetterSetter(const QString& name, ScriptEngine::Fun · 24 unmodified lines
554555 ScriptEngine::FunctionSignature setter, const QString& parent) {
555556 if (QThread::currentThread() != thread()) {
556557 #ifdef THREAD_DEBUGGING
557− qCDebug(scriptengine) << "*** WARNING *** ScriptEngineV8::registerGetterSetter() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] "
558+ qCDebug(scriptengine_v8) << "*** WARNING *** ScriptEngineV8::registerGetterSetter() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] "
558559 " name:" << name << "parent:" << parent;
559560 #endif
560561 QMetaObject::invokeMethod(this, "registerGetterSetter",
@@ -565,7 +566,7 @@ void ScriptEngineV8::registerGetterSetter(const QString& name, ScriptEngine::Fun · 4 unmodified lines
565566 return;
566567 }
567568 #ifdef THREAD_DEBUGGING
568− qCDebug(scriptengine) << "ScriptEngineV8::registerGetterSetter() called on thread [" << QThread::currentThread() << "] name:" << name << "parent:" << parent;
569+ qCDebug(scriptengine_v8) << "ScriptEngineV8::registerGetterSetter() called on thread [" << QThread::currentThread() << "] name:" << name << "parent:" << parent;
569570 #endif
570571
571572 /*bool is_isolate_exit_needed = false;
@@ -639,20 +640,20 @@ void ScriptEngineV8::registerGetterSetter(const QString& name, ScriptEngine::Fun · 67 unmodified lines
639640 v8ObjectToSetProperty = v8ParentObject;
640641 }
641642 if (!v8ObjectToSetProperty->DefineProperty(getContext(), v8propertyName, propertyDescriptor).FromMaybe(false)) {
642− qCDebug(scriptengine) << "DefineProperty failed for registerGetterSetter \"" << name << "\" for parent: \""
643+ qCDebug(scriptengine_v8) << "DefineProperty failed for registerGetterSetter \"" << name << "\" for parent: \""
643644 << parent << "\"";
644645 }
645646 //object.setProperty(name, setterFunction, ScriptValue::PropertySetter);
646647 //object.setProperty(name, getterFunction, ScriptValue::PropertyGetter);
647648 } else {
648− qCDebug(scriptengine) << "Parent object \"" << parent << "\" for registerGetterSetter \"" << name
649+ qCDebug(scriptengine_v8) << "Parent object \"" << parent << "\" for registerGetterSetter \"" << name
649650 << "\" is not valid: ";
650651 }
651652 } else {
652653 v8::Local<v8::String> v8propertyName =
653654 v8::String::NewFromUtf8(_v8Isolate, name.toStdString().c_str()).ToLocalChecked();
654655 if (!getContext()->Global()->DefineProperty(getContext(), v8propertyName, propertyDescriptor).FromMaybe(false)) {
655− qCDebug(scriptengine) << "DefineProperty failed for registerGetterSetter \"" << name << "\" for global object";
656+ qCDebug(scriptengine_v8) << "DefineProperty failed for registerGetterSetter \"" << name << "\" for global object";
656657 }
657658 //globalObject().setProperty(name, setterFunction, ScriptValue::PropertySetter);
658659 //globalObject().setProperty(name, getterFunction, ScriptValue::PropertyGetter);
@@ -697,7 +698,7 @@ void ScriptEngineV8::storeGlobalObjectContents() { · 38 unmodified lines
697698 }
698699
699700 _globalObjectContents.Reset(_v8Isolate, globalMemberObjects);
700− qDebug() << "ScriptEngineV8::storeGlobalObjectContents: " << globalMemberNames->Length() << " objects stored";
701+ qCDebug(scriptengine_v8) << "ScriptEngineV8::storeGlobalObjectContents: " << globalMemberNames->Length() << " objects stored";
701702 areGlobalObjectContentsStored = true;
702703 }
703704
@@ -725,7 +726,7 @@ ScriptValue ScriptEngineV8::evaluateInClosure(const ScriptValue& _closure, · 21 unmodified lines
725726 unwrappedProgram = ScriptProgramV8Wrapper::unwrap(_program);
726727 if (unwrappedProgram == nullptr) {
727728 _evaluatingCounter--;
728− qDebug(scriptengine) << "Cannot unwrap program for closure";
729+ qCDebug(scriptengine_v8) << "Cannot unwrap program for closure";
729730 Q_ASSERT(false);
730731 return nullValue();
731732 }
@@ -737,7 +738,7 @@ ScriptValue ScriptEngineV8::evaluateInClosure(const ScriptValue& _closure, · 5 unmodified lines
737738 unwrappedClosure = ScriptValueV8Wrapper::unwrap(_closure);
738739 if (unwrappedClosure == nullptr) {
739740 _evaluatingCounter--;
740− qDebug(scriptengine) << "Cannot unwrap closure";
741+ qCDebug(scriptengine_v8) << "Cannot unwrap closure";
741742 Q_ASSERT(false);
742743 return nullValue();
743744 }
@@ -746,27 +747,27 @@ ScriptValue ScriptEngineV8::evaluateInClosure(const ScriptValue& _closure, · 2 unmodified lines
746747 //const V8ScriptProgram& program = unwrappedProgram->toV8Value();
747748 if (!closure.constGet()->IsObject()) {
748749 _evaluatingCounter--;
749− qDebug(scriptengine) << "Unwrapped closure is not an object";
750+ qCDebug(scriptengine_v8) << "Unwrapped closure is not an object";
750751 Q_ASSERT(false);
751752 return nullValue();
752753 }
753754 Q_ASSERT(closure.constGet()->IsObject());
754755 closureObject = v8::Local<v8::Object>::Cast(closure.constGet());
755− qDebug() << "Closure object members:" << scriptValueDebugListMembersV8(closure);
756+ qCDebug(scriptengine_v8) << "Closure object members:" << scriptValueDebugListMembersV8(closure);
756757 v8::Local<v8::Object> testObject = v8::Object::New(_v8Isolate);
757758 if(!testObject->Set(getContext(), v8::String::NewFromUtf8(_v8Isolate, "test_value").ToLocalChecked(), closureObject).FromMaybe(false)) {
758759 Q_ASSERT(false);
759760 }
760− qDebug() << "Test object members:" << scriptValueDebugListMembersV8(V8ScriptValue(this, testObject));
761+ qCDebug(scriptengine_v8) << "Test object members:" << scriptValueDebugListMembersV8(V8ScriptValue(this, testObject));
761762
762763 if (!closureObject->Get(closure.constGetContext(), v8::String::NewFromUtf8(_v8Isolate, "global").ToLocalChecked())
763764 .ToLocal(&closureGlobal)) {
764765 _evaluatingCounter--;
765− qDebug(scriptengine) << "Cannot get global from unwrapped closure";
766+ qCDebug(scriptengine_v8) << "Cannot get global from unwrapped closure";
766767 Q_ASSERT(false);
767768 return nullValue();
768769 }
769− //qDebug() << "Closure global details:" << scriptValueDebugDetailsV8(V8ScriptValue(_v8Isolate, closureGlobal));
770+ //qCDebug(scriptengine_v8) << "Closure global details:" << scriptValueDebugDetailsV8(V8ScriptValue(_v8Isolate, closureGlobal));
770771 }
771772 //oldGlobal = _v8Context.Get(_v8Isolate)->Global();
772773 v8::Local<v8::Context> closureContext;
@@ -794,7 +795,7 @@ ScriptValue ScriptEngineV8::evaluateInClosure(const ScriptValue& _closure, · 21 unmodified lines
794795 v8::Context::Scope contextScope(closureContext);
795796 //const V8ScriptValue& closure = unwrappedClosure->toV8Value();
796797 if (!unwrappedProgram->compile()) {
797− qDebug(scriptengine) << "Can't compile script for evaluating in closure";
798+ qCDebug(scriptengine_v8) << "Can't compile script for evaluating in closure";
798799 Q_ASSERT(false);
799800 popContext();
800801 return nullValue();
@@ -806,12 +807,12 @@ ScriptValue ScriptEngineV8::evaluateInClosure(const ScriptValue& _closure, · 5 unmodified lines
806807 /*if (!closureObject->Get(closure.constGetContext(), v8::String::NewFromUtf8(_v8Isolate, "this").ToLocalChecked())
807808 .ToLocal(&thiz)) {
808809 _evaluatingCounter--;
809− qDebug(scriptengine) << "Empty this object in closure";
810+ qCDebug(scriptengine_v8) << "Empty this object in closure";
810811 Q_ASSERT(false);
811812 return nullValue();
812813 }*/
813814 //thiz = closure.property("this");
814− //qDebug() << "Closure this details:" << scriptValueDebugDetailsV8(V8ScriptValue(_v8Isolate, thiz));
815+ //qCDebug(scriptengine_v8) << "Closure this details:" << scriptValueDebugDetailsV8(V8ScriptValue(_v8Isolate, thiz));
815816 // V8TODO:
816817 /*if (thiz->IsObject()) {
817818 #ifdef DEBUG_JS
@@ -837,7 +838,7 @@ ScriptValue ScriptEngineV8::evaluateInClosure(const ScriptValue& _closure, · 19 unmodified lines
837838 Q_ASSERT(false);
838839 }
839840 }
840− qDebug() << "ScriptEngineV8::evaluateInClosure: " << globalMemberNames->Length() << " objects added to global";
841+ qCDebug(scriptengine_v8) << "ScriptEngineV8::evaluateInClosure: " << globalMemberNames->Length() << " objects added to global";
841842
842843 /*auto oldGlobalMemberNames = oldContext->Global()->GetPropertyNames(oldContext).ToLocalChecked();
843844 //auto oldGlobalMemberNames = oldContext->Global()->GetPropertyNames(closureContext).ToLocalChecked();
@@ -874,15 +875,15 @@ ScriptValue ScriptEngineV8::evaluateInClosure(const ScriptValue& _closure, · 30 unmodified lines
874875 } else {
875876 membersString = QString(" Is not an object");
876877 }*/
877− //qDebug(scriptengine) << "Closure global before run:" << membersString;
878+ //qCDebug(scriptengine_v8) << "Closure global before run:" << membersString;
878879 auto maybeResult = program.constGet()->GetUnboundScript()->BindToCurrentContext()->Run(closureContext);
879− //qDebug(scriptengine) << "Closure after run:" << scriptValueDebugDetailsV8(closure);
880+ //qCDebug(scriptengine_v8) << "Closure after run:" << scriptValueDebugDetailsV8(closure);
880881 v8::Local<v8::Value> v8Result;
881882 if (!maybeResult.ToLocal(&v8Result)) {
882883 v8::String::Utf8Value utf8Value(getIsolate(), tryCatch.Exception());
883884 QString errorMessage = QString(*utf8Value);
884− qWarning(scriptengine) << __FUNCTION__ << "---------- hasCaught:" << errorMessage;
885− qWarning(scriptengine) << __FUNCTION__ << "---------- tryCatch details:" << formatErrorMessageFromTryCatch(tryCatch);
885+ qCWarning(scriptengine_v8) << __FUNCTION__ << "---------- hasCaught:" << errorMessage;
886+ qCWarning(scriptengine_v8) << __FUNCTION__ << "---------- tryCatch details:" << formatErrorMessageFromTryCatch(tryCatch);
886887 //V8TODO: better error reporting
887888 }
888889
@@ -919,7 +920,7 @@ ScriptValue ScriptEngineV8::evaluate(const QString& sourceCode, const QString& f · 30 unmodified lines
919920 if (QThread::currentThread() != thread()) {
920921 ScriptValue result;
921922 #ifdef THREAD_DEBUGGING
922− qCDebug(scriptengine) << "*** WARNING *** ScriptEngineV8::evaluate() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] "
923+ qCDebug(scriptengine_v8) << "*** WARNING *** ScriptEngineV8::evaluate() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] "
923924 "sourceCode:" << sourceCode << " fileName:" << fileName;
924925 #endif
925926 BLOCKING_INVOKE_METHOD(this, "evaluate",
@@ -944,7 +945,7 @@ ScriptValue ScriptEngineV8::evaluate(const QString& sourceCode, const QString& f · 18 unmodified lines
944945 _evaluatingCounter--;
945946 return nullValue();
946947 }
947− //qCDebug(scriptengine) << "Script compilation succesful: " << fileName;
948+ //qCDebug(scriptengine_v8) << "Script compilation succesful: " << fileName;
948949
949950 //V8TODO
950951 /*auto syntaxError = lintScript(sourceCode, fileName);
@@ -971,7 +972,7 @@ ScriptValue ScriptEngineV8::evaluate(const QString& sourceCode, const QString& f · 20 unmodified lines
971972 Q_ASSERT(tryCatchRun.HasCaught());
972973 auto runError = tryCatchRun.Message();
973974 ScriptValue errorValue(new ScriptValueV8Wrapper(this, V8ScriptValue(this, runError->Get())));
974− qCDebug(scriptengine) << "Running script: \"" << fileName << "\" " << formatErrorMessageFromTryCatch(tryCatchRun);
975+ qCDebug(scriptengine_v8) << "Running script: \"" << fileName << "\" " << formatErrorMessageFromTryCatch(tryCatchRun);
975976 //V8TODO
976977
977978
@@ -995,7 +996,7 @@ void ScriptEngineV8::setUncaughtEngineException(const QString &reason, const QSt · 17 unmodified lines
995996
996997 void ScriptEngineV8::setUncaughtException(const v8::TryCatch &tryCatch, const QString& info) {
997998 if (!tryCatch.HasCaught()) {
998− qCWarning(scriptengine) << "setUncaughtException called without exception";
999+ qCWarning(scriptengine_v8) << "setUncaughtException called without exception";
9991000 clearExceptions();
10001001 return;
10011002 }
@@ -1041,7 +1042,7 @@ void ScriptEngineV8::setUncaughtException(const v8::TryCatch &tryCatch, const QS · 39 unmodified lines
10411042 }
10421043
10431044 void ScriptEngineV8::setUncaughtException(std::shared_ptr<ScriptException> uncaughtException) {
1044− qCDebug(scriptengine) << "Emitting exception:" << uncaughtException;
1045+ qCDebug(scriptengine_v8) << "Emitting exception:" << uncaughtException;
10451046 _uncaughtException = uncaughtException;
10461047
10471048 auto copy = uncaughtException->clone();
@@ -1105,7 +1106,7 @@ Q_INVOKABLE ScriptValue ScriptEngineV8::evaluate(const ScriptProgramPointer& pro · 57 unmodified lines
11051106 if (QThread::currentThread() != thread()) {
11061107 ScriptValue result;
11071108 #ifdef THREAD_DEBUGGING
1108− qCDebug(scriptengine) << "*** WARNING *** ScriptEngineV8::evaluate() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] "
1109+ qCDebug(scriptengine_v8) << "*** WARNING *** ScriptEngineV8::evaluate() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] "
11091110 "sourceCode:" << sourceCode << " fileName:" << fileName;
11101111 #endif
11111112 BLOCKING_INVOKE_METHOD(this, "evaluate",
@@ -1498,14 +1499,14 @@ QThread* ScriptEngineV8::thread() const { · 386 unmodified lines
14981499 void ScriptEngineV8::setThread(QThread* thread) {
14991500 if (_v8Isolate->IsCurrent()) {
15001501 _v8Isolate->Exit();
1501− qDebug() << "Script engine " << objectName() << " exited isolate";
1502+ qCDebug(scriptengine_v8) << "Script engine " << objectName() << " exited isolate";
15021503 }
15031504 Q_ASSERT(QObject::thread() == QThread::currentThread());
15041505 /*if (_v8Locker) {
15051506 _v8Locker.reset();
15061507 }*/
15071508 moveToThread(thread);
1508− qDebug() << "Moved script engine " << objectName() << " to different thread";
1509+ qCDebug(scriptengine_v8) << "Moved script engine " << objectName() << " to different thread";
15091510 }
15101511
15111512 /*void ScriptEngineV8::enterIsolateOnThisThread() {
@@ -1514,7 +1515,7 @@ void ScriptEngineV8::setThread(QThread* thread) { · 2 unmodified lines
15141515 _v8Locker.reset(new v8::Locker(_v8Isolate));
15151516 if (!_v8Isolate->IsCurrent()) {
15161517 _v8Isolate->Enter();
1517− qDebug() << "Script engine " << objectName() << " entered isolate on a new thread";
1518+ qCDebug(scriptengine_v8) << "Script engine " << objectName() << " entered isolate on a new thread";
15181519 }
15191520 }*/
15201521
@@ -1534,14 +1535,14 @@ bool ScriptEngineV8::raiseException(const QString& error, const QString &reason) · 13 unmodified lines
15341535 bool ScriptEngineV8::raiseException(const ScriptValue& exception, const QString &reason) {
15351536 //V8TODO
15361537 //Q_ASSERT(false);
1537−// qCritical() << "Script exception occurred: " << exception.toString();
1538+// qCCritical(scriptengine_v8) << "Script exception occurred: " << exception.toString();
15381539 // ScriptValueV8Wrapper* unwrapped = ScriptValueV8Wrapper::unwrap(exception);
15391540 // V8ScriptValue qException = unwrapped ? unwrapped->toV8Value() : QScriptEngine::newVariant(exception.toVariant());
15401541
15411542 // emit
15421543 //return raiseException(qException);
15431544
1544−// qCCritical(scriptengine) << "Raise exception for reason" << reason << "NOT IMPLEMENTED!";
1545+// qCCritical(scriptengine_v8) << "Raise exception for reason" << reason << "NOT IMPLEMENTED!";
15451546 // return false;
15461547
15471548 return raiseException(ScriptValueV8Wrapper::fullUnwrap(this, exception));
@@ -1615,9 +1616,9 @@ void ScriptEngineV8::compileTest() { · 67 unmodified lines
16151616 v8::Local<v8::Script> script;
16161617 v8::ScriptOrigin scriptOrigin(getIsolate(), v8::String::NewFromUtf8(getIsolate(),"test").ToLocalChecked());
16171618 if (v8::Script::Compile(getContext(), v8::String::NewFromUtf8(getIsolate(), "print(\"hello world\");").ToLocalChecked(), &scriptOrigin).ToLocal(&script)) {
1618− qCDebug(scriptengine) << "Compile test successful";
1619+ qCDebug(scriptengine_v8) << "Compile test successful";
16191620 } else {
1620− qCDebug(scriptengine) << "Compile test failed";
1621+ qCDebug(scriptengine_v8) << "Compile test failed";
16211622 Q_ASSERT(false);
16221623 }
16231624 }
@@ -1683,9 +1684,9 @@ QString ScriptEngineV8::scriptValueDebugDetailsV8(const V8ScriptValue &v8Value) · 59 unmodified lines
16831684
16841685 void ScriptEngineV8::logBacktrace(const QString &title) {
16851686 QStringList backtrace = currentContext()->backtrace();
1686− qDebug(scriptengine) << title;
1687+ qCDebug(scriptengine_v8) << title;
16871688 for (int n = 0; n < backtrace.length(); n++) {
1688− qDebug(scriptengine) << backtrace[n];
1689+ qCDebug(scriptengine_v8) << backtrace[n];
16891690 }
16901691 }
16911692