From bf3affd36e023afb69715281cc0af8adceed2d95 Mon Sep 17 00:00:00 2001 From: dengliang <15934868816@139.com> Date: Wed, 3 Sep 2025 16:03:03 +0800 Subject: [PATCH 1/4] binder freeze process Signed-off-by: dengliang <15934868816@139.com> --- config.gni | 6 ++ .../innerkits/ipc_core/include/ipc_skeleton.h | 26 +++++++++ .../ipc_core/include/message_option.h | 1 + interfaces/innerkits/ipc_single/BUILD.gn | 6 ++ .../include/dbinder_base_invoker_define.h | 4 ++ .../include/dbinder_base_invoker_interface.h | 14 +++++ .../src/core/framework/include/sys_binder.h | 17 +++++- .../core/framework/source/ipc_skeleton.cpp | 20 +++++++ .../src/core/invoker/include/binder_invoker.h | 6 ++ .../core/invoker/include/iremote_invoker.h | 6 ++ .../core/invoker/source/binder_invoker.cpp | 42 ++++++++++++++ ipc/native/test/unittest/common/BUILD.gn | 4 ++ .../common/binder_invoker_unittest.cpp | 38 +++++++++++++ .../unittest/common/ipc_skeleton_unittest.cpp | 56 +++++++++++++++++++ .../unittest/common/mock_iremote_invoker.h | 4 ++ ipc/test/auxiliary/native/BUILD.gn | 13 +++++ .../auxiliary/native/include/test_service.h | 3 + .../native/include/test_service_base.h | 5 ++ .../native/include/test_service_client.h | 3 + .../native/include/test_service_proxy.h | 3 + .../native/include/test_service_stub.h | 3 + ipc/test/auxiliary/native/src/main_client.cpp | 15 +++++ .../auxiliary/native/src/test_service.cpp | 7 +++ .../native/src/test_service_client.cpp | 17 ++++++ .../native/src/test_service_proxy.cpp | 48 ++++++++++++++++ .../native/src/test_service_stub.cpp | 11 ++++ .../ipc/native/src/core/source/BUILD.gn | 4 ++ test/unittest/mock/mock_iremote_invoker.h | 4 ++ 28 files changed, 385 insertions(+), 1 deletion(-) diff --git a/config.gni b/config.gni index bf6ea89d..5d3c8bbd 100644 --- a/config.gni +++ b/config.gni @@ -23,6 +23,7 @@ declare_args() { hiviewdfx_backtrace_support = false hiviewdfx_hisysevent_support = false ipc_proxy_dfx_backtrace_enabled = false + ipc_freeze_process_support = false } if (defined(global_parts_info) && @@ -44,3 +45,8 @@ if (defined(global_parts_info) && defined(global_parts_info.hiviewdfx_hisysevent)) { hiviewdfx_hisysevent_support = true } + +if (defined(global_parts_info) && + defined(global_parts_info.officeservice_space_mgr_service)) { + ipc_freeze_process_support = true +} \ No newline at end of file diff --git a/interfaces/innerkits/ipc_core/include/ipc_skeleton.h b/interfaces/innerkits/ipc_core/include/ipc_skeleton.h index a19a0e79..3cf4e1e7 100644 --- a/interfaces/innerkits/ipc_core/include/ipc_skeleton.h +++ b/interfaces/innerkits/ipc_core/include/ipc_skeleton.h @@ -207,6 +207,32 @@ public: * @since 20 */ static uint32_t GetDCallingTokenID(); + +#ifdef FREEZE_PROCESS_SUPPORT + /** + * @brief Freeze or unfreeze a process. + * @param pid Process ID to freeze or unfreeze. + * @param freeze True to freeze the process, false to unfreeze it. + * @param timeout Timeout value in milliseconds to wait for the stub to finish processing requests + * before freezing. If the timeout is reached and processing is not completed, the freeze operation + * will be abandoned. + * @return Returns {@link ERR_NONE} if the operation is successful; returns an error code + * defined in {@link ipc_types.h} otherwise. + * @since 20 + */ + static int32_t FreezeProcess(uint32_t pid, bool freeze, uint32_t timeout); + + /** + * @brief Check if a process is frozen. + * @param pid Process ID to check. + * @param isFreeze Reference to a boolean variable that will store the freeze status of the process. + * True if the process is frozen, false otherwise. + * @return Returns {@link ERR_NONE} if the operation is successful; returns an error code + * defined in {@link ipc_types.h} otherwise. + * @since 20 + */ + static int32_t CheckFreeze(uint32_t pid, bool &isFreeze); +#endif // FREEZE_PROCESS_SUPPORT }; class IPCDfx { diff --git a/interfaces/innerkits/ipc_core/include/message_option.h b/interfaces/innerkits/ipc_core/include/message_option.h index bd9f222f..0fe51ff6 100644 --- a/interfaces/innerkits/ipc_core/include/message_option.h +++ b/interfaces/innerkits/ipc_core/include/message_option.h @@ -26,6 +26,7 @@ public: TF_STATUS_CODE = 0x08, TF_ACCEPT_FDS = 0x10, TF_WAIT_TIME = 0x8, + TF_UPDATE_TXN = 0x40, TF_ASYNC_WAKEUP_LATER = 0x100000, }; MessageOption(int flags = TF_SYNC, int waitTime = TF_WAIT_TIME); diff --git a/interfaces/innerkits/ipc_single/BUILD.gn b/interfaces/innerkits/ipc_single/BUILD.gn index 497d8b40..23d8913c 100644 --- a/interfaces/innerkits/ipc_single/BUILD.gn +++ b/interfaces/innerkits/ipc_single/BUILD.gn @@ -122,6 +122,9 @@ ohos_shared_library("ipc_single") { if (hiviewdfx_hisysevent_support) { defines += [ "HIVIEWDFX_HISYSEVENT_SUPPORT" ] } + if (ipc_freeze_process_support) { + defines += [ "FREEZE_PROCESS_SUPPORT" ] + } innerapi_tags = [ "chipsetsdk", "platformsdk", @@ -164,6 +167,9 @@ ohos_shared_library("ipc_single_test") { if (hiviewdfx_hisysevent_support) { defines += [ "HIVIEWDFX_HISYSEVENT_SUPPORT" ] } + if (ipc_freeze_process_support) { + defines += [ "FREEZE_PROCESS_SUPPORT" ] + } innerapi_tags = [ "chipsetsdk_sp", "platformsdk", diff --git a/ipc/native/src/core/dbinder/include/dbinder_base_invoker_define.h b/ipc/native/src/core/dbinder/include/dbinder_base_invoker_define.h index 157db0e7..fe6add34 100644 --- a/ipc/native/src/core/dbinder/include/dbinder_base_invoker_define.h +++ b/ipc/native/src/core/dbinder/include/dbinder_base_invoker_define.h @@ -77,6 +77,10 @@ public: virtual sptr GetSAMgrObject() override; virtual bool SetRegistryObject(sptr &object) override; virtual void FreeBuffer(void *data) override; +#ifdef FREEZE_PROCESS_SUPPORT + virtual int32_t FreezeProcess(uint32_t pid, bool freeze, uint32_t timeout) override; + virtual int32_t CheckFreeze(uint32_t pid, bool &isFreeze) override; +#endif // FREEZE_PROCESS_SUPPORT virtual std::shared_ptr WriteTransaction(int cmd, uint32_t flags, int32_t handle, int32_t socketId, uint32_t code, MessageParcel &data, uint64_t &seqNumber, int status); virtual int SendOrWaitForCompletion(int userWaitTime, uint64_t seqNumber, std::shared_ptr sessionOfPeer, diff --git a/ipc/native/src/core/dbinder/include/dbinder_base_invoker_interface.h b/ipc/native/src/core/dbinder/include/dbinder_base_invoker_interface.h index 7561c06a..e179c402 100644 --- a/ipc/native/src/core/dbinder/include/dbinder_base_invoker_interface.h +++ b/ipc/native/src/core/dbinder/include/dbinder_base_invoker_interface.h @@ -188,6 +188,20 @@ template void DBinderBaseInvoker::FreeBuffer(void *data) return; } +#ifdef FREEZE_PROCESS_SUPPORT +template +int32_t bool DBinderBaseInvoker::FreezeProcess(uint32_t pid, bool freeze, uint32_t timeout) +{ + return ERR_NONE; +} + +template +int32_t bool DBinderBaseInvoker::CheckFreeze(uint32_t pid, bool &isFreeze) +{ + return ERR_NONE; +} +#endif // FREEZE_PROCESS_SUPPORT + template bool DBinderBaseInvoker::CheckTransactionData(const dbinder_transaction_data *tr) const { if (tr->sizeOfSelf == 0 || tr->sizeOfSelf > SOCKET_MAX_BUFF_SIZE || tr->buffer_size > SOCKET_MAX_BUFF_SIZE || diff --git a/ipc/native/src/core/framework/include/sys_binder.h b/ipc/native/src/core/framework/include/sys_binder.h index 206e09e6..54dd232d 100644 --- a/ipc/native/src/core/framework/include/sys_binder.h +++ b/ipc/native/src/core/framework/include/sys_binder.h @@ -62,6 +62,18 @@ struct flat_binder_object { }; binder_uintptr_t cookie; }; + +struct binder_freeze_info { + __u32 pid; + __u32 enable; + __u32 timeout_ms; +}; + +struct binder_frozen_state_info { + __u32 pid; + bool has_unfrozen; +}; + #ifndef __linux__ #define HMB_ERROR_INFO_LEN 64 struct hmb_detailed_err { @@ -160,6 +172,8 @@ struct binder_sender_info { #define BINDER_GET_NODE_DEBUG_INFO _IOWR('b', 11, struct binder_node_debug_info) #define BINDER_GET_NODE_INFO_FOR_REF _IOWR('b', 12, struct binder_node_info_for_ref) #define BINDER_SET_CONTEXT_MGR_EXT _IOW('b', 13, struct flat_binder_object) +#define BINDER_FREEZE _IOW('b', 14, struct binder_freeze_info) +#define BINDER_GET_FROZEN_STATE _IOW('b', 15, struct binder_frozen_state_info) #define BINDER_FEATURE_SET _IOWR('b', 30, struct binder_feature_set) #define BINDER_GET_ACCESS_TOKEN _IOWR('b', 31, struct access_token) #define BINDER_GET_SENDER_INFO _IOWR('b', 32, struct binder_sender_info) @@ -241,7 +255,8 @@ enum binder_driver_return_protocol { BR_DEAD_BINDER = _IOR('r', 15, binder_uintptr_t), BR_CLEAR_DEATH_NOTIFICATION_DONE = _IOR('r', 16, binder_uintptr_t), BR_FAILED_REPLY = _IO('r', 17), - BR_RELEASE_NODE = _IO('r', 18), + BR_FROZEN_REPLY = _IO('r', 18), + BR_TRANSACTION_PENDING_FROZEN = _IO('r', 20), }; enum binder_driver_command_protocol { BC_TRANSACTION = _IOW('c', 0, struct binder_transaction_data), diff --git a/ipc/native/src/core/framework/source/ipc_skeleton.cpp b/ipc/native/src/core/framework/source/ipc_skeleton.cpp index 7948b69c..94c93f85 100644 --- a/ipc/native/src/core/framework/source/ipc_skeleton.cpp +++ b/ipc/native/src/core/framework/source/ipc_skeleton.cpp @@ -330,6 +330,26 @@ uint32_t IPCSkeleton::GetDCallingTokenID() return static_cast(GetSelfTokenID()); } +#ifdef FREEZE_PROCESS_SUPPORT +int32_t IPCSkeleton::FreezeProcess(uint32_t pid, bool freeze, uint32_t timeout) +{ + IRemoteInvoker *invoker = IPCThreadSkeleton::GetDefaultInvoker(); + if (invoker == nullptr) { + return IPC_SKELETON_NULL_OBJECT_ERR; + } + return invoker->FreezeProcess(pid, freeze, timeout); +} + +int32_t IPCSkeleton::CheckFreeze(uint32_t pid, bool &isFreeze) +{ + IRemoteInvoker *invoker = IPCThreadSkeleton::GetDefaultInvoker(); + if (invoker == nullptr) { + return IPC_SKELETON_NULL_OBJECT_ERR; + } + return invoker->CheckFreeze(pid, isFreeze); +} +#endif // FREEZE_PROCESS_SUPPORT + void IPCDfx::BlockUntilThreadAvailable() { IPCProcessSkeleton *current = IPCProcessSkeleton::GetCurrent(); diff --git a/ipc/native/src/core/invoker/include/binder_invoker.h b/ipc/native/src/core/invoker/include/binder_invoker.h index d8743e2b..d2362351 100644 --- a/ipc/native/src/core/invoker/include/binder_invoker.h +++ b/ipc/native/src/core/invoker/include/binder_invoker.h @@ -90,6 +90,12 @@ public: int SendRequest(int handle, uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; +#ifdef FREEZE_PROCESS_SUPPORT + int32_t FreezeProcess(uint32_t pid, bool freeze, uint32_t timeout) override; + + int32_t CheckFreeze(uint32_t pid, bool &isFreeze) override; +#endif // FREEZE_PROCESS_SUPPORT + int SendReply(MessageParcel &reply, uint32_t flags, int32_t result) override; bool FlattenObject(Parcel &parcel, const IRemoteObject *object) const override; diff --git a/ipc/native/src/core/invoker/include/iremote_invoker.h b/ipc/native/src/core/invoker/include/iremote_invoker.h index 9feb8517..3d5753f9 100644 --- a/ipc/native/src/core/invoker/include/iremote_invoker.h +++ b/ipc/native/src/core/invoker/include/iremote_invoker.h @@ -51,6 +51,12 @@ public: virtual int SendRequest(int handle, uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) = 0; +#ifdef FREEZE_PROCESS_SUPPORT + virtual int32_t FreezeProcess(uint32_t pid, bool freeze, uint32_t timeout) = 0; + + virtual int32_t CheckFreeze(uint32_t pid, bool &isFreeze) = 0; +#endif // FREEZE_PROCESS_SUPPORT + virtual bool AddDeathRecipient(int32_t handle, void *cookie) = 0; virtual bool RemoveDeathRecipient(int32_t handle, void *cookie) = 0; diff --git a/ipc/native/src/core/invoker/source/binder_invoker.cpp b/ipc/native/src/core/invoker/source/binder_invoker.cpp index d0fded34..519e20c6 100644 --- a/ipc/native/src/core/invoker/source/binder_invoker.cpp +++ b/ipc/native/src/core/invoker/source/binder_invoker.cpp @@ -737,6 +737,42 @@ int32_t BinderInvoker::SamgrServiceSendRequest( return error; } +#ifdef FREEZE_PROCESS_SUPPORT +int32_t BinderInvoker::FreezeProcess(uint32_t pid, bool freeze, uint32_t timeout) +{ + if ((binderConnector_ == nullptr) || (!binderConnector_->IsDriverAlive())) { + return IPC_INVOKER_CONNECT_ERR; + } + binder_freeze_info info; + info.enable = pid; + info.enable = freeze; + info.timeout_ms = timeout; + int error = binderConnector_->WriteBinder(BINDER_FREEZE, &info); + if (error != ERR_NONE) { + ZLOGE(LABEL, "Freeze process failed, error:%{public}d", error); + return error; + } + return ERR_NONE; +} + +int32_t BinderInvoker::CheckFreeze(uint32_t pid, bool &isFreeze) +{ + if ((binderConnector_ == nullptr) || (!binderConnector_->IsDriverAlive())) { + return IPC_INVOKER_CONNECT_ERR; + } + binder_frozen_state_info info; + info.pid = pid; + info.has_unfrozen = false; + int error = binderConnector_->WriteBinder(BINDER_GET_FROZEN_STATE, &info); + if (error != ERR_NONE) { + ZLOGE(LABEL, "Get freeze state failed, error:%{public}d", error); + return error; + } + isFreeze = !info.has_unfrozen; + return ERR_NONE; +} +#endif // FREEZE_PROCESS_SUPPORT + int32_t BinderInvoker::GeneralServiceSendRequest( const binder_transaction_data &tr, MessageParcel &data, MessageParcel &reply, MessageOption &option) { @@ -1230,10 +1266,16 @@ void BinderInvoker::DealWithCmd(MessageParcel *reply, bool &continueLoop, int32_ { switch (cmd) { case BR_TRANSACTION_COMPLETE: +#ifdef FREEZE_PROCESS_SUPPORT + case BR_TRANSACTION_PENDING_FROZEN: +#endif // FREEZE_PROCESS_SUPPORT OnTransactionComplete(reply, continueLoop, error, cmd); break; case BR_DEAD_REPLY: case BR_FAILED_REPLY: +#ifdef FREEZE_PROCESS_SUPPORT + case BR_FROZEN_REPLY: +#endif // FREEZE_PROCESS_SUPPORT OnDeadOrFailedReply(reply, continueLoop, error, cmd); break; case BR_REPLY: diff --git a/ipc/native/test/unittest/common/BUILD.gn b/ipc/native/test/unittest/common/BUILD.gn index f894a221..699de142 100644 --- a/ipc/native/test/unittest/common/BUILD.gn +++ b/ipc/native/test/unittest/common/BUILD.gn @@ -62,6 +62,10 @@ template("ipc_unittest") { "samgr:samgr_proxy", ] + if (ipc_freeze_process_support) { + defines = ["FREEZE_PROCESS_SUPPORT"] + } + if (hiviewdfx_hisysevent_support) { external_deps += [ "hisysevent:libhisysevent" ] } diff --git a/ipc/native/test/unittest/common/binder_invoker_unittest.cpp b/ipc/native/test/unittest/common/binder_invoker_unittest.cpp index f24bce52..48113a26 100644 --- a/ipc/native/test/unittest/common/binder_invoker_unittest.cpp +++ b/ipc/native/test/unittest/common/binder_invoker_unittest.cpp @@ -25,6 +25,7 @@ #include "ipc_process_skeleton.h" #include "sys_binder.h" +using namespace testing; using namespace testing::ext; using namespace OHOS; @@ -830,4 +831,41 @@ HWTEST_F(BinderInvokerUnitTest, GetInvocationStateTest001, TestSize.Level1) binderInvoker.isFirstInvoke_ = STATUS_FIRST_INVOKE; EXPECT_EQ(binderInvoker.GetInvocationState(), STATUS_FIRST_INVOKE); } + +#ifdef FREEZE_PROCESS_SUPPORT +/** +* @tc.name: FreezeProcessTest001 +* @tc.desc: cover FreezeProcess branch +* @tc.type: FUNC +*/ +HWTEST_F(BinderInvokerUnitTest, FreezeProcessTest, TestSize.Level1) +{ + BinderInvoker binderInvoker; + binderInvoker.binderConnector_ = nullptr; + EXPECT_EQ(binderInvoker.FreezeProcess(1, true, 1), IPC_INVOKER_CONNECT_ERR); + + BinderConnector *binderConnector = BinderConnector::GetInstance(); + binderConnector->driverFD_ = -1; + binderInvoker.binderConnector_ = binderConnector; + EXPECT_EQ(binderInvoker.FreezeProcess(1, true, 1), IPC_INVOKER_CONNECT_ERR); +} + +/** +* @tc.name: CheckFreezeTest +* @tc.desc: cover CheckFreeze branch +* @tc.type: FUNC +*/ +HWTEST_F(BinderInvokerUnitTest, CheckFreezeTest, TestSize.Level1) +{ + bool isFreeze = false; + BinderInvoker binderInvoker; + binderInvoker.binderConnector_ = nullptr; + EXPECT_EQ(binderInvoker.CheckFreeze(1, isFreeze), IPC_INVOKER_CONNECT_ERR); + + BinderConnector *binderConnector = BinderConnector::GetInstance(); + binderConnector->driverFD_ = -1; + binderInvoker.binderConnector_ = binderConnector; + EXPECT_EQ(binderInvoker.CheckFreeze(1, isFreeze), IPC_INVOKER_CONNECT_ERR); +} +#endif // FREEZE_PROCESS_SUPPORT } // namespace OHOS \ No newline at end of file diff --git a/ipc/native/test/unittest/common/ipc_skeleton_unittest.cpp b/ipc/native/test/unittest/common/ipc_skeleton_unittest.cpp index 71223a8f..8e35ca66 100644 --- a/ipc/native/test/unittest/common/ipc_skeleton_unittest.cpp +++ b/ipc/native/test/unittest/common/ipc_skeleton_unittest.cpp @@ -35,6 +35,7 @@ #undef protected #undef private +using namespace testing; using namespace testing::ext; using namespace OHOS; @@ -906,4 +907,59 @@ HWTEST_F(IPCSkeletonTest, GetDCallingTokenIDInRPC, TestSize.Level1) ASSERT_EQ(tokenId, 0); } + +#ifdef FREEZE_PROCESS_SUPPORT +/** + * @tc.name: FreezeProcessTest + * @tc.desc: Verify the FreezeProcess function. + * @tc.type: FUNC + */ +HWTEST_F(IPCSkeletonTest, FreezeProcessTest, TestSize.Level1) +{ + IPCThreadSkeleton *current = IPCThreadSkeleton::GetCurrent(); + ASSERT_NE(current, nullptr); + MockIRemoteInvoker *binderInvoker = new (std::nothrow) MockIRemoteInvoker(); + ASSERT_NE(binderInvoker, nullptr); + MockIRemoteInvoker *dbinderInvoker = new (std::nothrow) MockIRemoteInvoker(); + ASSERT_NE(dbinderInvoker, nullptr); + + current->invokers_[IRemoteObject::IF_PROT_DEFAULT] = binderInvoker; + current->invokers_[IRemoteObject::IF_PROT_DATABUS] = dbinderInvoker; + + EXPECT_CALL(*binderInvoker, FreezeProcess(testing::_, testing::_, testing::_)()) + .WillRepeatedly(testing::Return(ERR_NONE)); + + ASSERT_EQ(IPCSkeleton::FreezeProcess(0, true, 0), ERR_NONE); + std::fill(current->invokers_, current->invokers_ + IPCThreadSkeleton::INVOKER_MAX_COUNT, nullptr); + delete binderInvoker; + delete dbinderInvoker; +} + +/** + * @tc.name: CheckFreezeTest + * @tc.desc: Verify the CheckFreeze function. + * @tc.type: FUNC + */ +HWTEST_F(IPCSkeletonTest, CheckFreezeTest, TestSize.Level1) +{ + IPCThreadSkeleton *current = IPCThreadSkeleton::GetCurrent(); + ASSERT_NE(current, nullptr); + MockIRemoteInvoker *binderInvoker = new (std::nothrow) MockIRemoteInvoker(); + ASSERT_NE(binderInvoker, nullptr); + MockIRemoteInvoker *dbinderInvoker = new (std::nothrow) MockIRemoteInvoker(); + ASSERT_NE(dbinderInvoker, nullptr); + + current->invokers_[IRemoteObject::IF_PROT_DEFAULT] = binderInvoker; + current->invokers_[IRemoteObject::IF_PROT_DATABUS] = dbinderInvoker; + + EXPECT_CALL(*binderInvoker, CheckFreeze(testing::_, testing::_)()) + .WillRepeatedly(testing::Return(ERR_NONE)); + + bool isFreeze = false; + ASSERT_EQ(IPCSkeleton::CheckFreeze(0, isFreeze), ERR_NONE); + std::fill(current->invokers_, current->invokers_ + IPCThreadSkeleton::INVOKER_MAX_COUNT, nullptr); + delete binderInvoker; + delete dbinderInvoker; +} +#endif // FREEZE_PROCESS_SUPPORT } // namespace OHOS \ No newline at end of file diff --git a/ipc/native/test/unittest/common/mock_iremote_invoker.h b/ipc/native/test/unittest/common/mock_iremote_invoker.h index b53f3bb8..e0402d68 100644 --- a/ipc/native/test/unittest/common/mock_iremote_invoker.h +++ b/ipc/native/test/unittest/common/mock_iremote_invoker.h @@ -41,6 +41,10 @@ public: MOCK_METHOD3(SendReply, int(MessageParcel &reply, uint32_t flags, int32_t result)); MOCK_METHOD5(SendRequest, int(int handle, uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option)); +#ifdef FREEZE_PROCESS_SUPPORT + MOCK_METHOD3(FreezeProcess, int32_t(uint32_t pid, bool freeze, uint32_t timeout)); + MOCK_METHOD2(CheckFreeze, int32_t(uint32_t pid, bool &isFreeze)); +#endif // FREEZE_PROCESS_SUPPORT MOCK_METHOD2(AddDeathRecipient, bool(int32_t handle, void *cookie)); MOCK_METHOD2(RemoveDeathRecipient, bool(int32_t handle, void *cookie)); MOCK_METHOD1(SetMaxWorkThread, bool(int maxThreadNum)); diff --git a/ipc/test/auxiliary/native/BUILD.gn b/ipc/test/auxiliary/native/BUILD.gn index 8832a75c..e5d4b12a 100644 --- a/ipc/test/auxiliary/native/BUILD.gn +++ b/ipc/test/auxiliary/native/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") +import("//foundation/communication/ipc/config.gni") SUBSYSTEM_DIR = "//foundation/communication/ipc" IPC_CORE_ROOT = "$SUBSYSTEM_DIR/ipc/native" @@ -31,6 +32,10 @@ ohos_shared_library("ipc_test_helper") { "./src/test_service_stub.cpp", ] + if (ipc_freeze_process_support) { + defines = [ "FREEZE_PROCESS_SUPPORT" ] + } + configs = [ "$IPC_TEST_ROOT:ipc_test_config", "$SUBSYSTEM_DIR/config:ipc_util_config", @@ -90,6 +95,10 @@ ohos_executable("ipc_client_test") { "$SUBSYSTEM_DIR/interfaces/innerkits/c_api:ipc_capi", ] + if (ipc_freeze_process_support) { + defines = [ "FREEZE_PROCESS_SUPPORT" ] + } + external_deps = [ "access_token:libnativetoken_shared", "access_token:libtokensetproc_shared", @@ -125,6 +134,10 @@ ohos_shared_library("ipc_test_helper_extra") { "$SUBSYSTEM_DIR/config:ipc_util_config", ] + if (ipc_freeze_process_support) { + defines = [ "FREEZE_PROCESS_SUPPORT" ] + } + deps = [ "$SUBSYSTEM_DIR/interfaces/innerkits/c_api:ipc_capi", "$SUBSYSTEM_DIR/interfaces/innerkits/ipc_single:ipc_single_test", diff --git a/ipc/test/auxiliary/native/include/test_service.h b/ipc/test/auxiliary/native/include/test_service.h index c7ece976..a522e2af 100644 --- a/ipc/test/auxiliary/native/include/test_service.h +++ b/ipc/test/auxiliary/native/include/test_service.h @@ -56,6 +56,9 @@ public: int TestSendTooManyRequest(int data, int &reply) override; int TestMultiThreadSendRequest(int data, int &reply) override; int TestQueryThreadInvocationState() override; +#ifdef FREEZE_PROCESS_SUPPORT + int TestFreezeProcess() override; +#endif // FREEZE_PROCESS_SUPPORT private: int testFd_; std::mutex remoteObjectsMutex_; diff --git a/ipc/test/auxiliary/native/include/test_service_base.h b/ipc/test/auxiliary/native/include/test_service_base.h index fd969b7c..e0670ca3 100644 --- a/ipc/test/auxiliary/native/include/test_service_base.h +++ b/ipc/test/auxiliary/native/include/test_service_base.h @@ -56,6 +56,8 @@ public: TRANS_ID_UNREGISTER_REMOTE_STUB_OBJECT = 24, TRANS_ID_QUERY_REMOTE_PROXY_OBJECT = 25, TRANS_ID_QUERY_THREAD_INVOCATION_STATE = 26, + TRANS_ID_TEST_FREEZE_PROCESS = 27, + TRANS_ID_TEST_TXN_ASYNC_TRANS = 28, }; public: virtual int TestSyncTransaction(int value, int &reply, int delayTime = 0) = 0; @@ -87,6 +89,9 @@ public: virtual int TestSendTooManyRequest(int data, int &reply) = 0; virtual int TestMultiThreadSendRequest(int data, int &reply) = 0; virtual int TestQueryThreadInvocationState() = 0; +#ifdef FREEZE_PROCESS_SUPPORT + virtual int TestFreezeProcess() = 0; +#endif // FREEZE_PROCESS_SUPPORT public: DECLARE_INTERFACE_DESCRIPTOR(u"test.ipc.ITestService"); diff --git a/ipc/test/auxiliary/native/include/test_service_client.h b/ipc/test/auxiliary/native/include/test_service_client.h index 605e805d..bc22e773 100644 --- a/ipc/test/auxiliary/native/include/test_service_client.h +++ b/ipc/test/auxiliary/native/include/test_service_client.h @@ -45,6 +45,9 @@ public: bool TestUnRegisterRemoteStub(); bool TestSendTooManyRequest(); bool TestMultiThreadSendRequest(); +#ifdef FREEZE_PROCESS_SUPPORT + int TestFreezeProcess(); +#endif // FREEZE_PROCESS_SUPPORT bool TestQueryThreadInvocationState(); private: diff --git a/ipc/test/auxiliary/native/include/test_service_proxy.h b/ipc/test/auxiliary/native/include/test_service_proxy.h index c6334114..15d0cd67 100644 --- a/ipc/test/auxiliary/native/include/test_service_proxy.h +++ b/ipc/test/auxiliary/native/include/test_service_proxy.h @@ -51,6 +51,9 @@ public: sptr TestQueryRemoteProxy(const char *descriptor) override; int TestSendTooManyRequest(int data, int &reply) override; int TestMultiThreadSendRequest(int data, int &reply) override; +#ifdef FREEZE_PROCESS_SUPPORT + int TestFreezeProcess() override; +#endif // FREEZE_PROCESS_SUPPORT int TestQueryThreadInvocationState() override; private: diff --git a/ipc/test/auxiliary/native/include/test_service_stub.h b/ipc/test/auxiliary/native/include/test_service_stub.h index b5190036..32bdfaa8 100644 --- a/ipc/test/auxiliary/native/include/test_service_stub.h +++ b/ipc/test/auxiliary/native/include/test_service_stub.h @@ -50,6 +50,9 @@ private: int32_t QueryRemoteProxy(MessageParcel &data, MessageParcel &reply); int32_t ServerFlushAsyncCalls(MessageParcel &data, MessageParcel &reply); int32_t ServerThreadInvocationState(MessageParcel &data, MessageParcel &reply); +#ifdef FREEZE_PROCESS_SUPPORT + int32_t ServerTestFreezeProcess(MessageParcel &data, MessageParcel &reply); +#endif // FREEZE_PROCESS_SUPPORT void InitMessageProcessMap(); using TestServiceStubFunc = int32_t(TestServiceStub::*)(MessageParcel &data, MessageParcel &reply); diff --git a/ipc/test/auxiliary/native/src/main_client.cpp b/ipc/test/auxiliary/native/src/main_client.cpp index 6a486a57..e5d66bc5 100644 --- a/ipc/test/auxiliary/native/src/main_client.cpp +++ b/ipc/test/auxiliary/native/src/main_client.cpp @@ -82,6 +82,18 @@ void TestCaseSyncTrans(std::shared_ptr &testClient) } } +#ifdef FREEZE_PROCESS_SUPPORT +void TestCaseFreezeProcess(std::shared_ptr &testClient) +{ + bool ret = testClient->TestFreezeProcess(); + if (!ret) { + std::cout << "[FAILED] Execution of TestFreezeProcess case failed" < &testClient) { bool ret = testClient->StartPingService(); @@ -229,6 +241,9 @@ void ExecuteAllTestCase() TestCaseRegisterRemoteStub(testClient); TestCaseTooManyRequests(testClient); TestCaseMultiThreadSendRequest(testClient); +#ifdef FREEZE_PROCESS_SUPPORT + TestCaseFreezeProcess(testClient); +#endif // FREEZE_PROCESS_SUPPORT ZLOGI(LABEL, "All test cases have been executed"); } diff --git a/ipc/test/auxiliary/native/src/test_service.cpp b/ipc/test/auxiliary/native/src/test_service.cpp index c8b6b110..379b2695 100644 --- a/ipc/test/auxiliary/native/src/test_service.cpp +++ b/ipc/test/auxiliary/native/src/test_service.cpp @@ -345,4 +345,11 @@ int TestService::TestQueryThreadInvocationState() return state; } + +#ifdef FREEZE_PROCESS_SUPPORT +int TestService::TestFreezeProcess() +{ + return 0; +} +#endif // FREEZE_PROCESS_SUPPORT } // namespace OHOS diff --git a/ipc/test/auxiliary/native/src/test_service_client.cpp b/ipc/test/auxiliary/native/src/test_service_client.cpp index 154a7b0e..479c965f 100644 --- a/ipc/test/auxiliary/native/src/test_service_client.cpp +++ b/ipc/test/auxiliary/native/src/test_service_client.cpp @@ -74,6 +74,23 @@ bool TestServiceClient::StartSyncTransaction() return true; } +#ifdef FREEZE_PROCESS_SUPPORT +bool TestServiceClient::TestFreezeProcess() +{ + if (testService_ == nullptr) { + ZLOGE(LABEL, "The testService_ object is an empty object"); + return false; + } + + int ret = testService_->TestFreezeProcess(); + if (ret != 0) { + ZLOGE(LABEL, "TestFreezeProcess function call failed"); + return false; + } + return true; +} +#endif // FREEZE_PROCESS_SUPPORT + bool TestServiceClient::StartPingService() { if (testService_ == nullptr) { diff --git a/ipc/test/auxiliary/native/src/test_service_proxy.cpp b/ipc/test/auxiliary/native/src/test_service_proxy.cpp index 7a043511..10ed413a 100644 --- a/ipc/test/auxiliary/native/src/test_service_proxy.cpp +++ b/ipc/test/auxiliary/native/src/test_service_proxy.cpp @@ -19,6 +19,8 @@ #include #include #include +#include +#include #include #include #include @@ -95,6 +97,52 @@ int TestServiceProxy::TestSyncTransaction(int value, int &reply, int delayTime) return ret; } +#ifdef FREEZE_PROCESS_SUPPORT +int TestServiceProxy::TestFreezeProcess() +{ + ZLOGI(LABEL, "TestFreezeProcess"); + + auto remote = Remote(); + if (remote == nullptr) { + ZLOGI(LABEL, "The obtained proxy is a null pointer"); + return -1; + } + + MessageOption option; + MessageParcel dataParcel; + MessageParcel replyParcel; + int ret = remote->SendRequest(TRANS_ID_TEST_FREEZE_PROCESS, dataParcel, replyParcel, option); + if (ret != ERR_NONE) { + return ret; + } + int pid = replyParcel.ReadInt32(); + ZLOGI(LABEL, "Get pid from server, server pid = %{public}d", pid); + + int timeout = 1000; + auto res = IPCSkeleton::FreezeProcess(pid, true, timeout); + if (res != ERR_NONE) { + ZLOGI(LABEL, "FreezeProcess failed, error code = %{public}d", res); + return res; + } + + bool isFreeze = false; + res = IPCSkeleton::CheckFreeze(pid, isFreeze); + if (res != ERR_NONE || !isFreeze) { + ZLOGI(LABEL, "CheckFreeze failed, error code = %{public}d isFreeze = %{public}d ",res, isFreeze); + return -1; + } + + ret = remote->SendRequest(TRANS_ID_TEST_FREEZE_PROCESS, dataParcel, replyParcel, option); + if (ret != ERR_NONE) { + ZLOGI(LABEL, "SendRequest failed, error code = %{public}d", ret); + return -1; + } + + ZLOGI(LABEL, "TestFreezeProcess success"); + return 0; +} +#endif // FREEZE_PROCESS_SUPPORT + int TestServiceProxy::TestSendTooManyRequest(int data, int &reply) { int ret = 0; diff --git a/ipc/test/auxiliary/native/src/test_service_stub.cpp b/ipc/test/auxiliary/native/src/test_service_stub.cpp index d9a082d6..549216b6 100644 --- a/ipc/test/auxiliary/native/src/test_service_stub.cpp +++ b/ipc/test/auxiliary/native/src/test_service_stub.cpp @@ -72,6 +72,9 @@ void TestServiceStub::InitMessageProcessMap() funcMap_[static_cast(TRANS_ID_UNREGISTER_REMOTE_STUB_OBJECT)] = &TestServiceStub::UnRegisterRemoteStub; funcMap_[static_cast(TRANS_ID_QUERY_REMOTE_PROXY_OBJECT)] = &TestServiceStub::QueryRemoteProxy; funcMap_[static_cast(TRANS_ID_QUERY_THREAD_INVOCATION_STATE)] = &TestServiceStub::ServerThreadInvocationState; +#ifdef FREEZE_PROCESS_SUPPORT + funcMap_[static_cast(TRANS_ID_TEST_FREEZE_PROCESS)] = &TestServiceStub::ServerTestFreezeProcess; +#endif // FREEZE_PROCESS_SUPPORT } int32_t TestServiceStub::ServerSyncTransaction(MessageParcel &data, MessageParcel &reply) @@ -483,4 +486,12 @@ int32_t TestServiceStub::ServerThreadInvocationState(MessageParcel &data, Messag reply.WriteInt32(ret); return ret; } + +#ifdef FREEZE_PROCESS_SUPPORT +int32_t TestServiceStub::ServerTestFreezeProcess(MessageParcel &data, MessageParcel &reply) +{ + reply.WriteInt32(getpid()); + return 0; +} +#endif // FREEZE_PROCESS_SUPPORT } // namespace OHOS diff --git a/test/unittest/ipc/native/src/core/source/BUILD.gn b/test/unittest/ipc/native/src/core/source/BUILD.gn index 8236f82c..c843dc2d 100644 --- a/test/unittest/ipc/native/src/core/source/BUILD.gn +++ b/test/unittest/ipc/native/src/core/source/BUILD.gn @@ -64,6 +64,10 @@ template("ipc_unittest") { "samgr:samgr_proxy", ] + if (ipc_freeze_process_support) { + defines += [ "FREEZE_PROCESS_SUPPORT" ] + } + if (hiviewdfx_hisysevent_support) { external_deps += [ "hisysevent:libhisysevent" ] } diff --git a/test/unittest/mock/mock_iremote_invoker.h b/test/unittest/mock/mock_iremote_invoker.h index b524b532..bb2d41a6 100644 --- a/test/unittest/mock/mock_iremote_invoker.h +++ b/test/unittest/mock/mock_iremote_invoker.h @@ -41,6 +41,10 @@ public: MOCK_METHOD3(SendReply, int(MessageParcel &reply, uint32_t flags, int32_t result)); MOCK_METHOD5(SendRequest, int(int handle, uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option)); +#ifdef FREEZE_PROCESS_SUPPORT + MOCK_METHOD3(FreezeProcess, int32_t(uint32_t pid, bool freeze, uint32_t timeout)); + MOCK_METHOD2(CheckFreeze, int32_t(uint32_t pid, bool &isFreeze)); +#endif // FREEZE_PROCESS_SUPPORT MOCK_METHOD2(AddDeathRecipient, bool(int32_t handle, void *cookie)); MOCK_METHOD2(RemoveDeathRecipient, bool(int32_t handle, void *cookie)); MOCK_METHOD1(SetMaxWorkThread, bool(int maxThreadNum)); -- Gitee From 901698d89acd56b4b2f5646ab0fb51f95d380255 Mon Sep 17 00:00:00 2001 From: dengliang <15934868816@139.com> Date: Wed, 3 Sep 2025 16:17:56 +0800 Subject: [PATCH 2/4] binder freeze process Signed-off-by: dengliang <15934868816@139.com> --- interfaces/innerkits/ipc_core/include/ipc_skeleton.h | 4 ++-- ipc/native/test/unittest/common/binder_invoker_unittest.cpp | 4 ++-- ipc/test/auxiliary/native/src/test_service_proxy.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/interfaces/innerkits/ipc_core/include/ipc_skeleton.h b/interfaces/innerkits/ipc_core/include/ipc_skeleton.h index 3cf4e1e7..d4f53b0c 100644 --- a/interfaces/innerkits/ipc_core/include/ipc_skeleton.h +++ b/interfaces/innerkits/ipc_core/include/ipc_skeleton.h @@ -213,8 +213,8 @@ public: * @brief Freeze or unfreeze a process. * @param pid Process ID to freeze or unfreeze. * @param freeze True to freeze the process, false to unfreeze it. - * @param timeout Timeout value in milliseconds to wait for the stub to finish processing requests - * before freezing. If the timeout is reached and processing is not completed, the freeze operation + * @param timeout Timeout value in milliseconds to wait for the stub to finish processing requests + * before freezing. If the timeout is reached and processing is not completed, the freeze operation * will be abandoned. * @return Returns {@link ERR_NONE} if the operation is successful; returns an error code * defined in {@link ipc_types.h} otherwise. diff --git a/ipc/native/test/unittest/common/binder_invoker_unittest.cpp b/ipc/native/test/unittest/common/binder_invoker_unittest.cpp index 48113a26..86e7ecdb 100644 --- a/ipc/native/test/unittest/common/binder_invoker_unittest.cpp +++ b/ipc/native/test/unittest/common/binder_invoker_unittest.cpp @@ -832,7 +832,7 @@ HWTEST_F(BinderInvokerUnitTest, GetInvocationStateTest001, TestSize.Level1) EXPECT_EQ(binderInvoker.GetInvocationState(), STATUS_FIRST_INVOKE); } -#ifdef FREEZE_PROCESS_SUPPORT +#ifdef FREEZE_PROCESS_SUPPORT /** * @tc.name: FreezeProcessTest001 * @tc.desc: cover FreezeProcess branch @@ -844,7 +844,7 @@ HWTEST_F(BinderInvokerUnitTest, FreezeProcessTest, TestSize.Level1) binderInvoker.binderConnector_ = nullptr; EXPECT_EQ(binderInvoker.FreezeProcess(1, true, 1), IPC_INVOKER_CONNECT_ERR); - BinderConnector *binderConnector = BinderConnector::GetInstance(); + BinderConnector *binderConnector = BinderConnector::GetInstance(); binderConnector->driverFD_ = -1; binderInvoker.binderConnector_ = binderConnector; EXPECT_EQ(binderInvoker.FreezeProcess(1, true, 1), IPC_INVOKER_CONNECT_ERR); diff --git a/ipc/test/auxiliary/native/src/test_service_proxy.cpp b/ipc/test/auxiliary/native/src/test_service_proxy.cpp index 10ed413a..b5e8b7b7 100644 --- a/ipc/test/auxiliary/native/src/test_service_proxy.cpp +++ b/ipc/test/auxiliary/native/src/test_service_proxy.cpp @@ -128,7 +128,7 @@ int TestServiceProxy::TestFreezeProcess() bool isFreeze = false; res = IPCSkeleton::CheckFreeze(pid, isFreeze); if (res != ERR_NONE || !isFreeze) { - ZLOGI(LABEL, "CheckFreeze failed, error code = %{public}d isFreeze = %{public}d ",res, isFreeze); + ZLOGI(LABEL, "CheckFreeze failed, error code = %{public}d isFreeze = %{public}d ", res, isFreeze); return -1; } -- Gitee From db0830f2ff814f0e98ee7e4d50b78b57168142f8 Mon Sep 17 00:00:00 2001 From: dengliang <15934868816@139.com> Date: Wed, 3 Sep 2025 16:53:17 +0800 Subject: [PATCH 3/4] binder freeze process Signed-off-by: dengliang <15934868816@139.com> --- ipc/native/test/unittest/common/binder_invoker_unittest.cpp | 2 +- .../binderinvokernew004_fuzzer/binderinvokernew004_fuzzer.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ipc/native/test/unittest/common/binder_invoker_unittest.cpp b/ipc/native/test/unittest/common/binder_invoker_unittest.cpp index 86e7ecdb..0157ea5e 100644 --- a/ipc/native/test/unittest/common/binder_invoker_unittest.cpp +++ b/ipc/native/test/unittest/common/binder_invoker_unittest.cpp @@ -862,7 +862,7 @@ HWTEST_F(BinderInvokerUnitTest, CheckFreezeTest, TestSize.Level1) binderInvoker.binderConnector_ = nullptr; EXPECT_EQ(binderInvoker.CheckFreeze(1, isFreeze), IPC_INVOKER_CONNECT_ERR); - BinderConnector *binderConnector = BinderConnector::GetInstance(); + BinderConnector *binderConnector = BinderConnector::GetInstance(); binderConnector->driverFD_ = -1; binderInvoker.binderConnector_ = binderConnector; EXPECT_EQ(binderInvoker.CheckFreeze(1, isFreeze), IPC_INVOKER_CONNECT_ERR); diff --git a/test/fuzztest/ipc/native/src/core/binderinvokernew/binderinvokernew004_fuzzer/binderinvokernew004_fuzzer.cpp b/test/fuzztest/ipc/native/src/core/binderinvokernew/binderinvokernew004_fuzzer/binderinvokernew004_fuzzer.cpp index 3c886ed5..c3b8c88f 100644 --- a/test/fuzztest/ipc/native/src/core/binderinvokernew/binderinvokernew004_fuzzer/binderinvokernew004_fuzzer.cpp +++ b/test/fuzztest/ipc/native/src/core/binderinvokernew/binderinvokernew004_fuzzer/binderinvokernew004_fuzzer.cpp @@ -42,7 +42,6 @@ static const std::vector cmdList = { binder_driver_return_protocol::BR_DEAD_BINDER, binder_driver_return_protocol::BR_CLEAR_DEATH_NOTIFICATION_DONE, binder_driver_return_protocol::BR_FAILED_REPLY, - binder_driver_return_protocol::BR_RELEASE_NODE, }; void HandleReplyFuzzTest(FuzzedDataProvider &provider) -- Gitee From 50a1839caf71a6cb20c28e6fe1daf994bfcbe075 Mon Sep 17 00:00:00 2001 From: dengliang <15934868816@139.com> Date: Fri, 5 Sep 2025 09:34:18 +0800 Subject: [PATCH 4/4] binder freeze process Signed-off-by: dengliang <15934868816@139.com> --- config.gni | 4 ++-- interfaces/innerkits/ipc_single/BUILD.gn | 4 ++-- .../core/dbinder/include/dbinder_base_invoker_interface.h | 4 ++-- ipc/native/test/unittest/common/BUILD.gn | 2 +- ipc/native/test/unittest/common/ipc_skeleton_unittest.cpp | 6 +----- ipc/test/auxiliary/native/BUILD.gn | 6 +++--- test/unittest/ipc/native/src/core/source/BUILD.gn | 2 +- 7 files changed, 12 insertions(+), 16 deletions(-) diff --git a/config.gni b/config.gni index 5d3c8bbd..1b3e9cc4 100644 --- a/config.gni +++ b/config.gni @@ -23,7 +23,7 @@ declare_args() { hiviewdfx_backtrace_support = false hiviewdfx_hisysevent_support = false ipc_proxy_dfx_backtrace_enabled = false - ipc_freeze_process_support = false + ipc_freeze_process_enabled = false } if (defined(global_parts_info) && @@ -48,5 +48,5 @@ if (defined(global_parts_info) && if (defined(global_parts_info) && defined(global_parts_info.officeservice_space_mgr_service)) { - ipc_freeze_process_support = true + ipc_freeze_process_enabled = true } \ No newline at end of file diff --git a/interfaces/innerkits/ipc_single/BUILD.gn b/interfaces/innerkits/ipc_single/BUILD.gn index 23d8913c..30e5ce17 100644 --- a/interfaces/innerkits/ipc_single/BUILD.gn +++ b/interfaces/innerkits/ipc_single/BUILD.gn @@ -122,7 +122,7 @@ ohos_shared_library("ipc_single") { if (hiviewdfx_hisysevent_support) { defines += [ "HIVIEWDFX_HISYSEVENT_SUPPORT" ] } - if (ipc_freeze_process_support) { + if (ipc_freeze_process_enabled) { defines += [ "FREEZE_PROCESS_SUPPORT" ] } innerapi_tags = [ @@ -167,7 +167,7 @@ ohos_shared_library("ipc_single_test") { if (hiviewdfx_hisysevent_support) { defines += [ "HIVIEWDFX_HISYSEVENT_SUPPORT" ] } - if (ipc_freeze_process_support) { + if (ipc_freeze_process_enabled) { defines += [ "FREEZE_PROCESS_SUPPORT" ] } innerapi_tags = [ diff --git a/ipc/native/src/core/dbinder/include/dbinder_base_invoker_interface.h b/ipc/native/src/core/dbinder/include/dbinder_base_invoker_interface.h index e179c402..cab1f462 100644 --- a/ipc/native/src/core/dbinder/include/dbinder_base_invoker_interface.h +++ b/ipc/native/src/core/dbinder/include/dbinder_base_invoker_interface.h @@ -190,13 +190,13 @@ template void DBinderBaseInvoker::FreeBuffer(void *data) #ifdef FREEZE_PROCESS_SUPPORT template -int32_t bool DBinderBaseInvoker::FreezeProcess(uint32_t pid, bool freeze, uint32_t timeout) +int32_t DBinderBaseInvoker::FreezeProcess(uint32_t pid, bool freeze, uint32_t timeout) { return ERR_NONE; } template -int32_t bool DBinderBaseInvoker::CheckFreeze(uint32_t pid, bool &isFreeze) +int32_t DBinderBaseInvoker::CheckFreeze(uint32_t pid, bool &isFreeze) { return ERR_NONE; } diff --git a/ipc/native/test/unittest/common/BUILD.gn b/ipc/native/test/unittest/common/BUILD.gn index 699de142..4053f230 100644 --- a/ipc/native/test/unittest/common/BUILD.gn +++ b/ipc/native/test/unittest/common/BUILD.gn @@ -62,7 +62,7 @@ template("ipc_unittest") { "samgr:samgr_proxy", ] - if (ipc_freeze_process_support) { + if (ipc_freeze_process_enabled) { defines = ["FREEZE_PROCESS_SUPPORT"] } diff --git a/ipc/native/test/unittest/common/ipc_skeleton_unittest.cpp b/ipc/native/test/unittest/common/ipc_skeleton_unittest.cpp index 8e35ca66..b0fd8830 100644 --- a/ipc/native/test/unittest/common/ipc_skeleton_unittest.cpp +++ b/ipc/native/test/unittest/common/ipc_skeleton_unittest.cpp @@ -920,19 +920,15 @@ HWTEST_F(IPCSkeletonTest, FreezeProcessTest, TestSize.Level1) ASSERT_NE(current, nullptr); MockIRemoteInvoker *binderInvoker = new (std::nothrow) MockIRemoteInvoker(); ASSERT_NE(binderInvoker, nullptr); - MockIRemoteInvoker *dbinderInvoker = new (std::nothrow) MockIRemoteInvoker(); - ASSERT_NE(dbinderInvoker, nullptr); current->invokers_[IRemoteObject::IF_PROT_DEFAULT] = binderInvoker; - current->invokers_[IRemoteObject::IF_PROT_DATABUS] = dbinderInvoker; EXPECT_CALL(*binderInvoker, FreezeProcess(testing::_, testing::_, testing::_)()) .WillRepeatedly(testing::Return(ERR_NONE)); ASSERT_EQ(IPCSkeleton::FreezeProcess(0, true, 0), ERR_NONE); - std::fill(current->invokers_, current->invokers_ + IPCThreadSkeleton::INVOKER_MAX_COUNT, nullptr); + current->invokers_[IRemoteObject::IF_PROT_DEFAULT] = nullptr; delete binderInvoker; - delete dbinderInvoker; } /** diff --git a/ipc/test/auxiliary/native/BUILD.gn b/ipc/test/auxiliary/native/BUILD.gn index e5d4b12a..ff2f7e9e 100644 --- a/ipc/test/auxiliary/native/BUILD.gn +++ b/ipc/test/auxiliary/native/BUILD.gn @@ -32,7 +32,7 @@ ohos_shared_library("ipc_test_helper") { "./src/test_service_stub.cpp", ] - if (ipc_freeze_process_support) { + if (ipc_freeze_process_enabled) { defines = [ "FREEZE_PROCESS_SUPPORT" ] } @@ -95,7 +95,7 @@ ohos_executable("ipc_client_test") { "$SUBSYSTEM_DIR/interfaces/innerkits/c_api:ipc_capi", ] - if (ipc_freeze_process_support) { + if (ipc_freeze_process_enabled) { defines = [ "FREEZE_PROCESS_SUPPORT" ] } @@ -134,7 +134,7 @@ ohos_shared_library("ipc_test_helper_extra") { "$SUBSYSTEM_DIR/config:ipc_util_config", ] - if (ipc_freeze_process_support) { + if (ipc_freeze_process_enabled) { defines = [ "FREEZE_PROCESS_SUPPORT" ] } diff --git a/test/unittest/ipc/native/src/core/source/BUILD.gn b/test/unittest/ipc/native/src/core/source/BUILD.gn index c843dc2d..f60cbe8a 100644 --- a/test/unittest/ipc/native/src/core/source/BUILD.gn +++ b/test/unittest/ipc/native/src/core/source/BUILD.gn @@ -64,7 +64,7 @@ template("ipc_unittest") { "samgr:samgr_proxy", ] - if (ipc_freeze_process_support) { + if (ipc_freeze_process_enabled) { defines += [ "FREEZE_PROCESS_SUPPORT" ] } -- Gitee