openharmony/communication_ipc
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_ipc synced 2024-11-30 11:30:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix weak ref mem leak

Browse Source 
Signed-off-by: 18392170496 <magentang4@huawei.com>
This commit is contained in:
18392170496 2023-09-13 09:45:30 +08:00
parent 03ca51a6ab
commit 46c0acd770
1 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
ipc/native/src/napi_common/source/napi_remote_object_holder.cpp
View File

@ -39,7 +39,7 @@ NAPIRemoteObjectHolder::NAPIRemoteObjectHolder(napi_env env, const std::u16strin
localInterfaceRef_(nullptr), attachCount_(1), jsObjectRef_(nullptr)
{
jsThreadId_ = std::this_thread::get_id();
// create weak ref, do not need to delete,
// create weak ref, need call napi_delete_reference to release memory,
// increase ref count when the JS object will transfer to another thread or process.
napi_create_reference(env, thisVar, 0, &jsObjectRef_);
@ -52,10 +52,54 @@ NAPIRemoteObjectHolder::NAPIRemoteObjectHolder(napi_env env, const std::u16strin
NAPIRemoteObjectHolder::~NAPIRemoteObjectHolder()
{
if (env_ != nullptr) {
napi_status status = napi_remove_env_cleanup_hook(env_, OnEnvCleanUp, this);
if (env_ == nullptr) {
ZLOGE(LOG_LABEL, "js env has been destructed");
return;
}
napi_status status = napi_remove_env_cleanup_hook(env_, OnEnvCleanUp, this);
if (status != napi_ok) {
ZLOGE(LOG_LABEL, "remove cleanup hook failed");
}
if (localInterfaceRef_ != nullptr) {
status = napi_delete_reference(env_, localInterfaceRef_);
if (status != napi_ok) {
ZLOGE(LOG_LABEL, "remove cleanup hook failed");
ZLOGE(LOG_LABEL, "failed to delete ref");
}
}
if (jsObjectRef_ != nullptr) {
if (jsThreadId_ == std::this_thread::get_id()) {
status = napi_delete_reference(env_, jsObjectRef_);
if (status != napi_ok) {
ZLOGE(LOG_LABEL, "failed to delete ref");
}
} else {
uv_loop_s *loop = nullptr;
napi_get_uv_event_loop(env_, &loop);
uv_work_t *work = new(std::nothrow) uv_work_t;
if (work == nullptr) {
ZLOGE(LOG_LABEL, "failed to new work");
return;
}
OperateJsRefParam *param = new OperateJsRefParam {
.env = env_,
.thisVarRef = jsObjectRef_
};
work->data = reinterpret_cast<void *>(param);
uv_queue_work(loop, work, [](uv_work_t *work) {}, [](uv_work_t *work, int status) {
OperateJsRefParam *param = reinterpret_cast<OperateJsRefParam *>(work->data);
napi_handle_scope scope = nullptr;
napi_open_handle_scope(param->env, &scope);
napi_status napiStatus = napi_delete_reference(param->env, param->thisVarRef);
if (napiStatus != napi_ok) {
ZLOGE(LOG_LABEL, "failed to delete ref on uv work");
}
napi_close_handle_scope(param->env, scope);
delete param;
delete work;
});
}
}
}
@ -116,6 +160,9 @@ void NAPIRemoteObjectHolder::attachLocalInterface(napi_value localInterface, std
ZLOGE(LOG_LABEL, "Js env has been destructed");
return;
}
if (localInterfaceRef_ != nullptr) {
napi_delete_reference(env_, localInterfaceRef_);
}
napi_create_reference(env_, localInterface, 0, &localInterfaceRef_);
descriptor_ = Str8ToStr16(descriptor);
}