Skip to content

Clean up allocations from finalized object links #1566

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
merged 4 commits into from
Jan 22, 2020
Merged

Clean up allocations from finalized object links #1566

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2196eaa
clean up javaObjectID reference from m_idToObject on finalization
FrancisDuvivierTHEO Jan 17, 2020
1caa6d9
delete callbackState and po on finalization
FrancisDuvivierTHEO Jan 17, 2020
66572e8
erase javaObjectID from m_idToObject in a more direct way
FrancisDuvivierTHEO Jan 21, 2020
ea37f3f
delete po and callbackstate in case of jsInstanceInfo == nullptr
FrancisDuvivierTHEO Jan 21, 2020
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
5 changes: 5 additions & 0 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 @@ -325,6 +325,8 @@ void ObjectManager::JSObjectFinalizer(Isolate *isolate, ObjectWeakCallbackState

if (jsInstanceInfo == nullptr) {
po->Reset();
delete po;
delete callbackState;
return;
}

Expand All @@ -341,6 +343,9 @@ void ObjectManager::JSObjectFinalizer(Isolate *isolate, ObjectWeakCallbackState
auto jsInfoIdx = static_cast<int>(MetadataNodeKeys::JsInfo);
po->Get(m_isolate)->SetInternalField(jsInfoIdx, Undefined(m_isolate));
po->Reset();
m_idToObject.erase(javaObjectID);
delete po;
delete callbackState;
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also delete the po and callbackState variables here: https://github.com/NativeScript/android-runtime/pull/1566/files#diff-6c6c152bfa906bd1defa04a2daacdedbR327

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, thanks, we'll add that.

}

Expand Down