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

!1496 增加 CanPromote函数判断wptr是否可以提升为sptr

Browse Source 
Merge pull request !1496 from dengliang/master
This commit is contained in:
openharmony_ci 2024-11-01 06:11:33 +00:00 committed by Gitee
commit dc8fe18aaf
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
7 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
interfaces/innerkits/ipc_core/BUILD.gn
View File

@ -18,6 +18,9 @@ SUBSYSTEM_DIR = "//foundation/communication/ipc"
config("ipc_all_deps_config") {
include_dirs = [ "$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core/include" ]
if (is_emulator) {
defines = [ "EMULATOR_PLATFORM" ]
}
}
ohos_prebuilt_shared_library("ipc_core") {

4
interfaces/innerkits/ipc_core/include/ipc_object_proxy.h
View File

@ -242,6 +242,10 @@ public:
void SetObjectDied(bool isDied);
#ifndef EMULATOR_PLATFORM
bool CanPromote() override;
#endif
private:
int SendLocalRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &optionoption);
int SendRequestInner(bool isLocal, uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option);

1
interfaces/innerkits/ipc_core/libipc_core_map
View File

@ -70,6 +70,7 @@
"OHOS::IPCObjectProxy::IsObjectDead()";
"OHOS::IPCObjectStub::IsObjectDead()";
"virtual thunk to OHOS::IRemoteObject::GetInterfaceDescriptor()";
"virtual thunk to OHOS::IPCObjectProxy::CanPromote()";
"OHOS::IRemoteObject::GetInterfaceDescriptor()";
"OHOS::IPCObjectProxy::GetInterfaceDescriptor()";
"OHOS::IPCObjectStub::GetInterfaceDescriptor()";

3
interfaces/innerkits/ipc_single/BUILD.gn
View File

@ -23,6 +23,9 @@ config("libipc_single_private_config") {
config("ipc_all_deps_config") {
include_dirs = [ "$SUBSYSTEM_DIR/interfaces/innerkits/ipc_core/include" ]
if (is_emulator) {
defines = [ "EMULATOR_PLATFORM" ]
}
}
ohos_shared_library("ipc_single") {

1
interfaces/innerkits/ipc_single/libipc_single_map
View File

@ -70,6 +70,7 @@
"OHOS::IPCObjectProxy::IsObjectDead()";
"OHOS::IPCObjectStub::IsObjectDead()";
"virtual thunk to OHOS::IRemoteObject::GetInterfaceDescriptor()";
"virtual thunk to OHOS::IPCObjectProxy::CanPromote()";
"OHOS::IRemoteObject::GetInterfaceDescriptor()";
"OHOS::IPCObjectProxy::GetInterfaceDescriptor()";
"OHOS::IPCObjectStub::GetInterfaceDescriptor()";

7
ipc/native/src/core/source/ipc_object_proxy.cpp
View File

@ -616,6 +616,13 @@ uint32_t IPCObjectProxy::GetStrongRefCountForStub()
return invoker->GetStrongRefCountForStub(handle_);
}
#ifndef EMULATOR_PLATFORM
bool IPCObjectProxy::CanPromote()
{
return (GetSptrRefCount() > 0);
}
#endif
#ifndef CONFIG_IPC_SINGLE
int IPCObjectProxy::UpdateProto()
{

3
ipc/native/test/unittest/common/mock_iremote_object.h
View File

@ -38,6 +38,9 @@ public:
MockIPCObjectProxy() : IPCObjectProxy(1, u"mockProxyService") {};
~MockIPCObjectProxy() {};
#ifndef EMULATOR_PLATFORM
MOCK_METHOD0(CanPromote, bool());
#endif
MOCK_METHOD0(GetObjectRefCount, int32_t());
MOCK_METHOD0(GetSessionName, std::string());
MOCK_METHOD0(GetInterfaceDescriptor, std::u16string());