openharmony/filemanagement_user_file_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/filemanagement_user_file_service synced 2025-02-06 16:00:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: add Death monitoring

Browse Source 
Signed-off-by: caochuan <caochuan@huawei.com>
This commit is contained in:
caochuan 2023-10-07 16:48:00 +08:00
parent 4c14a7c500
commit 4b381c60d5
4 changed files with 110 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
interfaces/inner_api/file_access/src/js_file_access_ext_ability.cpp
View File

@ -1686,6 +1686,7 @@ int JsFileAccessExtAbility::StopWatcher(const Uri &uri)
int JsFileAccessExtAbility::Notify(Uri &uri, NotifyType notifyType)
{
HILOG_ERROR("enter Notify, uri:%{public}s", uri.ToString().c_str());
UserAccessTracer trace;
trace.Start("Notify");
auto proxy = FileAccessServiceProxy::GetInstance();

18
services/native/file_access_service/include/file_access_service.h
View File

@ -161,16 +161,34 @@ public:
sptr<IFileAccessExtBase> &extensionProxy) override;
private:
class ExtensionDeathRecipient : public IRemoteObject::DeathRecipient {
public:
ExtensionDeathRecipient() = default;
virtual void OnRemoteDied(const wptr<IRemoteObject>& remote);
virtual ~ExtensionDeathRecipient() = default;
};
class ObserverDeathRecipient : public IRemoteObject::DeathRecipient {
public:
ObserverDeathRecipient() = default;
virtual void OnRemoteDied(const wptr<IRemoteObject>& remote);
virtual ~ObserverDeathRecipient() = default;
};
void CleanRelativeObserver(const sptr<IFileAccessObserver> &observer);
void SendListNotify(std::string uri, NotifyType notifyType, const std::vector<uint32_t> &list);
void RemoveRelations(std::string &uriStr, std::shared_ptr<ObserverNode> obsNode);
int FindUri(const std::string &uriStr, std::shared_ptr<ObserverNode> &outObsNode);
int32_t ConnectExtension();
void ResetProxy();
FileAccessService();
bool IsServiceReady() const;
void InitTimer();
std::shared_ptr<OnDemandTimer> onDemandTimer_ = nullptr;
sptr<IFileAccessExtBase> extensionProxy_{nullptr};
static sptr<FileAccessService> instance_;
sptr<IRemoteObject::DeathRecipient> extensionDeathRecipient_;
sptr<IRemoteObject::DeathRecipient> observerDeathRecipient_;
bool ready_ = false;
static std::mutex mutex_;
std::mutex nodeMutex_;

141
services/native/file_access_service/src/file_access_service.cpp
View File

