-
Notifications
You must be signed in to change notification settings - Fork 712
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
State tracking based - isa swizzle #492
Draft
naftaly
wants to merge
3
commits into
kstenerud:master
Choose a base branch
from
naftaly:State-tracking-based-on-isa-Swizzle
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
#import "KSCrashAppStateTracker.h" | ||
|
||
NS_ASSUME_NONNULL_BEGIN | ||
|
||
@interface KSCrashAppStateTracker () | ||
|
||
- (void)_setTransitionState:(KSCrashAppTransitionState)transitionState; | ||
|
||
@property (nonatomic, assign) BOOL proxied; | ||
|
||
@end | ||
|
||
NS_ASSUME_NONNULL_END |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,6 +40,7 @@ | |
case KSCrashAppTransitionStateStartupPrewarm: return "prewarm"; | ||
case KSCrashAppTransitionStateActive: return "active"; | ||
case KSCrashAppTransitionStateLaunching: return "launching"; | ||
case KSCrashAppTransitionStateLaunched: return "launched"; | ||
case KSCrashAppTransitionStateBackground: return "background"; | ||
case KSCrashAppTransitionStateTerminating: return "terminating"; | ||
case KSCrashAppTransitionStateExiting: return "exiting"; | ||
|
@@ -60,6 +61,7 @@ bool ksapp_transition_state_is_user_perceptible(KSCrashAppTransitionState state) | |
|
||
case KSCrashAppTransitionStateStartup: | ||
case KSCrashAppTransitionStateLaunching: | ||
case KSCrashAppTransitionStateLaunched: | ||
case KSCrashAppTransitionStateForegrounding: | ||
case KSCrashAppTransitionStateActive: | ||
case KSCrashAppTransitionStateDeactivating: | ||
|
@@ -109,8 +111,13 @@ @interface KSCrashAppStateTracker () { | |
// transition state and observers protected by the lock | ||
os_unfair_lock _lock; | ||
KSCrashAppTransitionState _transitionState; | ||
BOOL _transitionComplete; | ||
NSMutableArray<id<KSCrashAppStateTrackerObserving>> *_observers; | ||
BOOL _proxied; | ||
} | ||
|
||
@property (nonatomic, assign) BOOL proxied; | ||
|
||
@end | ||
|
||
@implementation KSCrashAppStateTracker | ||
|
@@ -156,6 +163,15 @@ - (void)dealloc | |
[self stop]; | ||
} | ||
|
||
- (void)setProxied:(BOOL)proxied | ||
{ | ||
_proxied = proxied; | ||
if (proxied) { | ||
[self stop]; | ||
_registrations = @[]; | ||
} | ||
} | ||
|
||
// Observers are either an object passed in that | ||
// implements `KSCrashAppStateTrackerObserving` or a block. | ||
// Both will be wrapped in a `KSCrashAppStateTrackerBlockObserver`. | ||
|
@@ -233,20 +249,62 @@ - (KSCrashAppTransitionState)transitionState | |
return ret; | ||
} | ||
|
||
- (void)_locked_completeState:(KSCrashAppTransitionState)transitionState | ||
{ | ||
if (_transitionState != transitionState || _transitionComplete) { | ||
return; | ||
} | ||
|
||
_transitionComplete = YES; | ||
NSLog(@"[AC] %s, completed: %d", ksapp_transition_state_to_string(transitionState), _transitionComplete); | ||
|
||
// send delegate | ||
// ie: didCompleteTransition or something... | ||
} | ||
|
||
- (void)_completeState:(KSCrashAppTransitionState)transitionState | ||
{ | ||
os_unfair_lock_lock(&_lock); | ||
[self _locked_completeState:transitionState]; | ||
os_unfair_lock_unlock(&_lock); | ||
} | ||
|
||
- (void)_setTransitionState:(KSCrashAppTransitionState)transitionState | ||
{ | ||
BOOL completeOnNextLoop = NO; | ||
NSArray<id<KSCrashAppStateTrackerObserving>> *observers = nil; | ||
{ | ||
os_unfair_lock_lock(&_lock); | ||
|
||
if (_transitionState != transitionState) { | ||
|
||
// finalize the current state | ||
[self _locked_completeState:_transitionState]; | ||
|
||
// move to the next state | ||
_transitionState = transitionState; | ||
_transitionComplete = NO; | ||
completeOnNextLoop = YES; | ||
observers = [_observers copy]; | ||
} | ||
|
||
os_unfair_lock_unlock(&_lock); | ||
} | ||
|
||
for (id<KSCrashAppStateTrackerObserving> obs in observers) { | ||
[obs appStateTracker:self didTransitionToState:transitionState]; | ||
if (observers) { | ||
NSLog(@"[AC] %s, completed: %d", ksapp_transition_state_to_string(transitionState), _transitionComplete); | ||
|
||
for (id<KSCrashAppStateTrackerObserving> obs in observers) { | ||
[obs appStateTracker:self didTransitionToState:transitionState]; | ||
} | ||
} | ||
|
||
|
||
if (completeOnNextLoop) { | ||
__weak typeof(self)weakMe = self; | ||
CFRunLoopPerformBlock(CFRunLoopGetCurrent(), kCFRunLoopCommonModes, ^{ | ||
[weakMe _locked_completeState:transitionState]; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. So you ensure that all current processing related to the state change is fully completed before marking the transition as complete, but notify observers right away? |
||
}); | ||
} | ||
} | ||
|
||
|
@@ -287,7 +345,7 @@ - (void)start | |
_registrations = @[ | ||
|
||
OBSERVE(_center, UIApplicationDidFinishLaunchingNotification, { | ||
[weakMe _setTransitionState:KSCrashAppTransitionStateLaunching]; | ||
[weakMe _setTransitionState:KSCrashAppTransitionStateLaunched]; | ||
}), | ||
OBSERVE(_center, UIApplicationWillEnterForegroundNotification, { | ||
[weakMe _setTransitionState:KSCrashAppTransitionStateForegrounding]; | ||
|
@@ -323,3 +381,5 @@ - (void)stop | |
} | ||
|
||
@end | ||
|
||
|
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
WIP?