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.

Sign up for GitHub

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

Rename KSCrash types, functions and files to RollbarCrash to avoid collisions #301

Merged
merged 4 commits into from
Jul 6, 2023
Merged

Rename KSCrash types, functions and files to RollbarCrash to avoid collisions #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8b9d98
Renamed KSCrash files to RollbarCrash to avoid potential name collisions
matux Jul 4, 2023
d606606
Renamed KSCrash types to RollbarCrash to avoid potential name collisions
matux Jul 4, 2023
72a5b30
Renamed free functions and C types from ks to rc to avoid name coll
matux Jul 4, 2023
c2f9cc5
Rename internal KSCrash logger to RCLOG_*
matux Jul 6, 2023
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
78 changes: 39 additions & 39 deletions ...Crash/Installations/KSCrashInstallation.m → .../Installations/RollbarCrashInstallation.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// KSCrashInstallation.m
// RollbarCrashInstallation.m
//
// Created by Karl Stenerud on 2013-02-10.
//
Expand All @@ -25,13 +25,13 @@
//


#import "KSCrashInstallation.h"
#import "KSCrashInstallation+Private.h"
#import "KSCrashReportFilterBasic.h"
#import "KSCrash.h"
#import "KSCString.h"
#import "KSJSONCodecObjC.h"
#import "KSLogger.h"
#import "RollbarCrashInstallation.h"
#import "RollbarCrashInstallation+Private.h"
#import "RollbarCrashReportFilterBasic.h"
#import "RollbarCrash.h"
#import "RollbarCrashCString.h"
#import "RollbarCrashJSONCodecObjC.h"
#import "RollbarCrashLogger.h"
#import "NSError+SimpleConstructor.h"
#import <objc/runtime.h>

Expand All @@ -48,7 +48,7 @@

typedef struct
{
KSReportWriteCallback userCrashCallback;
RollbarCrashReportWriteCallback userCrashCallback;
int reportFieldsCount;
ReportField* reportFields[0];
} CrashHandlerData;
Expand All @@ -57,7 +57,7 @@
static CrashHandlerData* g_crashHandlerData;


static void crashCallback(const KSCrashReportWriter* writer)
static void crashCallback(const RollbarCrashReportWriter* writer)
{
for(int i = 0; i < g_crashHandlerData->reportFieldsCount; i++)
{
Expand All @@ -74,7 +74,7 @@ static void crashCallback(const KSCrashReportWriter* writer)
}


@interface KSCrashInstReportField: NSObject
@interface RollbarCrashInstReportField: NSObject

@property(nonatomic,readonly,assign) int index;
@property(nonatomic,readonly,assign) ReportField* field;
Expand All @@ -83,12 +83,12 @@ @interface KSCrashInstReportField: NSObject
@property(nonatomic,readwrite,retain) id value;

@property(nonatomic,readwrite,retain) NSMutableData* fieldBacking;
@property(nonatomic,readwrite,retain) KSCString* keyBacking;
@property(nonatomic,readwrite,retain) KSCString* valueBacking;
@property(nonatomic,readwrite,retain) RollbarCrashCString* keyBacking;
@property(nonatomic,readwrite,retain) RollbarCrashCString* valueBacking;

@end

@implementation KSCrashInstReportField
@implementation RollbarCrashInstReportField

@synthesize index = _index;
@synthesize key = _key;
Expand All @@ -97,9 +97,9 @@ @implementation KSCrashInstReportField
@synthesize keyBacking = _keyBacking;
@synthesize valueBacking= _valueBacking;

+ (KSCrashInstReportField*) fieldWithIndex:(int) index
+ (RollbarCrashInstReportField*) fieldWithIndex:(int) index
{
return [(KSCrashInstReportField*)[self alloc] initWithIndex:index];
return [(RollbarCrashInstReportField*)[self alloc] initWithIndex:index];
}

- (id) initWithIndex:(int) index
Expand All @@ -126,7 +126,7 @@ - (void) setKey:(NSString*) key
}
else
{
self.keyBacking = [KSCString stringWithString:key];
self.keyBacking = [RollbarCrashCString stringWithString:key];
}
self.field->key = self.keyBacking.bytes;
}
Expand All @@ -141,34 +141,34 @@ - (void) setValue:(id) value
}

NSError* error = nil;
NSData* jsonData = [KSJSONCodec encode:value options:KSJSONEncodeOptionPretty | KSJSONEncodeOptionSorted error:&error];
NSData* jsonData = [RollbarCrashJSONCodec encode:value options:RollbarCrashJSONEncodeOptionPretty | RollbarCrashJSONEncodeOptionSorted error:&error];
if(jsonData == nil)
{
KSLOG_ERROR(@"Could not set value %@ for property %@: %@", value, self.key, error);
RCLOG_ERROR(@"Could not set value %@ for property %@: %@", value, self.key, error);
}
else
{
_value = value;
self.valueBacking = [KSCString stringWithData:jsonData];
self.valueBacking = [RollbarCrashCString stringWithData:jsonData];
self.field->value = self.valueBacking.bytes;
}
}

@end

@interface KSCrashInstallation ()
@interface RollbarCrashInstallation ()

