-
-
Notifications
You must be signed in to change notification settings - Fork 317
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
ref: extract implementations of other classes from SentryProfiler.mm #3132
Merged
Merged
Changes from 1 commit
Commits
Show all changes
4 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
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,186 @@ | ||
| #import "SentryProfilerState.h" | ||
| #if SENTRY_TARGET_PROFILING_SUPPORTED | ||
| # import "SentryBacktrace.hpp" | ||
| # import "SentryFormatter.h" | ||
| # import "SentryProfileTimeseries.h" | ||
| # import "SentrySample.h" | ||
| # import <mutex> | ||
|
|
||
| # if defined(DEBUG) | ||
| # include <execinfo.h> | ||
| # endif | ||
|
|
||
| using namespace sentry::profiling; | ||
|
|
||
| namespace { | ||
| NSString * | ||
| parseBacktraceSymbolsFunctionName(const char *symbol) | ||
| { | ||
| static NSRegularExpression *regex = nil; | ||
| static dispatch_once_t onceToken; | ||
| dispatch_once(&onceToken, ^{ | ||
| regex = [NSRegularExpression | ||
| regularExpressionWithPattern:@"\\d+\\s+\\S+\\s+0[xX][0-9a-fA-F]+\\s+(.+)\\s+\\+\\s+\\d+" | ||
| options:0 | ||
| error:nil]; | ||
| }); | ||
| const auto symbolNSStr = [NSString stringWithUTF8String:symbol]; | ||
| const auto match = [regex firstMatchInString:symbolNSStr | ||
| options:0 | ||
| range:NSMakeRange(0, [symbolNSStr length])]; | ||
| if (match == nil) { | ||
| return symbolNSStr; | ||
| } | ||
| return [symbolNSStr substringWithRange:[match rangeAtIndex:1]]; | ||
| } | ||
| } // namespace | ||
|
|
||
| @implementation SentryProfilingMutableState | ||
|
|
||
| - (instancetype)init | ||
| { | ||
| if (self = [super init]) { | ||
| _samples = [NSMutableArray<SentrySample *> array]; | ||
| _stacks = [NSMutableArray<NSArray<NSNumber *> *> array]; | ||
| _frames = [NSMutableArray<NSDictionary<NSString *, id> *> array]; | ||
| _threadMetadata = [NSMutableDictionary<NSString *, NSMutableDictionary *> dictionary]; | ||
| _queueMetadata = [NSMutableDictionary<NSString *, NSDictionary *> dictionary]; | ||
| _frameIndexLookup = [NSMutableDictionary<NSString *, NSNumber *> dictionary]; | ||
| _stackIndexLookup = [NSMutableDictionary<NSString *, NSNumber *> dictionary]; | ||
| } | ||
| return self; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| @implementation SentryProfilingState { | ||
| SentryProfilingMutableState *_mutableState; | ||
| std::mutex _lock; | ||
| } | ||
|
|
||
| - (instancetype)init | ||
| { | ||
| if (self = [super init]) { | ||
| _mutableState = [[SentryProfilingMutableState alloc] init]; | ||
| } | ||
| return self; | ||
| } | ||
|
|
||
| - (void)mutate:(void (^)(SentryProfilingMutableState *))block | ||
| { | ||
| NSParameterAssert(block); | ||
| std::lock_guard<std::mutex> l(_lock); | ||
| block(_mutableState); | ||
| } | ||
|
|
||
| - (void)appendBacktrace:(const Backtrace &)backtrace | ||
| { | ||
| [self mutate:^(SentryProfilingMutableState *state) { | ||
| const auto threadID = sentry_stringForUInt64(backtrace.threadMetadata.threadID); | ||
|
|
||
| NSString *queueAddress = nil; | ||
| if (backtrace.queueMetadata.address != 0) { | ||
| queueAddress = sentry_formatHexAddressUInt64(backtrace.queueMetadata.address); | ||
| } | ||
| NSMutableDictionary<NSString *, id> *metadata = state.threadMetadata[threadID]; | ||
| if (metadata == nil) { | ||
| metadata = [NSMutableDictionary<NSString *, id> dictionary]; | ||
| state.threadMetadata[threadID] = metadata; | ||
| } | ||
| if (!backtrace.threadMetadata.name.empty() && metadata[@"name"] == nil) { | ||
| metadata[@"name"] = | ||
| [NSString stringWithUTF8String:backtrace.threadMetadata.name.c_str()]; | ||
| } | ||
| if (backtrace.threadMetadata.priority != -1 && metadata[@"priority"] == nil) { | ||
| metadata[@"priority"] = @(backtrace.threadMetadata.priority); | ||
| } | ||
| if (queueAddress != nil && state.queueMetadata[queueAddress] == nil | ||
| && backtrace.queueMetadata.label != nullptr) { | ||
| NSString *const labelNSStr = | ||
| [NSString stringWithUTF8String:backtrace.queueMetadata.label->c_str()]; | ||
| // -[NSString stringWithUTF8String:] can return `nil` for malformed string data | ||
| if (labelNSStr != nil) { | ||
| state.queueMetadata[queueAddress] = @ { @"label" : labelNSStr }; | ||
| } | ||
| } | ||
| # if defined(DEBUG) | ||
| const auto symbols | ||
| = backtrace_symbols(reinterpret_cast<void *const *>(backtrace.addresses.data()), | ||
| static_cast<int>(backtrace.addresses.size())); | ||
| # endif | ||
|
|
||
| const auto stack = [NSMutableArray<NSNumber *> array]; | ||
| for (std::vector<uintptr_t>::size_type backtraceAddressIdx = 0; | ||
| backtraceAddressIdx < backtrace.addresses.size(); backtraceAddressIdx++) { | ||
| const auto instructionAddress | ||
| = sentry_formatHexAddressUInt64(backtrace.addresses[backtraceAddressIdx]); | ||
|
|
||
| const auto frameIndex = state.frameIndexLookup[instructionAddress]; | ||
| if (frameIndex == nil) { | ||
| const auto frame = [NSMutableDictionary<NSString *, id> dictionary]; | ||
| frame[@"instruction_addr"] = instructionAddress; | ||
| # if defined(DEBUG) | ||
| frame[@"function"] | ||
| = parseBacktraceSymbolsFunctionName(symbols[backtraceAddressIdx]); | ||
| # endif | ||
| const auto newFrameIndex = @(state.frames.count); | ||
| [stack addObject:newFrameIndex]; | ||
| state.frameIndexLookup[instructionAddress] = newFrameIndex; | ||
| [state.frames addObject:frame]; | ||
| } else { | ||
| [stack addObject:frameIndex]; | ||
| } | ||
| } | ||
|
|
||
| const auto sample = [[SentrySample alloc] init]; | ||
| sample.absoluteTimestamp = backtrace.absoluteTimestamp; | ||
| sample.threadID = backtrace.threadMetadata.threadID; | ||
| if (queueAddress != nil) { | ||
| sample.queueAddress = queueAddress; | ||
| } | ||
|
|
||
| const auto stackKey = [stack componentsJoinedByString:@"|"]; | ||
| const auto stackIndex = state.stackIndexLookup[stackKey]; | ||
| if (stackIndex) { | ||
| sample.stackIndex = stackIndex; | ||
| } else { | ||
| const auto nextStackIndex = @(state.stacks.count); | ||
| sample.stackIndex = nextStackIndex; | ||
| state.stackIndexLookup[stackKey] = nextStackIndex; | ||
| [state.stacks addObject:stack]; | ||
| } | ||
|
|
||
| [state.samples addObject:sample]; | ||
| }]; | ||
| } | ||
|
|
||
| - (NSDictionary<NSString *, id> *)copyProfilingData | ||
| { | ||
| std::lock_guard<std::mutex> l(_lock); | ||
|
|
||
| NSMutableArray<SentrySample *> *const samples = [_mutableState.samples copy]; | ||
| NSMutableArray<NSArray<NSNumber *> *> *const stacks = [_mutableState.stacks copy]; | ||
| NSMutableArray<NSDictionary<NSString *, id> *> *const frames = [_mutableState.frames copy]; | ||
| NSMutableDictionary<NSString *, NSDictionary *> *const queueMetadata = | ||
| [_mutableState.queueMetadata copy]; | ||
|
|
||
| // thread metadata contains a mutable substructure, so it's not enough to perform a copy of | ||
| // the top-level dictionary, we need to go deeper to copy the mutable subdictionaries | ||
| const auto threadMetadata = [NSMutableDictionary<NSString *, NSDictionary *> dictionary]; | ||
| [_mutableState.threadMetadata enumerateKeysAndObjectsUsingBlock:^(NSString *_Nonnull key, | ||
| NSDictionary *_Nonnull obj, BOOL *_Nonnull stop) { threadMetadata[key] = [obj copy]; }]; | ||
|
|
||
| return @{ | ||
| @"profile" : @ { | ||
| @"samples" : samples, | ||
| @"stacks" : stacks, | ||
| @"frames" : frames, | ||
| @"thread_metadata" : threadMetadata, | ||
| @"queue_metadata" : queueMetadata | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| #endif // SENTRY_TARGET_PROFILING_SUPPORTED |
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,4 @@ | ||
| #import "SentrySample.h" | ||
|
|
||
| @implementation SentrySample | ||
| @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
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.
I sorted the contents of the Profiling group by name.