Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
communication_ipc
提交
7a4a434d
C
communication_ipc
项目概览
OpenHarmony
/
communication_ipc
大约 1 年 前同步成功
通知
20
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
communication_ipc
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7a4a434d
编写于
8月 07, 2023
作者:
1
18392170496
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove cleanup hook
Signed-off-by:
N
18392170496
<
magentang4@huawei.com
>
上级
7f082076
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
19 deletion
+22
-19
ipc/native/src/napi_common/include/napi_remote_object_holder.h
...ative/src/napi_common/include/napi_remote_object_holder.h
+1
-1
ipc/native/src/napi_common/source/napi_remote_object.cpp
ipc/native/src/napi_common/source/napi_remote_object.cpp
+0
-14
ipc/native/src/napi_common/source/napi_remote_object_holder.cpp
...tive/src/napi_common/source/napi_remote_object_holder.cpp
+21
-4
未找到文件。
ipc/native/src/napi_common/include/napi_remote_object_holder.h
浏览文件 @
7a4a434d
...
...
@@ -27,7 +27,7 @@ namespace OHOS {
class
NAPIRemoteObjectHolder
:
public
RefBase
{
public:
explicit
NAPIRemoteObjectHolder
(
napi_env
env
,
const
std
::
u16string
&
descriptor
,
napi_value
thisVar
);
~
NAPIRemoteObjectHolder
()
=
default
;
~
NAPIRemoteObjectHolder
();
sptr
<
IRemoteObject
>
Get
();
void
Set
(
sptr
<
IRemoteObject
>
object
);
void
attachLocalInterface
(
napi_value
localInterface
,
std
::
string
&
descriptor
);
...
...
ipc/native/src/napi_common/source/napi_remote_object.cpp
浏览文件 @
7a4a434d
...
...
@@ -181,17 +181,6 @@ static NativeValue *RemoteObjectAttachCb(NativeEngine *engine, void *value, void
return
reinterpret_cast
<
NativeValue
*>
(
jsRemoteObject
);
}
static
void
OnEnvCleanUp
(
void
*
data
)
{
if
(
data
==
nullptr
)
{
ZLOGE
(
LOG_LABEL
,
"data is null"
);
return
;
}
NAPIRemoteObjectHolder
*
holder
=
reinterpret_cast
<
NAPIRemoteObjectHolder
*>
(
data
);
// js env has been destrcted, clear saved env info, and check befor use it
holder
->
CleanJsEnv
();
}
napi_value
RemoteObject_JS_Constructor
(
napi_env
env
,
napi_callback_info
info
)
{
// new napi remote object
...
...
@@ -224,9 +213,6 @@ napi_value RemoteObject_JS_Constructor(napi_env env, napi_callback_info info)
// connect native object to js thisVar
napi_status
status
=
napi_wrap
(
env
,
thisVar
,
holder
,
RemoteObjectHolderFinalizeCb
,
nullptr
,
nullptr
);
NAPI_ASSERT
(
env
,
status
==
napi_ok
,
"wrap js RemoteObject and native holder failed"
);
// register listener for env destruction
status
=
napi_add_env_cleanup_hook
(
env
,
OnEnvCleanUp
,
holder
);
NAPI_ASSERT
(
env
,
status
==
napi_ok
,
"add cleanup hook failed"
);
return
thisVar
;
}
...
...
ipc/native/src/napi_common/source/napi_remote_object_holder.cpp
浏览文件 @
7a4a434d
...
...
@@ -23,10 +23,16 @@
namespace
OHOS
{
static
constexpr
OHOS
::
HiviewDFX
::
HiLogLabel
LOG_LABEL
=
{
LOG_CORE
,
LOG_ID_IPC
,
"napi_remoteObject_holder"
};
struct
DeleteJsRefParam
{
napi_env
env
;
napi_ref
thisVarRef
;
};
static
void
OnEnvCleanUp
(
void
*
data
)
{
if
(
data
==
nullptr
)
{
ZLOGE
(
LOG_LABEL
,
"data is null"
);
return
;
}
NAPIRemoteObjectHolder
*
holder
=
reinterpret_cast
<
NAPIRemoteObjectHolder
*>
(
data
);
// js env has been destrcted, clear saved env info, and check befor use it
holder
->
CleanJsEnv
();
}
NAPIRemoteObjectHolder
::
NAPIRemoteObjectHolder
(
napi_env
env
,
const
std
::
u16string
&
descriptor
,
napi_value
thisVar
)
:
env_
(
env
),
descriptor_
(
descriptor
),
sptrCachedObject_
(
nullptr
),
wptrCachedObject_
(
nullptr
),
...
...
@@ -36,6 +42,17 @@ NAPIRemoteObjectHolder::NAPIRemoteObjectHolder(napi_env env, const std::u16strin
// create weak ref, do not need to delete,
// increase ref count when the JS object will transfer to another thread or process.
napi_create_reference
(
env
,
thisVar
,
0
,
&
jsObjectRef_
);
// register listener for env destruction
status
=
napi_add_env_cleanup_hook
(
env
,
OnEnvCleanUp
,
holder
);
if
(
status
!=
napi_ok
)
{
ZLOGE
(
LOG_LABEL
,
"add cleanup hook failed"
);
}
}
NAPIRemoteObjectHolder
::~
NAPIRemoteObjectHolder
()
{
napi_remove_env_cleanup_hook
(
env_
,
OnEnvCleanUp
,
this
);
}
sptr
<
IRemoteObject
>
NAPIRemoteObjectHolder
::
Get
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录