@property(nonatomic,readwrite,assign) int nextFieldIndex;
@property(nonatomic,readonly,assign) CrashHandlerData* crashHandlerData;
@property(nonatomic,readwrite,retain) NSMutableData* crashHandlerDataBacking;
@property(nonatomic,readwrite,retain) NSMutableDictionary* fields;
@property(nonatomic,readwrite,retain) NSArray* requiredProperties;
@property(nonatomic,readwrite,retain) KSCrashReportFilterPipeline* prependedFilters;
@property(nonatomic,readwrite,retain) RollbarCrashReportFilterPipeline* prependedFilters;

@end


@implementation KSCrashInstallation
@implementation RollbarCrashInstallation

@synthesize nextFieldIndex = _nextFieldIndex;
@synthesize crashHandlerDataBacking = _crashHandlerDataBacking;
Expand All @@ -191,14 +191,14 @@ - (id) initWithRequiredProperties:(NSArray*) requiredProperties
sizeof(*self.crashHandlerData->reportFields) * kMaxProperties];
self.fields = [NSMutableDictionary dictionary];
self.requiredProperties = requiredProperties;
self.prependedFilters = [KSCrashReportFilterPipeline filterWithFilters:nil];
self.prependedFilters = [RollbarCrashReportFilterPipeline filterWithFilters:nil];
}
return self;
}

- (void) dealloc
{
KSCrash* handler = [KSCrash sharedInstance];
RollbarCrash* handler = [RollbarCrash sharedInstance];
@synchronized(handler)
{
if(g_crashHandlerData == self.crashHandlerData)
Expand All @@ -214,12 +214,12 @@ - (CrashHandlerData*) crashHandlerData
return (CrashHandlerData*)self.crashHandlerDataBacking.mutableBytes;
}

- (KSCrashInstReportField*) reportFieldForProperty:(NSString*) propertyName
- (RollbarCrashInstReportField*) reportFieldForProperty:(NSString*) propertyName
{
KSCrashInstReportField* field = [self.fields objectForKey:propertyName];
RollbarCrashInstReportField* field = [self.fields objectForKey:propertyName];
if(field == nil)
{
field = [KSCrashInstReportField fieldWithIndex:self.nextFieldIndex];
field = [RollbarCrashInstReportField fieldWithIndex:self.nextFieldIndex];
self.nextFieldIndex++;
self.crashHandlerData->reportFieldsCount = self.nextFieldIndex;
self.crashHandlerData->reportFields[field.index] = field.field;
Expand All @@ -230,13 +230,13 @@ - (KSCrashInstReportField*) reportFieldForProperty:(NSString*) propertyName

- (void) reportFieldForProperty:(NSString*) propertyName setKey:(id) key
{
KSCrashInstReportField* field = [self reportFieldForProperty:propertyName];
RollbarCrashInstReportField* field = [self reportFieldForProperty:propertyName];
field.key = key;
}

- (void) reportFieldForProperty:(NSString*) propertyName setValue:(id) value
{
KSCrashInstReportField* field = [self reportFieldForProperty:propertyName];
RollbarCrashInstReportField* field = [self reportFieldForProperty:propertyName];
field.value = value;
}

Expand Down Expand Up @@ -300,15 +300,15 @@ - (NSArray*) makeKeyPaths:(NSArray*) keyPaths
return result;
}

- (KSReportWriteCallback) onCrash
- (RollbarCrashReportWriteCallback) onCrash
{
@synchronized(self)
{
return self.crashHandlerData->userCrashCallback;
}
}

- (void) setOnCrash:(KSReportWriteCallback)onCrash
- (void) setOnCrash:(RollbarCrashReportWriteCallback)onCrash
{
@synchronized(self)
{
Expand All @@ -318,7 +318,7 @@ - (void) setOnCrash:(KSReportWriteCallback)onCrash

- (void) install
{
KSCrash* handler = [KSCrash sharedInstance];
RollbarCrash* handler = [RollbarCrash sharedInstance];
@synchronized(handler)
{
g_crashHandlerData = self.crashHandlerData;
Expand All @@ -327,7 +327,7 @@ - (void) install
}
}

- (void) sendAllReportsWithCompletion:(KSCrashReportFilterCompletion) onCompletion
- (void) sendAllReportsWithCompletion:(RollbarCrashReportFilterCompletion) onCompletion
{
NSError* error = [self validateProperties];
if(error != nil)
Expand All @@ -339,7 +339,7 @@ - (void) sendAllReportsWithCompletion:(KSCrashReportFilterCompletion) onCompleti
return;
}

id<KSCrashReportFilter> sink = [self sink];
id<RollbarCrashReportFilter> sink = [self sink];
if(sink == nil)
{
onCompletion(nil, NO, [NSError errorWithDomain:[[self class] description]
Expand All @@ -348,19 +348,19 @@ - (void) sendAllReportsWithCompletion:(KSCrashReportFilterCompletion) onCompleti
return;
}

sink = [KSCrashReportFilterPipeline filterWithFilters:self.prependedFilters, sink, nil];
sink = [RollbarCrashReportFilterPipeline filterWithFilters:self.prependedFilters, sink, nil];

KSCrash* handler = [KSCrash sharedInstance];
RollbarCrash* handler = [RollbarCrash sharedInstance];
handler.sink = sink;
[handler sendAllReportsWithCompletion:onCompletion];
}

- (void) addPreFilter:(id<KSCrashReportFilter>) filter
- (void) addPreFilter:(id<RollbarCrashReportFilter>) filter
{
[self.prependedFilters addFilter:filter];
}

- (id<KSCrashReportFilter>) sink
- (id<RollbarCrashReportFilter>) sink
{
return nil;
}
Expand Down
Loading