Make sure -_completePendingLayoutTransition is called without the node's instance lock #trivial #1023
Conversation
This file contains 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
…e's instance lock #trivial This is because comming the layout transition (aka `-_completeLayoutTransition:`) results in subnode insertions and removals which must be called lock-free.
nguyenhuy
commented
Jul 12, 2018
| _pendingLayoutTransition = [[ASLayoutTransition alloc] initWithNode:self | ||
| pendingLayout:nextLayout | ||
| previousLayout:_calculatedDisplayNodeLayout]; | ||
|
|
There was a problem hiding this comment.
Nothing changed above this line, just adding a new scope for the mutex locker and grab layout pending state while we still have the lock.
nguyenhuy
commented
Jul 12, 2018
| ASDN::MutexLocker l(__instanceLock__); | ||
| pendingLayoutTransition = _pendingLayoutTransition; | ||
| if (pendingLayoutTransition != nil) { | ||
| [self _locked_setCalculatedDisplayNodeLayout:pendingLayoutTransition.pendingLayout]; |
There was a problem hiding this comment.
Micro optimization: Call the _locked_ variant of this operation to avoid another lock/unlock pair later on.
|
🚫 CI failed with log |
maicki
approved these changes
Jul 12, 2018
Adlai-Holler
approved these changes
Jul 12, 2018
nguyenhuy
added a commit
to nguyenhuy/Texture
that referenced
this pull request
Jul 12, 2018
- Rename `ASDisplayNodeAssertLockUnownedByCurrentThread` to `ASDisplayNodeAssertLockNotHeld`, and `ASDisplayNodeAssertLockOwnedByCurrentThread` to `ASDisplayNodeAssertLockHeld` -> shorter and hopefully easier to distinguish between the two. - Add assertions to `_locked_` and `_u_` (i.e "unlocked") methods. - Turn `CHECK_LOCKING_SAFETY` flag on by default. After TextureGroup#1022 and TextureGroup#1023, we're in a good shape to actually enforce locked/unlocked requirements of internal methods. Our test suite passed, and we'll test more at Pinterest after the sync this week. - Fix ASVideoNode to avoid calling `play` while holding the lock. That method inserts a subnode and must be called lock free. - Other minor changes.
nguyenhuy
added a commit
that referenced
this pull request
Jul 13, 2018
- Rename `ASDisplayNodeAssertLockUnownedByCurrentThread` to `ASAssertUnlocked`, and `ASDisplayNodeAssertLockOwnedByCurrentThread` to `ASAssertLocked` -> shorter and hopefully easier to distinguish between the two. - Add assertions to `_locked_` and `_u_` (i.e "unlocked") methods. - Turn `CHECK_LOCKING_SAFETY` flag on by default. After #1022 and #1023, we're in a good shape to actually enforce locked/unlocked requirements of internal methods. Our test suite passed, and we'll test more at Pinterest after the sync this week. - Fix ASVideoNode to avoid calling `play` while holding the lock. That method inserts a subnode and must be called lock free. - Simplify `_loaded(node)` to only nil-check `_layer` because regardless of whether the node is view or layer backed, the layer should always be set if loaded. Use it throughout. - Other minor changes.
mikezucc
pushed a commit
to mikezucc/Texture
that referenced
this pull request
Oct 2, 2018
…e's instance lock #trivial (TextureGroup#1023) This is because committing the layout transition (aka `-_completeLayoutTransition:`) results in subnode insertions and removals which must be called lock-free.
mikezucc
pushed a commit
to mikezucc/Texture
that referenced
this pull request
Oct 2, 2018
- Rename `ASDisplayNodeAssertLockUnownedByCurrentThread` to `ASAssertUnlocked`, and `ASDisplayNodeAssertLockOwnedByCurrentThread` to `ASAssertLocked` -> shorter and hopefully easier to distinguish between the two. - Add assertions to `_locked_` and `_u_` (i.e "unlocked") methods. - Turn `CHECK_LOCKING_SAFETY` flag on by default. After TextureGroup#1022 and TextureGroup#1023, we're in a good shape to actually enforce locked/unlocked requirements of internal methods. Our test suite passed, and we'll test more at Pinterest after the sync this week. - Fix ASVideoNode to avoid calling `play` while holding the lock. That method inserts a subnode and must be called lock free. - Simplify `_loaded(node)` to only nil-check `_layer` because regardless of whether the node is view or layer backed, the layer should always be set if loaded. Use it throughout. - Other minor changes.
Merged
maicki
added a commit
that referenced
this pull request
Nov 1, 2018
maicki
added a commit
that referenced
this pull request
Nov 3, 2018
nguyenhuy
pushed a commit
that referenced
this pull request
Nov 3, 2018
mikezucc
pushed a commit
to mikezucc/Texture
that referenced
this pull request
Nov 7, 2018
We will revert TextureGroup#1023. The current solution introduces problems if we are unlocking before calling _completePendingLayoutTransition. _completePendingLayoutTransition needs to be happening in one transaction if called from _u_measureNodeWithBoundsIfNecessary.
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.
This is because committing the layout transition (aka
-_completeLayoutTransition:) results in subnode insertions and removals which must be called lock-free.