From 5e6ff24c4793235a787cf1937271f41642b63dbb Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 24 Jan 2022 10:43:04 -0800 Subject: [PATCH 1/2] Get rid of more firebase::Log* calls, to help with objc initialization. --- app/src/util_ios.mm | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/app/src/util_ios.mm b/app/src/util_ios.mm index 265f9c822..df079247e 100644 --- a/app/src/util_ios.mm +++ b/app/src/util_ios.mm @@ -338,7 +338,7 @@ void RunOnBackgroundThread(void (*function_ptr)(void *function_data), void *func // implements a stub for the method). const char *type_encoding = method_getTypeEncoding(class_getInstanceMethod(type_encoding_class, name)); - FIREBASE_ASSERT(type_encoding); + assert(type_encoding); NSString *new_method_name_nsstring = nil; if (GetLogLevel() <= kLogLevelDebug) { @@ -397,7 +397,9 @@ void RunOnBackgroundThread(void (*function_ptr)(void *function_data), void *func selector_implementation_names_per_selector_[selector_name_nsstring]; const char *class_name = class_getName(clazz); if (!selector_implementation_names) { - firebase::LogDebug("Method not cached for class %s selector %s.", class_name, selector_name); + if (GetLogLevel() <= kLogLevelDebug) { + NSLog(@"Method not cached for class %s selector %s.", class_name, selector_name); + } return nil; } @@ -415,8 +417,10 @@ void RunOnBackgroundThread(void (*function_ptr)(void *function_data), void *func search_class = clazz; for (; search_class; search_class = class_getSuperclass(search_class)) { const char *search_class_name = class_getName(search_class); - firebase::LogDebug("Searching for selector %s (%s) on class %s", selector_name, - selector_implementation_name, search_class_name); + if (GetLogLevel() <= kLogLevelDebug) { + NSLog(@"Searching for selector %s (%s) on class %s", selector_name, + selector_implementation_name, search_class_name); + } Method method = class_getInstanceMethod(search_class, selector_implementation); method_implementation = method ? method_getImplementation(method) : nil; if (method_implementation) break; @@ -424,14 +428,18 @@ void RunOnBackgroundThread(void (*function_ptr)(void *function_data), void *func if (method_implementation) break; } if (!method_implementation) { - firebase::LogDebug("Class %s does not respond to selector %s (%s)", class_name, selector_name, - selector_implementation_name_nsstring.UTF8String); + if (GetLogLevel() <= kLogLevelDebug) { + NSLog(@"Class %s does not respond to selector %s (%s)", class_name, selector_name, + selector_implementation_name_nsstring.UTF8String); + } return nil; } - firebase::LogDebug("Found %s (%s, 0x%08x) on class %s (%s)", selector_name, - selector_implementation_name_nsstring.UTF8String, - static_cast(reinterpret_cast(method_implementation)), - class_name, class_getName(search_class)); + if (GetLogLevel() <= kLogLevelDebug) { + NSLog(@"Found %s (%s, 0x%08x) on class %s (%s)", selector_name, + selector_implementation_name_nsstring.UTF8String, + static_cast(reinterpret_cast(method_implementation)), + class_name, class_getName(search_class)); + } return method_implementation; } From 3679574fc49afc51255da27c9cf0b1103c49233b Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 24 Jan 2022 10:54:21 -0800 Subject: [PATCH 2/2] Format code. --- app/src/util_ios.mm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/util_ios.mm b/app/src/util_ios.mm index df079247e..b83ed1d49 100644 --- a/app/src/util_ios.mm +++ b/app/src/util_ios.mm @@ -418,8 +418,8 @@ void RunOnBackgroundThread(void (*function_ptr)(void *function_data), void *func for (; search_class; search_class = class_getSuperclass(search_class)) { const char *search_class_name = class_getName(search_class); if (GetLogLevel() <= kLogLevelDebug) { - NSLog(@"Searching for selector %s (%s) on class %s", selector_name, - selector_implementation_name, search_class_name); + NSLog(@"Searching for selector %s (%s) on class %s", selector_name, + selector_implementation_name, search_class_name); } Method method = class_getInstanceMethod(search_class, selector_implementation); method_implementation = method ? method_getImplementation(method) : nil; @@ -430,15 +430,15 @@ void RunOnBackgroundThread(void (*function_ptr)(void *function_data), void *func if (!method_implementation) { if (GetLogLevel() <= kLogLevelDebug) { NSLog(@"Class %s does not respond to selector %s (%s)", class_name, selector_name, - selector_implementation_name_nsstring.UTF8String); + selector_implementation_name_nsstring.UTF8String); } return nil; } if (GetLogLevel() <= kLogLevelDebug) { NSLog(@"Found %s (%s, 0x%08x) on class %s (%s)", selector_name, - selector_implementation_name_nsstring.UTF8String, - static_cast(reinterpret_cast(method_implementation)), - class_name, class_getName(search_class)); + selector_implementation_name_nsstring.UTF8String, + static_cast(reinterpret_cast(method_implementation)), class_name, + class_getName(search_class)); } return method_implementation; }