Fix OHOS deadlock when release() and OnSurfaceDestroyedCB race for the same mutex. - #3522
Merged
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #3522 +/- ##
==========================================
+ Coverage 81.06% 81.10% +0.04%
==========================================
Files 626 626
Lines 71226 71226
Branches 20826 20826
==========================================
+ Hits 57737 57770 +33
+ Misses 9352 9344 -8
+ Partials 4137 4112 -25 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
shlzxjp
approved these changes
Jun 22, 2026
CodeJhF
added a commit
that referenced
this pull request
Jun 23, 2026
CodeJhF
added a commit
that referenced
this pull request
Jun 23, 2026
CodeJhF
added a commit
that referenced
this pull request
Jun 23, 2026
CodeJhF
added a commit
that referenced
this pull request
Jun 23, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
Fixes #3438
On OHOS platform, a deadlock can occur when
release()andOnSurfaceDestroyedCBrace for the same mutex inJPAGView/JPAGImageView:release()→ acquireslocker→animator->cancel()may wait for the animation threadOnSurfaceDestroyedCB→ finds listener inXComponentListeners→ callsonSurfaceDestroyed()→ tries to acquirelocker→ deadlockFix
Call
XComponentHandler::RemoveListener(id)at the very beginning ofrelease(), before acquiring the mutex. This disconnects the view from XComponent callbacks so the callback thread can no longer reach the mutex, eliminating the deadlock.The double-remove is safe:
RemoveListenerreturnsfalseharmlessly if the key is already gone (thenapi_wrapfinalizer also callsRemoveListenerlater during GC).