History

Fix V8 scope performance issue on libnode22

ksuprynowicz committed 11 months ago

Commit a9bd0781 parent 4aad6b218 files · +298 −349Browse files

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

Unified · Split

libraries/script-engine/src/v8/ScriptObjectV8Proxy.cpp+32−55
@@ -168,8 +168,7 @@ V8ScriptValue ScriptObjectV8Proxy::newQObject(ScriptEngineV8* engine, QObject* o · 167 unmodified lines
168168
169169 ScriptObjectV8Proxy* ScriptObjectV8Proxy::unwrapProxy(const V8ScriptValue& val) {
170170 auto isolate = val.getEngine()->getIsolate();
171− v8::Locker locker(isolate);
172− v8::Isolate::Scope isolateScope(isolate);
171+ Q_ASSERT(isolate->IsCurrent());
173172 v8::HandleScope handleScope(isolate);
174173 v8::Local<v8::Context> context = val.constGetContext();
175174 v8::Context::Scope contextScope(context);
@@ -194,8 +193,7 @@ ScriptObjectV8Proxy* ScriptObjectV8Proxy::unwrapProxy(const V8ScriptValue& val) · 18 unmodified lines
194193 }
195194
196195 ScriptObjectV8Proxy* ScriptObjectV8Proxy::unwrapProxy(v8::Isolate* isolate, v8::Local<v8::Value> &value) {
197− v8::Locker locker(isolate);
198− v8::Isolate::Scope isolateScope(isolate);
196+ Q_ASSERT(isolate->IsCurrent());
199197 v8::HandleScope handleScope(isolate);
200198
201199 if (value->IsNullOrUndefined()) {
@@ -233,18 +231,18 @@ ScriptObjectV8Proxy::~ScriptObjectV8Proxy() { · 31 unmodified lines
233231 }
234232 }
235233 _wasDestroyed = true;
234+ auto isolate = _engine->getIsolate();
235+ std::unique_ptr<ScriptEngine::ScriptEngineScopeGuard> guard;
236+ if(!isolate->IsCurrent()) {
237+ guard = _engine->getScopeGuard();
238+ }
239+ Q_ASSERT(isolate->IsCurrent());
236240 if (_ownsObject) {
237− auto isolate = _engine->getIsolate();
238− v8::Locker locker(isolate);
239− v8::Isolate::Scope isolateScope(isolate);
240241 v8::HandleScope handleScope(isolate);
241242 _v8Object.Reset();
242243 QObject* qobject = _object;
243244 if(qobject) qobject->deleteLater();
244245 } else {
245− auto isolate = _engine->getIsolate();
246− v8::Locker locker(isolate);
247− v8::Isolate::Scope isolateScope(isolate);
248246 v8::HandleScope handleScope(isolate);
249247 if (_object)
250248 qCDebug(scriptengine_v8) << "Deleting object proxy: " << name();
@@ -264,8 +262,7 @@ void ScriptObjectV8Proxy::investigate() { · 13 unmodified lines
264262 if (!qobject) return;
265263
266264 auto isolate = _engine->getIsolate();
267− v8::Locker locker(isolate);
268− v8::Isolate::Scope isolateScope(isolate);
265+ Q_ASSERT(isolate->IsCurrent());
269266 v8::HandleScope handleScope(_engine->getIsolate());
270267 auto context = _engine->getContext();
271268 v8::Context::Scope contextScope(context);
@@ -426,8 +423,7 @@ QString ScriptObjectV8Proxy::name() const { · 154 unmodified lines
426423
427424 ScriptObjectV8Proxy::QueryFlags ScriptObjectV8Proxy::queryProperty(const V8ScriptValue& object, const V8ScriptString& name, QueryFlags flags, uint* id) {
428425 auto isolate = _engine->getIsolate();
429− v8::Locker locker(isolate);
430− v8::Isolate::Scope isolateScope(isolate);
426+ Q_ASSERT(isolate->IsCurrent());
431427 v8::HandleScope handleScope(isolate);
432428 v8::Local<v8::Context> context = _engine->getContext();
433429 v8::Context::Scope contextScope(context);
@@ -588,8 +584,7 @@ void ScriptObjectV8Proxy::v8GetPropertyNames(const v8::PropertyCallbackInfo<v8:: · 154 unmodified lines
588584
589585 v8::Local<v8::Array> ScriptObjectV8Proxy::getPropertyNames() {
590586 auto isolate = _engine->getIsolate();
591− v8::Locker locker(isolate);
592− v8::Isolate::Scope isolateScope(isolate);
587+ Q_ASSERT(isolate->IsCurrent());
593588 v8::EscapableHandleScope handleScope(_engine->getIsolate());
594589 auto context = _engine->getContext();
595590 v8::Context::Scope contextScope(context);
@@ -621,8 +616,7 @@ v8::Local<v8::Array> ScriptObjectV8Proxy::getPropertyNames() { · 25 unmodified lines
621616
622617 V8ScriptValue ScriptObjectV8Proxy::property(const V8ScriptValue& object, const V8ScriptString& name, uint id) {
623618 auto isolate = _engine->getIsolate();
624− v8::Locker locker(isolate);
625− v8::Isolate::Scope isolateScope(isolate);
619+ Q_ASSERT(isolate->IsCurrent());
626620 v8::HandleScope handleScope(isolate);
627621 auto context = _engine->getContext();
628622 v8::Context::Scope contextScope(context);
@@ -694,8 +688,7 @@ V8ScriptValue ScriptObjectV8Proxy::property(const V8ScriptValue& object, const V · 65 unmodified lines
694688
695689 void ScriptObjectV8Proxy::setProperty(V8ScriptValue& object, const V8ScriptString& name, uint id, const V8ScriptValue& value) {
696690 auto isolate = _engine->getIsolate();
697− v8::Locker locker(isolate);
698− v8::Isolate::Scope isolateScope(isolate);
691+ Q_ASSERT(isolate->IsCurrent());
699692 v8::HandleScope handleScope(isolate);
700693 v8::Context::Scope contextScope(_engine->getContext());
701694 if (!(id & PROPERTY_TYPE)) return;
@@ -733,8 +726,7 @@ void ScriptObjectV8Proxy::setProperty(V8ScriptValue& object, const V8ScriptStrin · 31 unmodified lines
733726 ScriptVariantV8Proxy::ScriptVariantV8Proxy(ScriptEngineV8* engine, const QVariant& variant, V8ScriptValue scriptProto, ScriptObjectV8Proxy* proto) :
734727 _engine(engine), _variant(variant), _scriptProto(scriptProto), _proto(proto) {
735728 auto isolate = engine->getIsolate();
736− v8::Locker locker(isolate);
737− v8::Isolate::Scope isolateScope(isolate);
729+ Q_ASSERT(isolate->IsCurrent());
738730 v8::HandleScope handleScope(isolate);
739731 auto context = engine->getContext();
740732 v8::Context::Scope contextScope(context);
@@ -749,8 +741,7 @@ ScriptVariantV8Proxy::ScriptVariantV8Proxy(ScriptEngineV8* engine, const QVarian · 8 unmodified lines
749741
750742 ScriptVariantV8Proxy::~ScriptVariantV8Proxy() {
751743 auto isolate = _engine->getIsolate();
752− v8::Locker locker(isolate);
753− v8::Isolate::Scope isolateScope(isolate);
744+ Q_ASSERT(isolate->IsCurrent());
754745 v8::HandleScope handleScope(isolate);
755746 // V8TODO: Add similar deletion handling as for object proxy
756747 _v8Object.Reset();
@@ -759,8 +750,7 @@ ScriptVariantV8Proxy::~ScriptVariantV8Proxy() { · 2 unmodified lines
759750 V8ScriptValue ScriptVariantV8Proxy::newVariant(ScriptEngineV8* engine, const QVariant& variant, V8ScriptValue proto) {
760751 qDebug() << "ScriptVariantV8Proxy::newVariant";
761752 auto isolate = engine->getIsolate();
762− v8::Locker locker(isolate);
763− v8::Isolate::Scope isolateScope(isolate);
753+ Q_ASSERT(isolate->IsCurrent());
764754 v8::HandleScope handleScope(isolate);
765755 auto context = engine->getContext();
766756 v8::Context::Scope contextScope(context);
@@ -782,8 +772,7 @@ V8ScriptValue ScriptVariantV8Proxy::newVariant(ScriptEngineV8* engine, const QVa · 15 unmodified lines
782772
783773 ScriptVariantV8Proxy* ScriptVariantV8Proxy::unwrapProxy(const V8ScriptValue& val) {
784774 auto isolate = val.getEngine()->getIsolate();
785− v8::Locker locker(isolate);
786− v8::Isolate::Scope isolateScope(isolate);
775+ Q_ASSERT(isolate->IsCurrent());
787776 v8::HandleScope handleScope(isolate);
788777 v8::Context::Scope contextScope(val.getEngine()->getContext());
789778
@@ -802,8 +791,7 @@ ScriptVariantV8Proxy* ScriptVariantV8Proxy::unwrapProxy(const V8ScriptValue& val · 12 unmodified lines
802791 }
803792
804793 ScriptVariantV8Proxy* ScriptVariantV8Proxy::unwrapProxy(v8::Isolate* isolate, v8::Local<v8::Value> &value) {
805− v8::Locker locker(isolate);
806− v8::Isolate::Scope isolateScope(isolate);
794+ Q_ASSERT(isolate->IsCurrent());
807795 v8::HandleScope handleScope(isolate);
808796
809797 if (!value->IsObject()) {
@@ -820,8 +808,7 @@ ScriptVariantV8Proxy* ScriptVariantV8Proxy::unwrapProxy(v8::Isolate* isolate, v8 · 10 unmodified lines
820808 }
821809
822810 QVariant* ScriptVariantV8Proxy::unwrapQVariantPointer(v8::Isolate* isolate, const v8::Local<v8::Value> &value) {
823− v8::Locker locker(isolate);
824− v8::Isolate::Scope isolateScope(isolate);
811+ Q_ASSERT(isolate->IsCurrent());
825812 v8::HandleScope handleScope(isolate);
826813
827814 if (!value->IsObject()) {
@@ -924,8 +911,7 @@ ScriptMethodV8Proxy::ScriptMethodV8Proxy(ScriptEngineV8* engine, QObject* object · 96 unmodified lines
924911 const QList<QMetaMethod>& metas, int numMaxParams) :
925912 _numMaxParams(numMaxParams), _engine(engine), _object(object), /*_objectLifetime(lifetime),*/ _metas(metas) {
926913 auto isolate = engine->getIsolate();
927− v8::Locker locker(isolate);
928− v8::Isolate::Scope isolateScope(isolate);
914+ Q_ASSERT(isolate->IsCurrent());
929915 v8::HandleScope handleScope(isolate);
930916 v8::Context::Scope contextScope(engine->getContext());
931917 _objectLifetime.Reset(isolate, lifetime.get());
@@ -934,8 +920,7 @@ ScriptMethodV8Proxy::ScriptMethodV8Proxy(ScriptEngineV8* engine, QObject* object · 2 unmodified lines
934920
935921 ScriptMethodV8Proxy::~ScriptMethodV8Proxy() {
936922 auto isolate = _engine->getIsolate();
937− v8::Locker locker(isolate);
938− v8::Isolate::Scope isolateScope(isolate);
923+ Q_ASSERT(isolate->IsCurrent());
939924 v8::HandleScope handleScope(isolate);
940925 _objectLifetime.Reset();
941926 }
@@ -949,8 +934,7 @@ void ScriptMethodV8Proxy::weakHandleCallback(const v8::WeakCallbackInfo<ScriptMe · 7 unmodified lines
949934 V8ScriptValue ScriptMethodV8Proxy::newMethod(ScriptEngineV8* engine, QObject* object, V8ScriptValue lifetime,
950935 const QList<QMetaMethod>& metas, int numMaxParams) {
951936 auto isolate = engine->getIsolate();
952− v8::Locker locker(isolate);
953− v8::Isolate::Scope isolateScope(isolate);
937+ Q_ASSERT(isolate->IsCurrent());
954938 v8::HandleScope handleScope(isolate);
955939 auto context = engine->getContext();
956940 v8::Context::Scope contextScope(context);
@@ -975,8 +959,7 @@ QString ScriptMethodV8Proxy::fullName() const { · 18 unmodified lines
975959 }
976960
977961 void ScriptMethodV8Proxy::callback(const v8::FunctionCallbackInfo<v8::Value>& arguments) {
978− v8::Locker locker(arguments.GetIsolate());
979− v8::Isolate::Scope isolateScope(arguments.GetIsolate());
962+ Q_ASSERT(arguments.GetIsolate()->IsCurrent());
980963 v8::HandleScope handleScope(arguments.GetIsolate());
981964 v8::Context::Scope contextScope(arguments.GetIsolate()->GetCurrentContext());
982965 if (!arguments.Data()->IsObject()) {
@@ -1001,8 +984,7 @@ void ScriptMethodV8Proxy::callback(const v8::FunctionCallbackInfo<v8::Value>& ar · 18 unmodified lines
1001984 void ScriptMethodV8Proxy::call(const v8::FunctionCallbackInfo<v8::Value>& arguments) {
1002985 v8::Isolate *isolate = arguments.GetIsolate();
1003986 Q_ASSERT(isolate == _engine->getIsolate());
1004− v8::Locker locker(isolate);
1005− v8::Isolate::Scope isolateScope(isolate);
987+ Q_ASSERT(isolate->IsCurrent());
1006988 v8::HandleScope handleScope(isolate);
1007989 ContextScopeV8 contextScopeV8(_engine);
1008990 auto context = _engine->getContext();
@@ -1192,8 +1174,7 @@ void ScriptMethodV8Proxy::call(const v8::FunctionCallbackInfo<v8::Value>& argume · 183 unmodified lines
11921174 ScriptSignalV8Proxy::ScriptSignalV8Proxy(ScriptEngineV8* engine, QObject* object, V8ScriptValue lifetime, const QMetaMethod& meta) :
11931175 _engine(engine), _object(object), _meta(meta), _metaCallId(discoverMetaCallIdx()) {
11941176 auto isolate = _engine->getIsolate();
1195− v8::Locker locker(isolate);
1196− v8::Isolate::Scope isolateScope(isolate);
1177+ Q_ASSERT(isolate->IsCurrent());
11971178 v8::HandleScope handleScope(isolate);
11981179 auto context = _engine->getContext();
11991180 v8::Context::Scope contextScope(context);
@@ -1211,8 +1192,7 @@ ScriptSignalV8Proxy::~ScriptSignalV8Proxy() { · 11 unmodified lines
12111192 }
12121193
12131194 auto isolate = _engine->getIsolate();
1214− v8::Locker locker(isolate);
1215− v8::Isolate::Scope isolateScope(isolate);
1195+ Q_ASSERT(isolate->IsCurrent());
12161196 v8::HandleScope handleScope(isolate);
12171197 _objectLifetime.Reset();
12181198 _v8Context.Reset();
@@ -1260,8 +1240,7 @@ int ScriptSignalV8Proxy::qt_metacall(QMetaObject::Call call, int id, void** argu · 41 unmodified lines
12601240 #endif
12611241
12621242 auto isolate = _engine->getIsolate();
1263− v8::Locker locker(isolate);
1264− v8::Isolate::Scope isolateScope(isolate);
1243+ Q_ASSERT(isolate->IsCurrent());
12651244
12661245 QList<Connection> connections;
12671246 withReadLock([&]{
@@ -1348,9 +1327,9 @@ int ScriptSignalV8Proxy::discoverMetaCallIdx() { · 80 unmodified lines
13481327
13491328 ScriptSignalV8Proxy::ConnectionList::iterator ScriptSignalV8Proxy::findConnection(V8ScriptValue thisObject, V8ScriptValue callback) {
13501329 auto iterOut = resultWithReadLock<ScriptSignalV8Proxy::ConnectionList::iterator>([&]{
1351− v8::Locker locker(_engine->getIsolate());
1352− v8::Isolate::Scope isolateScope(_engine->getIsolate());
1353− v8::HandleScope handleScope(_engine->getIsolate());
1330+ auto isolate = _engine->getIsolate();
1331+ Q_ASSERT(isolate->IsCurrent());
1332+ v8::HandleScope handleScope(isolate);
13541333 v8::Context::Scope contextScope(_engine->getContext());
13551334 ConnectionList::iterator iter;
13561335 for (iter = _connections.begin(); iter != _connections.end(); ++iter) {
@@ -1366,8 +1345,7 @@ ScriptSignalV8Proxy::ConnectionList::iterator ScriptSignalV8Proxy::findConnectio · 9 unmodified lines
13661345
13671346 void ScriptSignalV8Proxy::connect(ScriptValue arg0, ScriptValue arg1) {
13681347 v8::Isolate *isolate = _engine->getIsolate();
1369− v8::Locker locker(isolate);
1370− v8::Isolate::Scope isolateScope(isolate);
1348+ Q_ASSERT(isolate->IsCurrent());
13711349 v8::HandleScope handleScope(isolate);
13721350 auto context = _engine->getContext();
13731351 v8::Context::Scope contextScope(context);
@@ -1496,8 +1474,7 @@ void ScriptSignalV8Proxy::disconnect(ScriptValue arg0, ScriptValue arg1) { · 122 unmodified lines
14961474 return;
14971475 }
14981476 }
1499− v8::Locker locker(isolate);
1500− v8::Isolate::Scope isolateScope(isolate);
1477+ Q_ASSERT(isolate->IsCurrent());
15011478 v8::HandleScope handleScope(isolate);
15021479 auto context = _engine->getContext();
15031480 v8::Context::Scope contextScope(context);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t