From 5b04bfaaef19cdd02d85bc8511ff2ae13d55e3b4 Mon Sep 17 00:00:00 2001 From: marc hoffman Date: Tue, 17 Nov 2020 14:11:34 -0400 Subject: [PATCH 1/3] Always emit "Symbol Path: ", even when running `--nolldb`, as its incredibly useful to have in that scenario... --- src/ios-deploy/ios-deploy.m | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ios-deploy/ios-deploy.m b/src/ios-deploy/ios-deploy.m index fbfb4d72..2d26c082 100644 --- a/src/ios-deploy/ios-deploy.m +++ b/src/ios-deploy/ios-deploy.m @@ -504,7 +504,7 @@ CFMutableArrayRef copy_device_product_version_parts(AMDeviceRef device) { CFStringRef copy_device_support_path(AMDeviceRef device, CFStringRef suffix) { time_t startTime, endTime; time( &startTime ); - + CFStringRef version = NULL; CFStringRef build = AMDeviceCopyValue(device, 0, CFSTR("BuildVersion")); CFStringRef deviceClass = AMDeviceCopyValue(device, 0, CFSTR("DeviceClass")); @@ -596,7 +596,7 @@ CFStringRef copy_device_support_path(AMDeviceRef device, CFStringRef suffix) { @"Status": msg, }); on_error(msg); - } + } time( &endTime ); NSLogVerbose(@"DeviceSupport directory '%@' was located. It took %.2f seconds", path, difftime(endTime,startTime)); @@ -658,7 +658,14 @@ void mount_developer_image(AMDeviceRef device) { on_error(@"Unable to mount developer disk image. (%x)", result); } - + + CFStringRef symbols_path = copy_device_support_path(device, CFSTR("Symbols")); + if (symbols_path != NULL) + { + NSLogOut(@"Symbol Path: %@", symbols_path); + CFRelease(symbols_path); + } + CFRelease(image_path); CFRelease(options); } From a075cabfc9a5405e45cc877fb77cad83765f4f39 Mon Sep 17 00:00:00 2001 From: marc hoffman Date: Thu, 19 Nov 2020 11:45:00 -0400 Subject: [PATCH 2/3] Undid accidental space->tab changes, sorry about that. --- src/ios-deploy/ios-deploy.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ios-deploy/ios-deploy.m b/src/ios-deploy/ios-deploy.m index 2d26c082..ff3e1233 100644 --- a/src/ios-deploy/ios-deploy.m +++ b/src/ios-deploy/ios-deploy.m @@ -504,7 +504,7 @@ CFMutableArrayRef copy_device_product_version_parts(AMDeviceRef device) { CFStringRef copy_device_support_path(AMDeviceRef device, CFStringRef suffix) { time_t startTime, endTime; time( &startTime ); - + CFStringRef version = NULL; CFStringRef build = AMDeviceCopyValue(device, 0, CFSTR("BuildVersion")); CFStringRef deviceClass = AMDeviceCopyValue(device, 0, CFSTR("DeviceClass")); @@ -596,7 +596,7 @@ CFStringRef copy_device_support_path(AMDeviceRef device, CFStringRef suffix) { @"Status": msg, }); on_error(msg); - } + } time( &endTime ); NSLogVerbose(@"DeviceSupport directory '%@' was located. It took %.2f seconds", path, difftime(endTime,startTime)); From ac9441cc1db86239a82123b286a4add61f0af491 Mon Sep 17 00:00:00 2001 From: marc hoffman Date: Thu, 19 Nov 2020 11:47:20 -0400 Subject: [PATCH 3/3] Always emit "Symbol Path:" (added to Json too) --- src/ios-deploy/ios-deploy.m | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/ios-deploy/ios-deploy.m b/src/ios-deploy/ios-deploy.m index ff3e1233..32daea19 100644 --- a/src/ios-deploy/ios-deploy.m +++ b/src/ios-deploy/ios-deploy.m @@ -659,12 +659,14 @@ void mount_developer_image(AMDeviceRef device) { on_error(@"Unable to mount developer disk image. (%x)", result); } - CFStringRef symbols_path = copy_device_support_path(device, CFSTR("Symbols")); - if (symbols_path != NULL) - { - NSLogOut(@"Symbol Path: %@", symbols_path); - CFRelease(symbols_path); - } + CFStringRef symbols_path = copy_device_support_path(device, CFSTR("Symbols")); + if (symbols_path != NULL) + { + NSLogOut(@"Symbol Path: %@", symbols_path); + NSLogJSON(@{@"Event": @"MountDeveloperImage", + @"SymbolsPath": (__bridge NSString *)symbols_path + }); CFRelease(symbols_path); + } CFRelease(image_path); CFRelease(options);