[tools] Clean up mtouch/mmp. (#24526)

* Make mtouch able to what mmp does (aka run the partial static registrar for macOS).
* Simplify mtouch a bit, since it's only doing a single thing, and it's not a tool we publish, so we don't have to be user-friendly.
* Remove mmp.
* Remove dead code.
* Simplify conditional compilation symbols (LEGACY_TOOLS is now used instead of MTOUCH/MMP).

Author: rolfbjarne

runtime/monotouch-debug.m

@@ -998,7 +998,6 @@ static ssize_t sdb_recv (void *buf, size_t len)
 				use_fd = true;
 				profiler_description = xamarin_strdup_printf ("%s,output=#%i", prof, fd);
 #endif
-				xamarin_set_gc_pump_enabled (false);
 			} else {
 				LOG (PRODUCT ": Unknown profiler, expect unexpected behavior (%s)\n", prof);
 				profiler_description = strdup (prof);

runtime/monotouch-main.m

@@ -283,9 +283,6 @@ - (void) memoryWarning: (NSNotification *) sender
 	{
 		/*
 		 * Command line arguments for mobile targets (iOS / tvOS / macOS / Mac Catalyst):
-		 * -debugtrack: [Simulator only]
-		 *         If we should track zombie NSObjects and aggressively poke the GC to collect
-		 *         every second.
 		 * -monodevelop-port=<port>
 		 *         The port MonoDevelop is listening on (or we should listen on).
 		 *         Overrides whatever any configuration file says.
@@ -350,9 +347,7 @@ - (void) memoryWarning: (NSNotification *) sender
 				value = NULL;
 
 #ifdef DEBUG
-			if (!strcmp (name, "debugtrack")) {
-				xamarin_gc_pump = true;
-			} else if (!strcmp (name, "monodevelop-port")) {
+			if (!strcmp (name, "monodevelop-port")) {
 				if (!value && argc > i + 1)
 					value = argv [++i];
 				if (value) {

runtime/runtime.m

@@ -36,9 +36,6 @@
  * the simlauncher binaries).
  */
 
-#if DEBUG
-bool xamarin_gc_pump = false;
-#endif
 #if MONOMAC
 // FIXME: implement release mode for monomac.
 bool xamarin_debug_mode = true;
@@ -1049,24 +1046,6 @@ -(struct NSObjectData*) xamarinGetNSObjectData;
 	xamarin_handling_unhandled_exceptions = 0;
 }
 
-#if defined (DEBUG)
-static void *
-pump_gc (void *context)
-{
-#if !defined (CORECLR_RUNTIME)
-	mono_thread_attach (mono_get_root_domain ());
-#endif
-
-	while (xamarin_gc_pump) {
-		GCHandle exception_gchandle = INVALID_GCHANDLE;
-		xamarin_gc_collect (&exception_gchandle);
-		xamarin_process_fatal_exception_gchandle (exception_gchandle, "An exception occurred while running the GC in a loop");
-		usleep (1000000);
-	}
-	return NULL;
-}
-#endif /* DEBUG */
-
 #if !defined (CORECLR_RUNTIME)
 static void
 log_callback (const char *log_domain, const char *log_level, const char *message, mono_bool fatal, void *user_data)
@@ -1219,13 +1198,6 @@ -(struct NSObjectData*) xamarinGetNSObjectData;
 
 	xamarin_install_nsautoreleasepool_hooks ();
 
-#if defined (DEBUG)
-	if (xamarin_gc_pump) {
-		pthread_t gc_thread;
-		pthread_create (&gc_thread, NULL, pump_gc, NULL);
-	}
-#endif
-
 	pthread_mutexattr_t attr;
 	pthread_mutexattr_init (&attr);
 	pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
@@ -2036,14 +2008,6 @@ -(struct NSObjectData*) xamarinGetNSObjectData;
 	return true;
 }
 
