Skip to content
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
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Sources/KSCrashRecording/KSCrashAppStateTracker+Private.h
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
66 changes: 63 additions & 3 deletions Sources/KSCrashRecording/KSCrashAppStateTracker.m
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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`.
Expand Down Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WIP?

// 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];
Copy link
Collaborator

Choose a reason for hiding this comment

The 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?

});
}
}

Expand Down Expand Up @@ -287,7 +345,7 @@ - (void)start
_registrations = @[

OBSERVE(_center, UIApplicationDidFinishLaunchingNotification, {
[weakMe _setTransitionState:KSCrashAppTransitionStateLaunching];
[weakMe _setTransitionState:KSCrashAppTransitionStateLaunched];
}),
OBSERVE(_center, UIApplicationWillEnterForegroundNotification, {
[weakMe _setTransitionState:KSCrashAppTransitionStateForegrounding];
Expand Down Expand Up @@ -323,3 +381,5 @@ - (void)stop
}

@end


Loading
Loading