Skip to content

GULLogger: logged issue counting concurrency issue fix #2627

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

Merged
merged 3 commits into from
Mar 26, 2019
Merged

GULLogger: logged issue counting concurrency issue fix #2627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a9f419
GULLogger: don't set global queue as a target for GULLoggerCounterQu…
maksymmalyhin Mar 25, 2019
5a005e7
Typos fixes
maksymmalyhin Mar 26, 2019
e167b57
GULLoggerTest: fix renamed func
maksymmalyhin Mar 26, 2019
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
4 changes: 2 additions & 2 deletions GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

extern BOOL getGULLoggerDebugMode(void);

extern CFStringRef getGULLoggerUsetDefaultsSuiteName(void);
extern CFStringRef getGULLoggerUserDefaultsSuiteName(void);
extern dispatch_queue_t getGULLoggerCounterQueue(void);

static NSString *const kMessageCode = @"I-COR000001";
Expand All @@ -51,7 +51,7 @@ - (void)setUp {
GULResetLogger();

self.loggerDefaults = [[NSUserDefaults alloc]
initWithSuiteName:CFBridgingRelease(getGULLoggerUsetDefaultsSuiteName())];
initWithSuiteName:CFBridgingRelease(getGULLoggerUserDefaultsSuiteName())];
}

- (void)tearDown {
Expand Down
12 changes: 5 additions & 7 deletions GoogleUtilities/Logger/GULLogger.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,15 +207,15 @@ void GULLogBasic(GULLoggerLevel level,

// NSUserDefaults cannot be used due to a bug described in GULUserDefaults
// GULUserDefaults cannot be used because GULLogger is a dependency for GULUserDefaults
// We have to use C API deireclty here
// We have to use C API direclty here

CFStringRef getGULLoggerUsetDefaultsSuiteName(void) {
CFStringRef getGULLoggerUserDefaultsSuiteName(void) {
return (__bridge CFStringRef) @"GoogleUtilities.Logger.GULLogger";
}

NSInteger GULGetUserDefaultsIntegerForKey(NSString *key) {
id value = (__bridge_transfer id)CFPreferencesCopyAppValue((__bridge CFStringRef)key,
getGULLoggerUsetDefaultsSuiteName());
getGULLoggerUserDefaultsSuiteName());
if (![value isKindOfClass:[NSNumber class]]) {
return 0;
}
Expand All @@ -226,8 +226,8 @@ NSInteger GULGetUserDefaultsIntegerForKey(NSString *key) {
void GULLoggerUserDefaultsSetIntegerForKey(NSInteger count, NSString *key) {
NSNumber *countNumber = @(count);
CFPreferencesSetAppValue((__bridge CFStringRef)key, (__bridge CFNumberRef)countNumber,
getGULLoggerUsetDefaultsSuiteName());
CFPreferencesAppSynchronize(getGULLoggerUsetDefaultsSuiteName());
getGULLoggerUserDefaultsSuiteName());
CFPreferencesAppSynchronize(getGULLoggerUserDefaultsSuiteName());
}

#pragma mark - Number of errors and warnings
Expand All @@ -238,8 +238,6 @@ dispatch_queue_t getGULLoggerCounterQueue(void) {
dispatch_once(&onceToken, ^{
queue =
dispatch_queue_create("GoogleUtilities.GULLogger.counterQueue", DISPATCH_QUEUE_CONCURRENT);
dispatch_set_target_queue(queue,
dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0));
});

return queue;
Expand Down