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

!1318 fix：add mutex for remoteDead status

Browse Source 
Merge pull request !1318 from Mark/master
This commit is contained in:
openharmony_ci 2024-08-30 11:20:10 +00:00 committed by Gitee
commit f4ff5b8106
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,7 +238,7 @@ public:
uint32_t GetStrongRefCountForStub();
private:
void MarkObjectDied();
void SetObjectDied(bool isDied);
int SendLocalRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &optionoption);
int SendRequestInner(bool isLocal, uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option);
void ClearDeathRecipients();
@ -357,7 +357,7 @@ private:
const uint32_t handle_;
int proto_;
bool isFinishInit_;
bool isRemoteDead_;
std::atomic<bool> isRemoteDead_;
std::u16string remoteDescriptor_;
std::u16string interfaceDesc_;
int lastErr_ = 0;

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

@ -201,7 +201,7 @@ int IPCObjectProxy::SendRequestInner(bool isLocal, uint32_t code, MessageParcel
int status = invoker->SendRequest(handle_, code, data, reply, option);
if (status == ERR_DEAD_OBJECT) {
MarkObjectDied();
SetObjectDied(true);
}
return status;
}
@ -354,7 +354,7 @@ void IPCObjectProxy::WaitForInit(const void *dbinderData)
if (IsObjectDead()) {
ZLOGW(LABEL, "proxy is dead, init again, handle:%{public}d desc:%{public}s",
handle_, ProcessSkeleton::ConvertToSecureDesc(desc).c_str());
isRemoteDead_ = false;
SetObjectDied(false);
isFinishInit_ = false;
}
@ -372,7 +372,7 @@ void IPCObjectProxy::WaitForInit(const void *dbinderData)
if (proto_ == IRemoteObject::IF_PROT_DATABUS) {
if (!CheckHaveSession()) {
SetProto(IRemoteObject::IF_PROT_ERROR);
isRemoteDead_ = true;
SetObjectDied(true);
}
}
#endif
@ -382,7 +382,7 @@ void IPCObjectProxy::WaitForInit(const void *dbinderData)
if (proto_ == IRemoteObject::IF_PROT_DATABUS) {
if (IncRefToRemote() != ERR_NONE) {
SetProto(IRemoteObject::IF_PROT_ERROR);
isRemoteDead_ = true;
SetObjectDied(true);
}
}
#endif
@ -420,15 +420,14 @@ void IPCObjectProxy::OnLastStrongRef(const void *objectId)
current->DetachObject(this);
}
/* mutex_ should be called before set or get isRemoteDead_ status */
void IPCObjectProxy::MarkObjectDied()
void IPCObjectProxy::SetObjectDied(bool isDied)
{
isRemoteDead_ = true;
isRemoteDead_.store(isDied);
}
bool IPCObjectProxy::IsObjectDead() const
{
return isRemoteDead_;
return isRemoteDead_.load();
}
bool IPCObjectProxy::AddDeathRecipient(const sptr<DeathRecipient> &recipient)
@ -542,10 +541,10 @@ void IPCObjectProxy::SendObituary()
}
}
#endif
SetObjectDied(true);
std::vector<sptr<DeathRecipient>> toBeReport;
{
std::lock_guard<std::recursive_mutex> lock(mutex_);
MarkObjectDied();
toBeReport = recipients_;
recipients_.clear();
}
@ -650,7 +649,7 @@ bool IPCObjectProxy::UpdateProto(const void *dbinderData)
if (data != nullptr && data->proto == IRemoteObject::IF_PROT_DATABUS) {
dbinderData_ = std::make_unique<uint8_t[]>(sizeof(dbinder_negotiation_data));
if (dbinderData_ == nullptr) {
isRemoteDead_ = true;
SetObjectDied(true);
SetProto(IRemoteObject::IF_PROT_ERROR);
ZLOGE(LABEL, "malloc dbinderData fail, handle:%{public}d", handle_);
return false;
@ -659,7 +658,7 @@ bool IPCObjectProxy::UpdateProto(const void *dbinderData)
*tmp = *data;
if (!UpdateDatabusClientSession()) {
ZLOGE(LABEL, "UpdateDatabusClientSession fail, handle:%{public}d", handle_);
isRemoteDead_ = true;
SetObjectDied(true);
SetProto(IRemoteObject::IF_PROT_ERROR);
dbinderData_ = nullptr;
return false;