@ -60,6 +60,12 @@ sptr<FileAccessService> FileAccessService::GetInstance()
FileAccessService::FileAccessService() : SystemAbility(FILE_ACCESS_SERVICE_ID, false)
{
InitTimer();
if (extensionDeathRecipient_ == nullptr) {
extensionDeathRecipient_ = new ExtensionDeathRecipient();
}
if (observerDeathRecipient_ == nullptr) {
observerDeathRecipient_ = new ObserverDeathRecipient();
}
}
void FileAccessService::OnStart()
@ -125,48 +131,22 @@ static bool IsChildUri(const string &comparedUriStr, string &srcUriStr)
return false;
}
// static sptr<IFileAccessExtBase> getExtensionProxy() {
// auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
// if (samgr == nullptr) {
// HILOG_ERROR("cjw Samgr is nullptr");
// return nullptr;
// }
// auto remote = samgr->GetSystemAbility(5003);
// if (remote == nullptr) {
// HILOG_ERROR("cjw get remote failed");
// return nullptr;
// }
// AAFwk::Want want;
// want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility");
// sptr<FileAccessExtConnection> fileAccessExtConnection(new(std::nothrow) FileAccessExtConnection());
// if (fileAccessExtConnection == nullptr) {
// HILOG_ERROR("cjw new fileAccessExtConnection fail");
// return nullptr;
// }
// if (!fileAccessExtConnection->IsExtAbilityConnected()) {
// fileAccessExtConnection->ConnectFileExtAbility(want, remote);
// }
// return fileAccessExtConnection->GetFileExtProxy();
// }
int32_t FileAccessService::ConnectExtension()
{
std::lock_guard<std::mutex> lock(mutex_);
HILOG_ERROR("cjw enter ConnectExtension");
lock_guard<mutex> lock(mutex_);
if (extensionProxy_ != nullptr) {
return ERR_OK;
}
auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
if (samgr == nullptr) {
HILOG_ERROR("cjw Samgr is nullptr");
HILOG_ERROR("Samgr is nullptr");
return E_CONNECT;
}
auto remote = samgr->GetSystemAbility(5003);
auto remote = samgr->GetSystemAbility(STORAGE_MANAGER_MANAGER_ID);
if (remote == nullptr) {
HILOG_ERROR("cjw get remote failed");
HILOG_ERROR("get remote failed");
return E_CONNECT;
}
@ -174,16 +154,62 @@ int32_t FileAccessService::ConnectExtension()
want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility");
sptr<FileAccessExtConnection> fileAccessExtConnection(new(std::nothrow) FileAccessExtConnection());
if (fileAccessExtConnection == nullptr) {
HILOG_ERROR("cjw new fileAccessExtConnection fail");
HILOG_ERROR("new fileAccessExtConnection fail");
return E_CONNECT;
}
if (!fileAccessExtConnection->IsExtAbilityConnected()) {
fileAccessExtConnection->ConnectFileExtAbility(want, remote);
}
extensionProxy_ = fileAccessExtConnection->GetFileExtProxy();
auto object = extensionProxy_->AsObject();
object->AddDeathRecipient(extensionDeathRecipient_);
return ERR_OK;
}
void FileAccessService::ResetProxy()
{
if (extensionProxy_ != nullptr && extensionDeathRecipient_ != nullptr) {
extensionProxy_->AsObject()->RemoveDeathRecipient(extensionDeathRecipient_);
}
if (ConnectExtension() != ERR_OK) {
HILOG_ERROR("ResetProxy failed");
}
}
void FileAccessService::ExtensionDeathRecipient::OnRemoteDied(const wptr<IRemoteObject> &remote)
{
HILOG_ERROR("FileAccessService::ExtensionDeathRecipient::OnRemoteDied, remote obj died.");
FileAccessService::GetInstance()->ResetProxy();
}
void FileAccessService::ObserverDeathRecipient::OnRemoteDied(const wptr<IRemoteObject> &remote)
{
HILOG_ERROR("FileAccessService::ObserverDeathRecipient::OnRemoteDied, remote obj died.");
if (remote == nullptr || remote.promote() == nullptr) {
return;
}
sptr<IFileAccessObserver> observer = iface_cast<IFileAccessObserver>(remote.promote());
FileAccessService::GetInstance()->CleanRelativeObserver(observer);
}
void FileAccessService::CleanRelativeObserver(const sptr<IFileAccessObserver> &observer)
{
shared_ptr<ObserverContext> obsContext = make_shared<ObserverContext>(observer);
uint32_t code = obsManager_.getId([obsContext](const shared_ptr<ObserverContext> &afterContext) {
return obsContext->EqualTo(afterContext);
});
for (auto pair : relationshipMap_) {
auto codeList = pair.second->obsCodeList_;
auto haveCodeIter = find_if(codeList.begin(), codeList.end(),
[code](const uint32_t &listCode) { return code == listCode; });
if (haveCodeIter != codeList.end()) {
Uri uri(pair.first);
UnregisterNotify(uri, observer);
}
}
}
int32_t FileAccessService::RegisterNotify(Uri uri, bool notifyForDescendants, const sptr<IFileAccessObserver> &observer)
{
UserAccessTracer trace;
@ -197,6 +223,8 @@ int32_t FileAccessService::RegisterNotify(Uri uri, bool notifyForDescendants, co
// this is new callback, save this context
obsContext->Ref();
code = obsManager_.save(obsContext);
auto object = obsContext->obs_->AsObject();
object->AddDeathRecipient(observerDeathRecipient_);
} else {
// this callback is already in manager, add ref.
obsManager_.get(code)->Ref();
@ -228,13 +256,15 @@ int32_t FileAccessService::RegisterNotify(Uri uri, bool notifyForDescendants, co
HILOG_ERROR("cjw Creator get invalid fileExtProxy");
return E_CONNECT;
}
extensionProxy_->StartWatcher(uri);
// auto fileExtProxy = getExtensionProxy();
// if (fileExtProxy == nullptr) {
// HILOG_ERROR("cjw Creator get invalid fileExtProxy");
// return E_CONNECT;
// }
// fileExtProxy->StartWatcher(uri);
size_t uriIndex = uriStr.find("file://");
Uri tempUri(uriStr.substr(uriIndex));
HILOG_ERROR("startWatcher tempUri = %{public}s", tempUri.ToString().c_str());
if(extensionProxy_ == nullptr) {
HILOG_ERROR("Creator get invalid fileExtProxy");
return E_CONNECT;
}
extensionProxy_->StartWatcher(tempUri);
}
obsNode = make_shared<ObserverNode>(notifyForDescendants);
// add new node relations.
@ -303,13 +333,15 @@ int32_t FileAccessService::CleanAllNotify(Uri uri)
HILOG_ERROR("cjw Creator get invalid fileExtProxy");
return E_CONNECT;
}
extensionProxy_->StopWatcher(uri);
// auto fileExtProxy = getExtensionProxy();
// if (fileExtProxy == nullptr) {
// HILOG_ERROR("cjw Creator get invalid fileExtProxy");
// return E_CONNECT;
// }
// fileExtProxy->StopWatcher(uri);
size_t uriIndex = uriStr.find("file://");
Uri tempUri(uriStr.substr(uriIndex));
HILOG_ERROR("StopWatcher tempUri = %{public}s", tempUri.ToString().c_str());
if(extensionProxy_ == nullptr) {
HILOG_ERROR("Creator get invalid fileExtProxy");
return E_CONNECT;
}
extensionProxy_->StopWatcher(tempUri);
RemoveRelations(uriStr, obsNode);
return ERR_OK;
}
@ -359,13 +391,15 @@ int32_t FileAccessService::UnregisterNotify(Uri uri, const sptr<IFileAccessObser
HILOG_ERROR("cjw Creator get invalid fileExtProxy");
return E_CONNECT;
}
extensionProxy_->StopWatcher(uri);
// auto fileExtProxy = getExtensionProxy();
// if (fileExtProxy == nullptr) {
// HILOG_ERROR("cjw Creator get invalid fileExtProxy");
// return E_CONNECT;
// }
// fileExtProxy->StopWatcher(uri);
size_t uriIndex = uriStr.find("file://");
Uri tempUri(uriStr.substr(uriIndex));
HILOG_ERROR("StopWatcher tempUri = %{public}s", tempUri.ToString().c_str());
if(extensionProxy_ == nullptr) {
HILOG_ERROR("Creator get invalid fileExtProxy");
return E_CONNECT;
}
extensionProxy_->StopWatcher(tempUri);
RemoveRelations(uriStr, obsNode);
return ERR_OK;
}
@ -408,6 +442,7 @@ void FileAccessService::SendListNotify(string uriStr, NotifyType notifyType, con
int32_t FileAccessService::OnChange(Uri uri, NotifyType notifyType)
{
HILOG_ERROR("enter onchange uri = %{public}s", uri.ToString().c_str());
UserAccessTracer trace;
trace.Start("OnChange");
string uriStr = uri.ToString();

3
services/native/file_access_service/src/file_access_service_proxy.cpp
View File

@ -94,6 +94,7 @@ static int GetUserId()
int32_t FileAccessServiceProxy::OnChange(Uri uri, NotifyType notifyType)
{
HILOG_ERROR("cjw enter onchange uri = %{public}s", uri.ToString().c_str());
UserAccessTracer trace;
trace.Start("OnChange");
MessageParcel data;
@ -134,6 +135,7 @@ int32_t FileAccessServiceProxy::OnChange(Uri uri, NotifyType notifyType)
int32_t FileAccessServiceProxy::RegisterNotify(Uri uri, bool notifyForDescendants,
const sptr<IFileAccessObserver> &observer)
{
HILOG_ERROR("cjw enter RegisterNotify uri = %{public}s", uri.ToString().c_str());
UserAccessTracer trace;
trace.Start("RegisterNotify");
MessageParcel data;
@ -198,6 +200,7 @@ int32_t FileAccessServiceProxy::UnregisterNotifyInternal(MessageParcel &data)
int32_t FileAccessServiceProxy::UnregisterNotify(Uri uri, const sptr<IFileAccessObserver> &observer)
{
HILOG_ERROR("cjw enter UnregisterNotifyInternal uri = %{public}s", uri.ToString().c_str());
UserAccessTracer trace;
trace.Start("UnregisterNotify");
MessageParcel data;