Skip to content

perf: skip Class.getName() when wrapping a returned object of a seen class #2075

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

Open
triniwiz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

perf: skip Class.getName() when wrapping a returned object of a seen class #2075

Show file tree
Hide file tree
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
36 changes: 28 additions & 8 deletions test-app/runtime/src/main/cpp/ObjectManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,24 +290,44 @@ Local<Object> ObjectManager::CreateJSWrapper(jint javaObjectID,
JEnv env;
JniLocalRef clazz(env.GetObjectClass(instance));

return CreateJSWrapperHelper(javaObjectID, typeName, clazz);
auto& seen = m_wrapperClasses[typeName];
for (const auto& entry : seen) {
if (env.isSameObject(entry.clazz, clazz)) {
return CreateJSWrapperHelper(javaObjectID, entry.className, entry.clazz);
}
}

auto className = GetClassName((jclass)clazz);
jclass linked = nullptr;
auto jsWrapper = CreateJSWrapperHelper(javaObjectID, className, nullptr, &linked);
if (linked != nullptr) {
if (seen.size() >= 4) {
seen.erase(seen.begin());
}
seen.push_back({linked, className});
}
return jsWrapper;
}

Local<Object> ObjectManager::CreateJSWrapperHelper(jint javaObjectID,
const string& typeName,
jclass clazz) {
const string& className,
jclass globalClazz,
jclass* linkedClazz) {
auto isolate = m_isolate;

auto className = (clazz != nullptr) ? GetClassName(clazz) : typeName;

auto node = MetadataNode::GetOrCreate(className);

auto jsWrapper = node->CreateJSWrapper(isolate, this);

if (!jsWrapper.IsEmpty()) {
JEnv env;
auto claz = env.FindClass(className);
Link(jsWrapper, javaObjectID, claz);
if (globalClazz == nullptr) {
JEnv env;
globalClazz = env.FindClass(className);
}
Link(jsWrapper, javaObjectID, globalClazz);
if (linkedClazz != nullptr) {
*linkedClazz = globalClazz;
}
}
return jsWrapper;
}
Expand Down
13 changes: 11 additions & 2 deletions test-app/runtime/src/main/cpp/ObjectManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,14 @@ class ObjectManager {
DirectBuffer& inputBuff, DirectBuffer& outputBuff);

v8::Local<v8::Object> CreateJSWrapperHelper(jint javaObjectID,
const std::string& typeName,
jclass clazz);
const std::string& className,
jclass globalClazz,
jclass* linkedClazz = nullptr);

struct WrapperClassEntry {
jclass clazz;
std::string className;
};

static void JSObjectWeakCallbackStatic(
const v8::WeakCallbackInfo<ObjectWeakCallbackState>& data);
Expand Down Expand Up @@ -253,6 +259,9 @@ class ObjectManager {

std::unordered_map<int, ObjectWeakCallbackState*> m_idToObject;

// Recent runtime classes per declared type.
std::unordered_map<std::string, std::vector<WrapperClassEntry>> m_wrapperClasses;

PersistentObjectIdSet m_released;

std::set<unsigned long> m_visited;
Expand Down
Loading