Simple metrics

.gitignore

@@ -267,3 +267,4 @@ __pycache__/
 
 libs/
 libs.fixed/
+*/*.swp

README.md

@@ -39,6 +39,8 @@
 # Experimental patches
 - MDDB_TagsetQueryInChunks
    - Prevent the game from softlocking/infinite loading when MDDB builds queries too large for sqlite3 to handle.
+- SimpleMetrics
+   - Performance measurement tools used by the mod developers. Unless you know what you're doing, leave this set to false.
 
 # Upcoming patches
 - ParallelizeLoad (Disabled by default: Experimental, Dangerous)

source/BattletechPerformanceFix.csproj

@@ -67,12 +67,13 @@
     <Compile Include="LoadFixes.cs" />
     <Compile Include="ShaderDependencyOverride.cs" />
     <Compile Include="ShopTabLagFix.cs" />
-    <Compile Include="PatchMechLabLimitItems.cs" />
+    <Compile Include="PatchMechlabLimitItems.cs" />
     <Compile Include="EnableLoggingDuringLoads.cs" />
     <Compile Include="RemovedFlashpointFix.cs" />
     <Compile Include="RemovedContractsFix.cs" />
     <Compile Include="EnableConsole.cs" />
     <Compile Include="VersionManifestPatches.cs" />
+    <Compile Include="SimpleMetrics.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\mod.json" />
@@ -120,4 +121,4 @@
     <PostBuildEvent Condition="$(IsLinux) == true">yes | cp "$(TargetDir)$(TargetName).dll" "$(SolutionDir)../../Mods/BattletechPerformanceFix/$(TargetName).dll"</PostBuildEvent>
     <PostBuildEvent Condition="$(IsOSX) == true">yes | cp "$(TargetDir)$(TargetName).dll" "$(SolutionDir)../../Mods/BattletechPerformanceFix/$(TargetName).dll"</PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

source/Extensions.cs

@@ -89,6 +89,15 @@ public static IEnumerable<IEnumerable<T>> GroupsOf<T>(this IEnumerable<T> items,
                         .GroupBy(kv => kv.idx / count, kv => kv.item)
                         .Select(x => x.Select(v => v));
         }
+
+        public static IEnumerable<KeyValuePair<T,K>> Zip<T,K>(this IEnumerable<T> left, IEnumerable<K> right) {
+            var itl = left.GetEnumerator();
+            var itr = right.GetEnumerator();
+
+            while(itl.MoveNext() && itr.MoveNext()) {
+                yield return new KeyValuePair<T,K>(itl.Current, itr.Current);
+            }
+        }
 
         public static T GetWithDefault<K,T>(this Dictionary<K,T> d, K key, Func<T> lazyDefault)
             => d.TryGetValue(key, out var val) ? val : d[key] = lazyDefault();
@@ -228,33 +237,49 @@ public static void Patch( this MethodBase method
             Trap(() => Main.harmony.Patch( method, patches[0], patches[1], patches[2]));
 
         }
+
+        public static MethodBase FindQualifiedMethod(this string qualifiedName) {
+            var ss = qualifiedName.Split(Array("::"), StringSplitOptions.None).ToArray();
+            if (ss.Length != 2) throw new Exception($"Invalid QualifiedMethod string {qualifiedName}");
+            var type = ss[0];
+            var meth = ss[1];
+            LogSpam($"FindQualifiedMethod for {type} {meth}");
+            return AppDomain.CurrentDomain.GetAssemblies()
+                            .Select(asm => asm.GetType(type))
+                            .Where(t => t != null)
+                            .SingleOrDefault()
+                            ?.GetMethod(meth, AccessTools.all);
+        }
 
+        public static string QualifiedSignature(this MethodBase method)
+            => $"{method.DeclaringType.FullName}::{method.ToString()}";
 
-        public static void Patch<T>( this string method
-                                   , string premethod = null
-                                   , string postmethod = null
-                                   , string transpilemethod = null
-                                   , int priority = Priority.Normal
-                                   ) {
+        public static void Patch( this string method
+                                , Type t
+                                , string premethod = null
+                                , string postmethod = null
+                                , string transpilemethod = null
+                                , int priority = Priority.Normal
+                                ) {
             MethodBase meth = null;
-            if (method.StartsWith("ctor")) meth = (MethodBase)typeof(T).GetConstructors(AccessTools.all)[0];
-            else if (method.StartsWith("get_")) meth = (MethodBase)typeof(T).GetProperties(AccessTools.all)
+            if (method.StartsWith("ctor")) meth = (MethodBase)t.GetConstructors(AccessTools.all)[0];
+            else if (method.StartsWith("get_")) meth = (MethodBase)t.GetProperties(AccessTools.all)
                                                                             .FirstOrDefault(mm => { LogDebug($"{mm.Name}"); return method.EndsWith(mm.Name); })
                                                     ?.GetGetMethod();
-            else meth = (MethodBase)typeof(T).GetMethods(AccessTools.all)
+            else meth = (MethodBase)t.GetMethods(AccessTools.all)
                                              .FirstOrDefault(mm => mm.Name == method && mm.GetMethodBody() != null);
-            meth.LogIfNull($"Failed to find patchable function {method} on {typeof(T).FullName}");
+            meth.LogIfNull($"Failed to find patchable function {method} on {t.FullName}");
             meth.Patch(premethod, postmethod, transpilemethod, priority);
         }
 
         public static void Pre<T>(this string method, string patchmethod = null, int priority = Priority.Normal)
-            => method.Patch<T>(patchmethod ?? $"{method}_Pre", null, null, priority);
+            => method.Patch(typeof(T), patchmethod ?? $"{method}_Pre", null, null, priority);
 
         public static void Post<T>(this string method, string patchmethod = null, int priority = Priority.Normal)
-            => method.Patch<T>(null, patchmethod ?? $"{method}_Post", null, priority);
+            => method.Patch(typeof(T), null, patchmethod ?? $"{method}_Post", null, priority);
 
         public static void Transpile<T>(this string method, string patchmethod = null, int priority = Priority.Normal)
-            => method.Patch<T>(null, null, patchmethod ?? $"{method}_Transpile", priority);
+            => method.Patch(typeof(T), null, null, patchmethod ?? $"{method}_Transpile", priority);
 
         // C# macros when...
         public static void Pre<T>(this string method, Action<T> f) where T : class 

source/Main.cs

@@ -100,6 +100,7 @@ public static void Start(string modDirectory, string json)
                     { typeof(RemovedContractsFix), true },
                     { typeof(VersionManifestPatches), true },
                     { typeof(EnableConsole), false },
+                    { typeof(SimpleMetrics), false }
                 };