-void
-xamarin_set_gc_pump_enabled (bool value)
-{
-#if DEBUG
-	xamarin_gc_pump = value;
-#endif
-}
-
 const char *
 xamarin_skip_encoding_flags (const char *encoding)
 {

runtime/xamarin/main.h

@@ -105,9 +105,6 @@ extern bool mono_use_llvm; // this is defined inside mono
 #define SUPPORTS_DYNAMIC_REGISTRATION 1
 #endif
 
-#if DEBUG
-extern bool xamarin_gc_pump;
-#endif
 extern bool xamarin_debug_mode;
 extern bool xamarin_disable_lldb_attach;
 extern bool xamarin_disable_omit_fp;

runtime/xamarin/runtime.h

@@ -256,7 +256,6 @@ void			xamarin_verify_parameter (MonoObject *obj, SEL sel, id self, id arg, unsi
 void			xamarin_check_objc_type (id obj, Class expected_class, SEL sel, id self, int index, MonoMethod *method);
 #endif
 
-void			xamarin_set_gc_pump_enabled (bool value);
 void			xamarin_set_is_managed_static_registrar (bool value);
 
 void			xamarin_process_nsexception (NSException *exc);

src/ObjCRuntime/Constants.cs

@@ -1,4 +1,4 @@
-#if MTOUCH || MMP || BUNDLER
+#if LEGACY_TOOLS || BUNDLER
 namespace Xamarin.Bundler {
 #else
 namespace ObjCRuntime {

src/ObjCRuntime/ErrorHelper.cs

@@ -2,7 +2,7 @@
 
 #nullable enable
 
-#if MTOUCH || MMP || MMP_TEST || MTOUCH_TESTS
+#if LEGACY_TOOLS
 #define BUNDLER
 #endif
 

src/ObjCRuntime/NFloat.cs

@@ -1,3 +1 @@
-#if !(MTOUCH || MMP || BUNDLER)
 global using nfloat = System.Runtime.InteropServices.NFloat;
-#endif

src/ObjCRuntime/Registrar.cs

@@ -16,7 +16,7 @@
 
 using Xamarin.Bundler;
 
-#if MTOUCH || MMP || BUNDLER
+#if LEGACY_TOOLS || BUNDLER
 using Xamarin.Utils;
 using TAssembly = Mono.Cecil.AssemblyDefinition;
 using TType = Mono.Cecil.TypeReference;
@@ -33,11 +33,11 @@
 using R = ObjCRuntime.Runtime;
 #endif
 
-#if !(MTOUCH || MMP || BUNDLER)
+#if !(LEGACY_TOOLS || BUNDLER)
 using ProductException = ObjCRuntime.RuntimeException;
 #endif
 
-#if !MTOUCH && !MMP && !BUNDLER
+#if !LEGACY_TOOLS && !BUNDLER
 // static registrar needs them but they might not be marked (e.g. if System.Console is not used)
 [assembly: Preserve (typeof (System.Action))]
 [assembly: Preserve (typeof (System.Action<string>))]
@@ -89,15 +89,11 @@ public static List<ProductException> GetMT4127 (TMethod impl, List<TMethod> ifac
 	}
 
 	abstract partial class Registrar {
-#if MTOUCH || MMP || BUNDLER
+#if LEGACY_TOOLS || BUNDLER
 		public Application App { get; protected set; }
 #endif
 
-#if MMP || MTOUCH || BUNDLER
-		static string NFloatTypeName { get => Driver.IsDotNet ? "System.Runtime.InteropServices.NFloat" : "System.nfloat"; }
-#else
 		const string NFloatTypeName = "System.Runtime.InteropServices.NFloat";
-#endif
 
 		Dictionary<TAssembly, object> assemblies = new Dictionary<TAssembly, object> (); // Use Dictionary instead of HashSet to avoid pulling in System.Core.dll.
 																						 // locking: all accesses must lock 'types'.
@@ -135,7 +131,7 @@ internal class ObjCType {
 			public bool IsInformalProtocol;
 			public bool IsWrapper;
 			public bool IsGeneric;
-#if !MTOUCH && !MMP && !BUNDLER
+#if !LEGACY_TOOLS && !BUNDLER
 			public IntPtr Handle;
 #else
 			public TType ProtocolWrapperType;
@@ -152,7 +148,7 @@ internal class ObjCType {
 
 			public bool IsCategory { get { return CategoryAttribute is not null; } }
 
-#if MTOUCH || MMP || BUNDLER
+#if LEGACY_TOOLS || BUNDLER
 			HashSet<ObjCType> all_protocols;
 			// This contains all protocols in the type hierarchy.
 			// Given a type T that implements a protocol with super protocols:
@@ -630,7 +626,7 @@ public bool IsConstructor {
 				}
 			}
 
-#if !MMP && !MTOUCH && !BUNDLER
+#if !LEGACY_TOOLS && !BUNDLER
 			// The ArgumentSemantic enum is public, and
 			// I don't want to add another enum value there which
 			// is just an internal implementation detail, so just
@@ -881,7 +877,7 @@ public Trampoline Trampoline {
 					if (trampoline != Trampoline.None)
 						return trampoline;
 
-#if MTOUCH || MMP || BUNDLER
+#if LEGACY_TOOLS || BUNDLER
 					throw ErrorHelper.CreateError (8018, Errors.MT8018);
 #else
 					var mi = (System.Reflection.MethodInfo) Method;
@@ -1045,7 +1041,7 @@ public override string FullName {
 		}
 
 		internal class ObjCField : ObjCMember {
-#if !MTOUCH && !MMP && !BUNDLER
+#if !LEGACY_TOOLS && !BUNDLER
 			public int Size;
 			public byte Alignment;
 #else
@@ -1328,18 +1324,18 @@ internal static string AppKit {
 		}
 #endif
 
-#if MTOUCH || MMP || BUNDLER
+#if LEGACY_TOOLS || BUNDLER
 		internal string AssemblyName {
 			get {
 				switch (App.Platform) {
 				case ApplePlatform.iOS:
-					return Driver.IsDotNet ? "Microsoft.iOS" : "Xamarin.iOS";
+					return "Microsoft.iOS";
 				case ApplePlatform.TVOS:
-					return Driver.IsDotNet ? "Microsoft.tvOS" : "Xamarin.TVOS";
+					return "Microsoft.tvOS";
 				case ApplePlatform.MacOSX:
-					return Driver.IsDotNet ? "Microsoft.macOS" : "Xamarin.Mac";
+					return "Microsoft.macOS";
 				case ApplePlatform.MacCatalyst:
-					return Driver.IsDotNet ? "Microsoft.MacCatalyst" : "Xamarin.MacCatalyst";
+					return "Microsoft.MacCatalyst";
 				default:
 					throw ErrorHelper.CreateError (71, Errors.MX0071, App.Platform, App.ProductName);
 				}
@@ -1376,7 +1372,7 @@ public string PlatformAssembly {
 			}
 		}
 
-#if MTOUCH || MMP || BUNDLER
+#if LEGACY_TOOLS || BUNDLER
 		// "#if MTOUCH" code does not need locking when accessing 'types', because mtouch is single-threaded.
 		public Dictionary<TType, ObjCType> Types {
 			get { return types; }
@@ -1821,7 +1817,7 @@ ObjCType [] GetProtocols (ObjCType type, ref List<Exception> exceptions)
 						Type = iface,
 						IsProtocol = true,
 					};
-#if MMP || MTOUCH || BUNDLER
+#if LEGACY_TOOLS || BUNDLER
 					objcType.ProtocolWrapperType = GetProtocolAttributeWrapperType (objcType.Type);
 					objcType.IsWrapper = objcType.ProtocolWrapperType is not null;
 #endif
@@ -1985,7 +1981,7 @@ ObjCType RegisterTypeUnsafe (TType type, ref List<Exception> exceptions)
 				isInformalProtocol = pAttr.IsInformal;
 				isProtocol = true;
 
-#if MMP || MTOUCH || BUNDLER
+#if LEGACY_TOOLS || BUNDLER
 				if (pAttr.FormalSinceVersion is not null && pAttr.FormalSinceVersion > App.SdkVersion)
 					isInformalProtocol = !isInformalProtocol;
 #endif
@@ -2019,7 +2015,7 @@ ObjCType RegisterTypeUnsafe (TType type, ref List<Exception> exceptions)
 			objcType.VerifyAdoptedProtocolsNames (ref exceptions);
 			objcType.BaseType = isProtocol ? null : (baseObjCType ?? objcType);
 			objcType.Protocols = GetProtocols (objcType, ref exceptions);
-#if MMP || MTOUCH || BUNDLER
+#if LEGACY_TOOLS || BUNDLER
 			objcType.ProtocolWrapperType = (isProtocol && !isInformalProtocol) ? GetProtocolAttributeWrapperType (objcType.Type) : null;
 #endif
 			objcType.IsWrapper = (isProtocol && !isInformalProtocol) ? (GetProtocolAttributeWrapperType (objcType.Type) is not null) : (objcType.RegisterAttribute is not null && objcType.RegisterAttribute.IsWrapper);
@@ -2142,7 +2138,7 @@ ObjCType RegisterTypeUnsafe (TType type, ref List<Exception> exceptions)
 					}
 				}
 
-#if MMP || MTOUCH || BUNDLER
+#if LEGACY_TOOLS || BUNDLER
 				// Special fields
 				if (is_first_nonWrapper) {
 					// static registrar
@@ -2209,7 +2205,7 @@ ObjCType RegisterTypeUnsafe (TType type, ref List<Exception> exceptions)
 						}
 					} else {
 						TMethod method = null;
-#if MTOUCH || MMP || BUNDLER
+#if LEGACY_TOOLS || BUNDLER
 						method = attrib.Method;
 #endif
 						var objcMethod = new ObjCMethod (this, objcType, method) {
@@ -2258,14 +2254,14 @@ ObjCType RegisterTypeUnsafe (TType type, ref List<Exception> exceptions)
 						objcType.Add (new ObjCField () {
 							DeclaringType = objcType,
 							Name = ca.Name ?? GetPropertyName (property),
-#if !MTOUCH && !MMP && !BUNDLER
+#if !LEGACY_TOOLS && !BUNDLER
 							Size = 8,
 							Alignment = (byte) 3,
 #endif
 							FieldType = "@",
 							IsProperty = true,
 							IsStatic = IsStatic (property),
-#if MTOUCH || MMP || BUNDLER
+#if LEGACY_TOOLS || BUNDLER
 							Property = property,
 #endif
 						}, ref exceptions);
@@ -2546,7 +2542,7 @@ public void RegisterAssembly (TAssembly assembly)
 
 			if (exceptions.Count > 0) {
 				Exception ae = exceptions.Count == 1 ? exceptions [0] : new AggregateException (exceptions);
-#if !MTOUCH && !MMP && !BUNDLER
+#if !LEGACY_TOOLS && !BUNDLER
 				Runtime.NSLog (ae.ToString ());
 #endif
 				throw ae;
@@ -2661,7 +2657,7 @@ protected string GetExportedTypeName (TType type)
 		string GetBoolEncoding ()
 		{
 			// map managed 'bool' to ObjC BOOL = 'unsigned char' in OSX and 32bit iOS architectures and 'bool' in 64bit iOS architectures
-#if MTOUCH || MMP || BUNDLER
+#if LEGACY_TOOLS || BUNDLER
 			switch (App.Platform) {
 			case ApplePlatform.iOS:
 			case ApplePlatform.TVOS:
@@ -2786,7 +2782,7 @@ protected void UnlockRegistrar ()
 			System.Threading.Monitor.Exit (types);
 		}
 
-#if MTOUCH || MMP || BUNDLER
+#if LEGACY_TOOLS || BUNDLER
 		internal static void NSLog (string format, params object [] args)
 		{
 			Console.WriteLine (format, args);

tools/Makefile

@@ -4,23 +4,7 @@ include $(TOP)/Make.config
 
 SUBDIRS += devops
 
-ifdef INCLUDE_MAC
-SUBDIRS+=mmp
-endif
-
-ifdef INCLUDE_IOS
-INCLUDE_MTOUCH=1
-endif
-ifdef INCLUDE_TVOS
-INCLUDE_MTOUCH=1
-endif
-ifdef INCLUDE_MACCATALYST
-INCLUDE_MTOUCH=1
-endif
-
-ifdef INCLUDE_MTOUCH
 SUBDIRS += mtouch
-endif
 
 SUBDIRS+=mlaunch