Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-15 08:51:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added hash maps for faster property search on V8 callbacks

Browse source
This commit is contained in:
ksuprynowicz 2023-03-29 22:01:43 +02:00
parent 2a2cf3898b
commit 4062d80445
2 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libraries/script-engine/src/v8/ScriptObjectV8Proxy.cpp
View file

@ -275,7 +275,8 @@ void ScriptObjectV8Proxy::investigate() {
}
auto v8Name = v8::String::NewFromUtf8(_engine->getIsolate(), prop.name()).ToLocalChecked();
PropertyDef& propDef = _props.insert(idx, PropertyDef(_engine, v8Name)).value();
PropertyDef& propDef = _props.insert(idx, PropertyDef(_engine, v8Name, idx)).value();
_propNameMap.insert(V8ScriptString(_engine, v8Name), &propDef);
propDef.flags = ScriptValue::Undeletable | ScriptValue::PropertyGetter | ScriptValue::PropertySetter |
ScriptValue::QObjectMember;
if (prop.isConstant()) propDef.flags |= ScriptValue::ReadOnly;
@ -318,9 +319,10 @@ void ScriptObjectV8Proxy::investigate() {
auto nameLookup = methodNames.find(name);
if (isSignal) {
if (nameLookup == methodNames.end()) {
SignalDef& signalDef = _signals.insert(idx, SignalDef(_engine, name.get())).value();
SignalDef& signalDef = _signals.insert(idx, SignalDef(_engine, name.get(), idx)).value();
signalDef.name = name;
signalDef.signal = method;
_signalNameMap.insert(name, &signalDef);
//qCDebug(scriptengine_v8) << "Utf8Value 1: " << QString(*v8::String::Utf8Value(const_cast<v8::Isolate*>(_engine->getIsolate()), nameString));
//qCDebug(scriptengine_v8) << "Utf8Value 2: " << QString(*v8::String::Utf8Value(const_cast<v8::Isolate*>(_engine->getIsolate()), name.constGet()));
//qCDebug(scriptengine_v8) << "toQString: " << name.toQString();
@ -346,10 +348,11 @@ void ScriptObjectV8Proxy::investigate() {
}
}
if (nameLookup == methodNames.end()) {
MethodDef& methodDef = _methods.insert(idx, MethodDef(_engine, name.get())).value();
MethodDef& methodDef = _methods.insert(idx, MethodDef(_engine, name.get(), idx)).value();
methodDef.name = name;
methodDef.numMaxParms = parameterCount;
methodDef.methods.append(method);
_methodNameMap.insert(name, &methodDef);
methodNames.insert(name, idx);
} else {
int originalMethodId = nameLookup.value();
@ -403,20 +406,34 @@ ScriptObjectV8Proxy::QueryFlags ScriptObjectV8Proxy::queryProperty(const V8Scrip
v8::String::Utf8Value nameStr(isolate, name.constGet());
// check for methods
for (MethodDefMap::const_iterator trans = _methods.cbegin(); trans != _methods.cend(); ++trans) {
/*for (MethodDefMap::const_iterator trans = _methods.cbegin(); trans != _methods.cend(); ++trans) {
v8::String::Utf8Value methodNameStr(isolate, trans.value().name.constGet());
//qCDebug(scriptengine_v8) << "queryProperty : " << *nameStr << " method: " << *methodNameStr;
if (!(trans.value().name == name)) continue;
*id = trans.key() | METHOD_TYPE;
return flags & (HandlesReadAccess | HandlesWriteAccess);
}*/
MethodNameMap::const_iterator method = _methodNameMap.find(name);
if (method != _methodNameMap.cend()) {
//v8::String::Utf8Value methodNameStr(isolate, trans.value().name.constGet());
//qCDebug(scriptengine_v8) << "queryProperty : " << *nameStr << " method: " << *methodNameStr;
const MethodDef* methodDef = method.value();
*id = methodDef->_id | METHOD_TYPE;
return flags & (HandlesReadAccess | HandlesWriteAccess);
}
// check for properties
for (PropertyDefMap::const_iterator trans = _props.cbegin(); trans != _props.cend(); ++trans) {
/*for (PropertyDefMap::const_iterator trans = _props.cbegin(); trans != _props.cend(); ++trans) {
const PropertyDef& propDef = trans.value();
if (!(propDef.name == name)) continue;
*id = trans.key() | PROPERTY_TYPE;
return flags & (HandlesReadAccess | HandlesWriteAccess);
}*/
PropertyNameMap::const_iterator prop = _propNameMap.find(name);
if (prop != _propNameMap.cend()) {
const PropertyDef* propDef = prop.value();
*id = propDef->_id | PROPERTY_TYPE;
return flags & (HandlesReadAccess | HandlesWriteAccess);
}
// check for signals
@ -585,6 +602,7 @@ v8::Local<v8::Array> ScriptObjectV8Proxy::getPropertyNames() {
auto context = _engine->getContext();
v8::Context::Scope contextScope(_engine->getContext());
//V8TODO: this is really slow. It could be cached if this is called often.
v8::Local<v8::Array> properties = v8::Array::New(isolate, _props.size() + _methods.size() + _signals.size());
uint32_t position = 0;
for (PropertyDefMap::const_iterator i = _props.begin(); i != _props.end(); i++){

16
libraries/script-engine/src/v8/ScriptObjectV8Proxy.h
View file

@ -39,27 +39,33 @@ class ScriptObjectV8Proxy final {
private: // implementation
class PropertyDef {
public:
PropertyDef(ScriptEngineV8 *engine, v8::Local<v8::String> string) : name(engine, string) {};
PropertyDef(ScriptEngineV8 *engine, v8::Local<v8::String> string, uint id) : name(engine, string), _id(id) {};
V8ScriptString name;
ScriptValue::PropertyFlags flags;
uint _id;
};
class MethodDef {
public:
MethodDef(ScriptEngineV8 *engine, v8::Local<v8::String> string) : name(engine, string) {};
MethodDef(ScriptEngineV8 *engine, v8::Local<v8::String> string, uint id) : name(engine, string), _id(id) {};
V8ScriptString name;
int numMaxParms;
QList<QMetaMethod> methods;
uint _id;
};
class SignalDef {
public:
SignalDef(ScriptEngineV8 *engine, v8::Local<v8::String> string) : name(engine, string) {};
SignalDef(ScriptEngineV8 *engine, v8::Local<v8::String> string, uint id) : name(engine, string), _id(id) {};
V8ScriptString name;
QMetaMethod signal;
uint _id;
};
using PropertyDefMap = QHash<uint, PropertyDef>;
using MethodDefMap = QHash<uint, MethodDef>;
using SignalDefMap = QHash<uint, SignalDef>;
using InstanceMap = QHash<uint, QPointer<ScriptSignalV8Proxy> >;
using PropertyNameMap = QHash<V8ScriptString, PropertyDef*>;
using MethodNameMap = QHash<V8ScriptString, MethodDef*>;
using SignalNameMap = QHash<V8ScriptString, SignalDef*>;
static constexpr uint PROPERTY_TYPE = 0x1000;
static constexpr uint METHOD_TYPE = 0x2000;
@ -112,6 +118,10 @@ private: // storage
PropertyDefMap _props;
MethodDefMap _methods;
SignalDefMap _signals;
// These are used for property lookups from V8 callbacks
PropertyNameMap _propNameMap;
MethodNameMap _methodNameMap;
SignalNameMap _signalNameMap;
InstanceMap _signalInstances;
const bool _ownsObject;
QPointer<QObject> _object;