MOAR LOGGING?

jonpryor · jonpryor · commit e4f45a246e2e · 2020-05-01T19:47:22.000-04:00
diff --git a/src/Mono.Android/Test/Environment.txt b/src/Mono.Android/Test/Environment.txt
@@ -0,0 +1,2 @@
+debug.mono.debug=1
+debug.mono.log=timing,default
diff --git a/src/Mono.Android/Test/Mono.Android-Tests.csproj b/src/Mono.Android/Test/Mono.Android-Tests.csproj
@@ -78,6 +78,9 @@
     <AndroidResource Include="Resources\layout\FragmentFixup.axml" />
     <AndroidBoundLayout Include="Resources\layout\Main.axml" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidEnvironment Include="Environment.txt" />
+  </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\asset1.txt" />
     <AndroidAsset Include="Assets\subfolder\asset2.txt" />
diff --git a/src/monodroid/jni/embedded-assemblies.cc b/src/monodroid/jni/embedded-assemblies.cc
@@ -331,6 +331,8 @@ EmbeddedAssemblies::typemap_java_to_managed (MonoString *java_type)
 	if (XA_UNLIKELY (utils.should_log (LOG_TIMING))) {
 		total_time.mark_end ();
 
+		simple_pointer_guard<char[], false> type_name (mono_type_get_name_full (mono_reflection_type_get_type (ret), MONO_TYPE_NAME_FORMAT_FULL_NAME));
+		log_info_nocheck (LOG_TIMING, "Typemap.java_to_managed: `%s` -> %s", java_type_name.get (), type_name.get ());
 		Timing::info (total_time, "Typemap.java_to_managed: end, total time");
 	}
 
@@ -513,6 +515,8 @@ EmbeddedAssemblies::typemap_managed_to_java (MonoReflectionType *reflection_type
 	if (XA_UNLIKELY (utils.should_log (LOG_TIMING))) {
 		total_time.mark_end ();
 
+		simple_pointer_guard<char[], false> type_name (mono_type_get_name_full (type, MONO_TYPE_NAME_FORMAT_FULL_NAME));
+		log_info_nocheck (LOG_TIMING, "Typemap.managed_to_java: `%s` -> %s", type_name.get (), ret);
 		Timing::info (total_time, "Typemap.managed_to_java: end, total time");
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+debug.mono.debug=1`
	`2`	`+debug.mono.log=timing,default`
Original file line number	Diff line number	Diff line change
`@@ -331,6 +331,8 @@ EmbeddedAssemblies::typemap_java_to_managed (MonoString *java_type)`
`331`	`331`	`if (XA_UNLIKELY (utils.should_log (LOG_TIMING))) {`
`332`	`332`	`total_time.mark_end ();`
`333`	`333`
	`334`	`+ simple_pointer_guard<char[], false> type_name (mono_type_get_name_full (mono_reflection_type_get_type (ret), MONO_TYPE_NAME_FORMAT_FULL_NAME));`
	`335`	+ log_info_nocheck (LOG_TIMING, "Typemap.java_to_managed: `%s` -> %s", java_type_name.get (), type_name.get ());
`334`	`336`	`Timing::info (total_time, "Typemap.java_to_managed: end, total time");`
`335`	`337`	`}`
`336`	`338`
`@@ -513,6 +515,8 @@ EmbeddedAssemblies::typemap_managed_to_java (MonoReflectionType *reflection_type`
`513`	`515`	`if (XA_UNLIKELY (utils.should_log (LOG_TIMING))) {`
`514`	`516`	`total_time.mark_end ();`
`515`	`517`
	`518`	`+ simple_pointer_guard<char[], false> type_name (mono_type_get_name_full (type, MONO_TYPE_NAME_FORMAT_FULL_NAME));`
	`519`	+ log_info_nocheck (LOG_TIMING, "Typemap.managed_to_java: `%s` -> %s", type_name.get (), ret);
`516`	`520`	`Timing::info (total_time, "Typemap.managed_to_java: end, total time");`
`517`	`521`	`}`
`518`	`522`