openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-24 22:21:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

!3544 多线程操作callback_导致崩溃

Browse Source 
Merge pull request !3544 from yangliang36/yl1025
This commit is contained in:
openharmony_ci
2022-10-27 07:18:14 +00:00
committed by Gitee
parent 926c4dd09e f428ad3aa7
commit f52ba75c75
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/native/appkit/ability_runtime/context/application_context.cpp
+13 -1
View File
@@ -42,6 +42,7 @@ void ApplicationContext::RegisterAbilityLifecycleCallback(
if (abilityLifecycleCallback == nullptr) {
return;
}
std::lock_guard<std::mutex> lock(callbackLock_);
callbacks_.push_back(abilityLifecycleCallback);
}
@@ -49,14 +50,16 @@ void ApplicationContext::UnregisterAbilityLifecycleCallback(
const std::shared_ptr<AbilityLifecycleCallback> &abilityLifecycleCallback)
{
HILOG_DEBUG("ApplicationContext UnregisterAbilityLifecycleCallback");
std::lock_guard<std::mutex> lock(callbackLock_);
auto it = std::find(callbacks_.begin(), callbacks_.end(), abilityLifecycleCallback);
if (it != callbacks_.end()) {
callbacks_.erase(it);
}
}
bool ApplicationContext::IsAbilityLifecycleCallbackEmpty() const
bool ApplicationContext::IsAbilityLifecycleCallbackEmpty()
{
std::lock_guard<std::mutex> lock(callbackLock_);
return callbacks_.empty();
}
@@ -86,6 +89,7 @@ void ApplicationContext::DispatchOnAbilityCreate(const std::shared_ptr<NativeRef
HILOG_ERROR("ability is nullptr");
return;
}
std::lock_guard<std::mutex> lock(callbackLock_);
for (auto callback : callbacks_) {
if (callback != nullptr) {
callback->OnAbilityCreate(ability);
@@ -100,6 +104,7 @@ void ApplicationContext::DispatchOnWindowStageCreate(const std::shared_ptr<Nativ
HILOG_ERROR("ability or windowStage is nullptr");
return;
}
std::lock_guard<std::mutex> lock(callbackLock_);
for (auto callback : callbacks_) {
if (callback != nullptr) {
callback->OnWindowStageCreate(ability, windowStage);
@@ -114,6 +119,7 @@ void ApplicationContext::DispatchOnWindowStageDestroy(const std::shared_ptr<Nati
HILOG_ERROR("ability or windowStage is nullptr");
return;
}
std::lock_guard<std::mutex> lock(callbackLock_);
for (auto callback : callbacks_) {
if (callback != nullptr) {
callback->OnWindowStageDestroy(ability, windowStage);
@@ -129,6 +135,7 @@ void ApplicationContext::DispatchWindowStageFocus(const std::shared_ptr<NativeRe
HILOG_ERROR("ability or windowStage is nullptr");
return;
}
std::lock_guard<std::mutex> lock(callbackLock_);
for (auto callback : callbacks_) {
if (callback != nullptr) {
callback->OnWindowStageActive(ability, windowStage);
@@ -144,6 +151,7 @@ void ApplicationContext::DispatchWindowStageUnfocus(const std::shared_ptr<Native
HILOG_ERROR("ability or windowStage is nullptr");
return;
}
std::lock_guard<std::mutex> lock(callbackLock_);
for (auto callback : callbacks_) {
if (callback != nullptr) {
callback->OnWindowStageInactive(ability, windowStage);
@@ -157,6 +165,7 @@ void ApplicationContext::DispatchOnAbilityDestroy(const std::shared_ptr<NativeRe
HILOG_ERROR("ability is nullptr");
return;
}
std::lock_guard<std::mutex> lock(callbackLock_);
for (auto callback : callbacks_) {
if (callback != nullptr) {
callback->OnAbilityDestroy(ability);
@@ -170,6 +179,7 @@ void ApplicationContext::DispatchOnAbilityForeground(const std::shared_ptr<Nativ
HILOG_ERROR("ability is nullptr");
return;
}
std::lock_guard<std::mutex> lock(callbackLock_);
for (auto callback : callbacks_) {
if (callback != nullptr) {
callback->OnAbilityForeground(ability);
@@ -183,6 +193,7 @@ void ApplicationContext::DispatchOnAbilityBackground(const std::shared_ptr<Nativ
HILOG_ERROR("ability is nullptr");
return;
}
std::lock_guard<std::mutex> lock(callbackLock_);
for (auto callback : callbacks_) {
if (callback != nullptr) {
callback->OnAbilityBackground(ability);
@@ -196,6 +207,7 @@ void ApplicationContext::DispatchOnAbilityContinue(const std::shared_ptr<NativeR
HILOG_ERROR("ability is nullptr");
return;
}
std::lock_guard<std::mutex> lock(callbackLock_);
for (auto callback : callbacks_) {
if (callback != nullptr) {
callback->OnAbilityContinue(ability);
interfaces/kits/native/appkit/ability_runtime/context/application_context.h
+2 -1
View File
@@ -32,7 +32,7 @@ public:
~ApplicationContext() = default;
void RegisterAbilityLifecycleCallback(const std::shared_ptr<AbilityLifecycleCallback> &abilityLifecycleCallback);
void UnregisterAbilityLifecycleCallback(const std::shared_ptr<AbilityLifecycleCallback> &abilityLifecycleCallback);
bool IsAbilityLifecycleCallbackEmpty() const;
bool IsAbilityLifecycleCallbackEmpty();
void RegisterEnvironmentCallback(const std::shared_ptr<EnvironmentCallback> &environmentCallback);
void UnregisterEnvironmentCallback(const std::shared_ptr<EnvironmentCallback> &environmentCallback);
void DispatchOnAbilityCreate(const std::shared_ptr<NativeReference> &ability);
@@ -83,6 +83,7 @@ private:
std::shared_ptr<ContextImpl> contextImpl_;
static std::vector<std::shared_ptr<AbilityLifecycleCallback>> callbacks_;
static std::vector<std::shared_ptr<EnvironmentCallback>> envCallbacks_;
std::mutex callbackLock_;
};
} // namespace AbilityRuntime
} // namespace OHOS