[generator] Remove GenerationInfo shared state.

Author: jpobst

tools/generator/CodeGenerationOptions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -111,20 +112,23 @@ public string GetSafeIdentifier (string name)
 			return name.Replace ('$', '_');
 		}
 
-		Dictionary<string,string> short_file_names = new Dictionary<string, string> ();
+		readonly Dictionary<string,string> short_file_names = new Dictionary<string, string> ();
 
 		public string GetFileName (string fullName)
 		{
 			if (!UseShortFileNames)
 				return fullName;
-			string s;
-			if (short_file_names.TryGetValue (fullName, out s))
+
+			lock (short_file_names) {
+				if (short_file_names.TryGetValue (fullName, out var s))
+					return s;
+
+				s = short_file_names.Count.ToString ();
+				short_file_names [fullName] = s;
+
 				return s;
-			s = short_file_names.Count.ToString ();
-			short_file_names [fullName] = s;
-			return s;
+			}
 		}
 	}
-
 }
 

tools/generator/CodeGenerator.cs

@@ -175,6 +175,7 @@ static void Run (CodeGeneratorOptions options, DirectoryAssemblyResolver resolve
 				if (gen.IsGeneratable)
 					gen.Generate (opt, gen_info);
 
+
 			ClassGen.GenerateTypeRegistrations (opt, gen_info);
 			ClassGen.GenerateEnumList (gen_info);
 

tools/generator/GenerationInfo.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -13,71 +14,36 @@ public class GenerationInfo {
 
 		public GenerationInfo (string csdir, string javadir, string assembly)
 		{
-			this.csdir = csdir;
-			this.javadir = javadir;
-			this.assembly = assembly;
+			CSharpDir = csdir;
+			JavaDir = javadir;
+			Assembly = assembly;
 		}
 
-		string assembly;
-		public string Assembly {
-			get { return assembly; }
-		}
-
-		string csdir;
-		public string CSharpDir {
-			get { return csdir; }
-		}
-
-		string javadir;
-		public string JavaDir {
-			get { return javadir; }
-		}
-
-		string member;
-		public string CurrentMember {
-			get { return typename + "." + member; }
-			set { member = value; }
-		}
-
-		string typename;
-		public string CurrentType {
-			get { return typename; }
-			set { typename = value; }
-		}
-		
-		List<string> generated_files = new List<string> ();
-		public IEnumerable<string> GeneratedFiles {
-			get { return generated_files; }
-		}
+		public string Assembly { get; }
+		public string CSharpDir { get; }
+		public string JavaDir { get; }
+		public ConcurrentBag<string> GeneratedFiles { get; } = new ConcurrentBag<string> ();
+		public ConcurrentBag<string> Enums { get; } = new ConcurrentBag<string> ();
+		public ConcurrentBag<KeyValuePair<string, string>> TypeRegistrations { get; } = new ConcurrentBag<KeyValuePair<string, string>> ();
 
 		public StreamWriter OpenStream (string name) 
 		{
 			if (!Directory.Exists (CSharpDir))
 				Directory.CreateDirectory (CSharpDir);
 			string filename = Path.Combine (CSharpDir, name + ".cs");
 
-			generated_files.Add (filename);
 			var sw = new StreamWriter (File.Create (filename));
+			GeneratedFiles.Add (filename);
 			return sw;
 		}
 
-		List<string> enums = new List<string> ();
-		public ICollection<string> Enums {
-			get { return enums; }
-		}
-
-		List<KeyValuePair<string, string>> type_registrations = new List<KeyValuePair<string, string>> ();
-		public ICollection<KeyValuePair<string, string>> TypeRegistrations {
-			get { return type_registrations; }
-		}
-
 		internal void GenerateLibraryProjectFile (CodeGeneratorOptions options, IEnumerable<string> enumFiles, string path = null)
 		{
 			if (path == null) {
 				var     name    = Assembly ?? "GeneratedFiles";
 				int     idx     = name.IndexOf (',');
 				name            = idx < 0 ? name : name.Substring (0, idx);
-				path            = Path.Combine (csdir, name + ".projitems");
+				path            = Path.Combine (CSharpDir, name + ".projitems");
 			}
 
 			var msbuild = XNamespace.Get ("http://schemas.microsoft.com/developer/msbuild/2003");

tools/generator/Java.Interop.Tools.Generator.ObjectModel/ClassGen.cs

@@ -2,15 +2,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Xml;
-
 using Java.Interop.Tools.TypeNameMappings;
-
 using Xamarin.Android.Binder;
 
-using MonoDroid.Utils;
-
 namespace MonoDroid.Generation
 {
 
@@ -244,8 +238,6 @@ public bool IsExplicitlyImplementedMethod (string sig)
 
 		public override void Generate (CodeGenerationOptions opt, GenerationInfo gen_info)
 		{
-			gen_info.CurrentType = FullName;
-
 			using (var sw = gen_info.OpenStream (opt.GetFileName (FullName))) {
 				sw.WriteLine ("using System;");
 				sw.WriteLine ("using System.Collections.Generic;");
@@ -269,7 +261,7 @@ public static void GenerateTypeRegistrations (CodeGenerationOptions opt, Generat
 			using (var sw = gen_info.OpenStream (opt.GetFileName ("Java.Interop.__TypeRegistrations"))) {
 
 				Dictionary<string, List<KeyValuePair<string, string>>> mapping = new Dictionary<string, List<KeyValuePair<string, string>>> ();
-				foreach (KeyValuePair<string, string> reg in gen_info.TypeRegistrations) {
+				foreach (KeyValuePair<string, string> reg in gen_info.TypeRegistrations.OrderBy (p => p.Key, StringComparer.OrdinalIgnoreCase)) {
 					int ls = reg.Key.LastIndexOf ('/');
 					string package = ls >= 0 ? reg.Key.Substring (0, ls) : "";
 
@@ -345,7 +337,7 @@ public static void GenerateTypeRegistrations (CodeGenerationOptions opt, Generat
 		public static void GenerateEnumList (GenerationInfo gen_info)
 		{
 			using (var sw = new StreamWriter (File.Create (Path.Combine (gen_info.CSharpDir, "enumlist")))) {
-				foreach (string e in gen_info.Enums)
+				foreach (string e in gen_info.Enums.OrderBy (p => p, StringComparer.OrdinalIgnoreCase))
 					sw.WriteLine (e);
 			}
 		}

tools/generator/Java.Interop.Tools.Generator.ObjectModel/GenBase.cs

@@ -869,7 +869,6 @@ protected void GenerateAnnotationAttribute (CodeGenerationOptions opt, Generatio
 				var baseName = Namespace.Length > 0 ? FullName.Substring (Namespace.Length + 1) : FullName;
 				var attrClassNameBase = baseName.Substring (TypeNamePrefix.Length) + "Attribute";
 				var localFullName = Namespace + (Namespace.Length > 0 ? "." : string.Empty) + attrClassNameBase;
-				gen_info.CurrentType = localFullName;
 
 				using (var sw = gen_info.OpenStream (opt.GetFileName (localFullName))) {
 					sw.WriteLine ("using System;");

tools/generator/Java.Interop.Tools.Generator.ObjectModel/InterfaceGen.cs

@@ -188,8 +188,6 @@ internal string GetArgsName (Method m)
 
 		public override void Generate (CodeGenerationOptions opt, GenerationInfo gen_info)
 		{
-			gen_info.CurrentType = FullName;
-
 			using (var sw = gen_info.OpenStream (opt.GetFileName (FullName))) {
 				sw.WriteLine ("using System;");
 				sw.WriteLine ("using System.Collections.Generic;");