Fix subscription model encoding and notification races#1685
Open
chunhuidu-dev wants to merge 1 commit into
Open
Fix subscription model encoding and notification races#1685chunhuidu-dev wants to merge 1 commit into
chunhuidu-dev wants to merge 1 commit into
Conversation
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.
Description
One Line Summary
Prevents concurrent
OSSubscriptionModelmutations from crashing during archival or emitting stale, out-of-order subscription updates.Details
Motivation
Fixes #1588.
OSSubscriptionModel.encode(with:)previously read mutable reference fields while other queues could replace them. Archiving could therefore race ARC retain/release operations and crash inobjc_retain.State writes and
set(property:newValue:)notifications were also separate operations. Concurrent setters could update the model in one order but enqueue deltas in another order. Push subscription observers also rebuilt their snapshots from live state, which could combine values from different mutations.Scope
previousandcurrentvalues from paired mutation snapshots.Testing
Unit testing
Added deterministic tests that:
addressfield, mutate the model concurrently, then decode and verify the archive contains one consistent snapshot.Validation performed on an iPhone 16 simulator running iOS 26.5:
OneSignalUserTestsbuild-for-testing succeeded.testEncodingSubscriptionModel_withConcurrentMutation_usesConsistentSnapshotpassed.testConcurrentSubscriptionChangesNotifyInMutationOrderpassed.Manual testing
Physical-device testing was not performed because this is an internal synchronization fix covered by deterministic unit tests.
Affected code checklist
Checklist
Overview
Testing
OSSubscriptionModelconcurrency.Final pass