Undo perf improvements for customs access.

CptMoore · CptMoore · commit 1f144644d77e · 2025-02-28T22:29:16.000+01:00
diff --git a/source/CustomComponents/CCLight/Database.cs b/source/CustomComponents/CCLight/Database.cs
@@ -8,56 +8,42 @@ namespace CustomComponents;
 
 public class Database
 {
-    internal static bool AddCustom(string identifier, object target, ICustom cc)
+    internal static T GetCustom<T>(object target)
     {
-        ref var customs = ref DefToCustoms(target);
-        return AddCustomInternal(identifier, ref customs, cc);
-    }
-    private static ref object[] DefToCustoms(object target)
-    {
-        switch (target)
+        var identifier = Identifier(target);
+
+        if (identifier == null)
         {
-            case MechComponentDef def1:
-                return ref def1.ccCustoms;
-            case MechDef def2:
-                return ref def2.ccCustoms;
-            case ChassisDef def3:
-                return ref def3.ccCustoms;
-            case VehicleChassisDef def4:
-                return ref def4.ccCustoms;
-            default:
-                throw new ArgumentException();
+            return default;
         }
-    }
 
-    internal static bool AddCustom(string identifier, ref object[] customs, ICustom cc)
-    {
-        return AddCustomInternal(identifier, ref customs, cc);
-    }
+        if (!Customs.TryGetValue(identifier, out var customs))
+        {
+            return default;
+        }
 
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static IEnumerable<T> GetCustoms<T>(object[] customs)
-    {
-        return GetCustomsInternal<T>(customs);
-    }
+        for (var index = 0; index < customs.Length; index++)
+        {
+            if (customs[index] is T csT)
+            {
+                return csT;
+            }
+        }
 
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static T GetCustom<T>(object[] customs)
-    {
-        return GetCustomInternalFast<T>(customs);
+        return default;
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static bool Is<T>(object[] customs, out T value)
+    internal static bool Is<T>(object target, out T value)
     {
-        value = GetCustom<T>(customs);
+        value = GetCustom<T>(target);
         return value != null;
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static bool Is<T>(object[] customs)
+    internal static bool Is<T>(object target)
     {
-        return GetCustom<T>(customs) != null;
+        return GetCustom<T>(target) != null;
     }
 
     internal static string Identifier(object target)
@@ -77,10 +63,16 @@ internal static string Identifier(object target)
         };
     }
 
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private static IEnumerable<T> GetCustomsInternal<T>(object[] customs)
+    internal static IEnumerable<T> GetCustoms<T>(object target)
     {
-        if (customs == null)
+        var identifier = Identifier(target);
+
+        if (identifier == null)
+        {
+            yield break;
+        }
+
+        if (!Customs.TryGetValue(identifier, out var customs))
         {
             yield break;
         }
@@ -94,28 +86,18 @@ private static IEnumerable<T> GetCustomsInternal<T>(object[] customs)
         }
     }
 
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private static T GetCustomInternalFast<T>(object[] customs)
+    private static readonly Dictionary<string, object[]> Customs = new(StringComparer.Ordinal);
+    internal static bool AddCustom(object target, ICustom cc)
     {
-        if (customs == null)
-        {
-            return default;
-        }
-
-        for (var index = 0; index < customs.Length; index++)
+        var identifier = Identifier(target);
+        if (identifier == null)
         {
-            if (customs[index] is T csT)
-            {
-                return csT;
-            }
+            return false;
         }
 
-        return default;
-    }
+        Customs.TryGetValue(identifier, out var customs);
 
-    private static bool AddCustomInternal(string identifier, ref object[] customs, ICustom cc)
-    {
-        Log.CCLoading.Trace?.Log($"{nameof(AddCustomInternal)} identifier={identifier} cc={cc} cc.type={cc.GetType()}");
+        Log.CCLoading.Trace?.Log($"{nameof(AddCustom)} identifier={identifier} cc={cc} cc.type={cc.GetType()}");
 
         var attribute = GetAttributeByType(cc.GetType());
         Log.CCLoading.Trace?.Log($"--{nameof(CustomComponentAttribute)} {nameof(attribute.Name)}={attribute.Name} {nameof(attribute.AllowArray)}={attribute.AllowArray}");
@@ -137,14 +119,14 @@ private static bool AddCustomInternal(string identifier, ref object[] customs, I
         Log.CCLoading.Trace?.Log("--added");
         if (customs == null)
         {
-            customs = [cc];
+            Customs[identifier] = [cc];
         }
         else
         {
             var newCustoms = new object[customs.Length + 1];
             Array.Copy(customs, newCustoms, customs.Length);
             newCustoms[customs.Length] = cc;
-            customs = newCustoms;
+            Customs[identifier] = newCustoms;
         }
         return true;
     }
diff --git a/source/CustomComponents/CCLight/Extensions.cs b/source/CustomComponents/CCLight/Extensions.cs
@@ -14,34 +14,25 @@ public static class MechComponentDefExtensions
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static T GetComponent<T>(this MechComponentDef target)
     {
-        return Database.GetCustom<T>(target.ccCustoms);
+        return Database.GetCustom<T>(target);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static IEnumerable<T> GetComponents<T>(this MechComponentDef target)
     {
-        return Database.GetCustoms<T>(target.ccCustoms);
+        return Database.GetCustoms<T>(target);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static bool Is<T>(this MechComponentDef target, out T res)
     {
-        // strongly used during combat/ai due to ME ignore_damage
-        // TODO migrate combat related flags to dedicated SimpleInjector fields
-        //  requires changes in calling mods!
-        if (typeof(T) == typeof(Flags))
-        {
-            res = (T)target.ccFlags;
-            return res != null;
-        }
-
-        return Database.Is(target.ccCustoms, out res);
+        return Database.Is(target, out res);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static bool Is<T>(this MechComponentDef target)
     {
-        return Database.Is<T>(target.ccCustoms);
+        return Database.Is<T>(target);
     }
 
     public static T AddComponent<T>(this MechComponentDef target, T component) where T : ICustom
@@ -50,7 +41,7 @@ public static T AddComponent<T>(this MechComponentDef target, T component) where
         {
             simple.Def = target;
         }
-        Database.AddCustom(target.Description.Id, ref target.ccCustoms, component);
+        Database.AddCustom(target, component);
         return component;
     }
 
@@ -70,25 +61,25 @@ public static class VehicleExtentions
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static T GetComponent<T>(this VehicleChassisDef target)
     {
-        return Database.GetCustom<T>(target.ccCustoms);
+        return Database.GetCustom<T>(target);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static IEnumerable<T> GetComponents<T>(this VehicleChassisDef target)
     {
-        return Database.GetCustoms<T>(target.ccCustoms);
+        return Database.GetCustoms<T>(target);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static bool Is<T>(this VehicleChassisDef target, out T res)
     {
-        return Database.Is(target.ccCustoms, out res);
+        return Database.Is(target, out res);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static bool Is<T>(this VehicleChassisDef target)
     {
-        return Database.Is<T>(target.ccCustoms);
+        return Database.Is<T>(target);
     }
 }
 
@@ -97,25 +88,25 @@ public static class MechDefExtensions
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static T GetComponent<T>(this MechDef target)
     {
-        return Database.GetCustom<T>(target.ccCustoms);
+        return Database.GetCustom<T>(target);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static IEnumerable<T> GetComponents<T>(this MechDef target)
     {
-        return Database.GetCustoms<T>(target.ccCustoms);
+        return Database.GetCustoms<T>(target);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static bool Is<T>(this MechDef target, out T res)
     {
-        return Database.Is(target.ccCustoms, out res);
+        return Database.Is(target, out res);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static bool Is<T>(this MechDef target)
     {
-        return Database.Is<T>(target.ccCustoms);
+        return Database.Is<T>(target);
     }
 
     public static bool IsBroken(this MechDef def)
@@ -159,25 +150,25 @@ public static class ChassisDefExtensions
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static T GetComponent<T>(this ChassisDef target)
     {
-        return Database.GetCustom<T>(target.ccCustoms);
+        return Database.GetCustom<T>(target);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static IEnumerable<T> GetComponents<T>(this ChassisDef target)
     {
-        return Database.GetCustoms<T>(target.ccCustoms);
+        return Database.GetCustoms<T>(target);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static bool Is<T>(this ChassisDef target, out T res)
     {
-        return Database.Is(target.ccCustoms, out res);
+        return Database.Is(target, out res);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static bool Is<T>(this ChassisDef target)
     {
-        return Database.Is<T>(target.ccCustoms);
+        return Database.Is<T>(target);
     }
 
     public static T AddComponent<T>(this ChassisDef target, T component) where T : ICustom
@@ -186,7 +177,7 @@ public static T AddComponent<T>(this ChassisDef target, T component) where T : I
         {
             simple.Def = target;
         }
-        Database.AddCustom(target.Description.Id, ref target.ccCustoms, component);
+        Database.AddCustom(target, component);
         return component;
     }
 
diff --git a/source/CustomComponents/CCLight/Registry.cs b/source/CustomComponents/CCLight/Registry.cs
@@ -189,7 +189,7 @@ private static void ProcessCustomFactory(
 
             Log.CCLoading.Trace?.Log($"Created {component} for {identifier}");
 
-            if (Database.AddCustom(identifier, target, component))
+            if (Database.AddCustom(target, component))
             {
                 if (component is IAfterLoad load)
                 {

Original file line number	Diff line number	Diff line change
`@@ -14,34 +14,25 @@ public static class MechComponentDefExtensions`
`14`	`14`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`15`	`15`	`public static T GetComponent<T>(this MechComponentDef target)`
`16`	`16`	`{`
`17`		`- return Database.GetCustom<T>(target.ccCustoms);`
	`17`	`+ return Database.GetCustom<T>(target);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`21`	`21`	`public static IEnumerable<T> GetComponents<T>(this MechComponentDef target)`
`22`	`22`	`{`
`23`		`- return Database.GetCustoms<T>(target.ccCustoms);`
	`23`	`+ return Database.GetCustoms<T>(target);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`27`	`27`	`public static bool Is<T>(this MechComponentDef target, out T res)`
`28`	`28`	`{`
`29`		`- // strongly used during combat/ai due to ME ignore_damage`
`30`		`- // TODO migrate combat related flags to dedicated SimpleInjector fields`
`31`		`- // requires changes in calling mods!`
`32`		`- if (typeof(T) == typeof(Flags))`
`33`		`- {`
`34`		`- res = (T)target.ccFlags;`
`35`		`- return res != null;`
`36`		`- }`
`37`		`-`
`38`		`- return Database.Is(target.ccCustoms, out res);`
	`29`	`+ return Database.Is(target, out res);`
`39`	`30`	`}`
`40`	`31`
`41`	`32`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`42`	`33`	`public static bool Is<T>(this MechComponentDef target)`
`43`	`34`	`{`
`44`		`- return Database.Is<T>(target.ccCustoms);`
	`35`	`+ return Database.Is<T>(target);`
`45`	`36`	`}`
`46`	`37`
`47`	`38`	`public static T AddComponent<T>(this MechComponentDef target, T component) where T : ICustom`
`@@ -50,7 +41,7 @@ public static T AddComponent<T>(this MechComponentDef target, T component) where`
`50`	`41`	`{`
`51`	`42`	`simple.Def = target;`
`52`	`43`	`}`
`53`		`- Database.AddCustom(target.Description.Id, ref target.ccCustoms, component);`
	`44`	`+ Database.AddCustom(target, component);`
`54`	`45`	`return component;`
`55`	`46`	`}`
`56`	`47`
`@@ -70,25 +61,25 @@ public static class VehicleExtentions`
`70`	`61`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`71`	`62`	`public static T GetComponent<T>(this VehicleChassisDef target)`
`72`	`63`	`{`
`73`		`- return Database.GetCustom<T>(target.ccCustoms);`
	`64`	`+ return Database.GetCustom<T>(target);`
`74`	`65`	`}`
`75`	`66`
`76`	`67`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`77`	`68`	`public static IEnumerable<T> GetComponents<T>(this VehicleChassisDef target)`
`78`	`69`	`{`
`79`		`- return Database.GetCustoms<T>(target.ccCustoms);`
	`70`	`+ return Database.GetCustoms<T>(target);`
`80`	`71`	`}`
`81`	`72`
`82`	`73`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`83`	`74`	`public static bool Is<T>(this VehicleChassisDef target, out T res)`
`84`	`75`	`{`
`85`		`- return Database.Is(target.ccCustoms, out res);`
	`76`	`+ return Database.Is(target, out res);`
`86`	`77`	`}`
`87`	`78`
`88`	`79`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`89`	`80`	`public static bool Is<T>(this VehicleChassisDef target)`
`90`	`81`	`{`
`91`		`- return Database.Is<T>(target.ccCustoms);`
	`82`	`+ return Database.Is<T>(target);`
`92`	`83`	`}`
`93`	`84`	`}`
`94`	`85`
`@@ -97,25 +88,25 @@ public static class MechDefExtensions`
`97`	`88`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`98`	`89`	`public static T GetComponent<T>(this MechDef target)`
`99`	`90`	`{`
`100`		`- return Database.GetCustom<T>(target.ccCustoms);`
	`91`	`+ return Database.GetCustom<T>(target);`
`101`	`92`	`}`
`102`	`93`
`103`	`94`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`104`	`95`	`public static IEnumerable<T> GetComponents<T>(this MechDef target)`
`105`	`96`	`{`
`106`		`- return Database.GetCustoms<T>(target.ccCustoms);`
	`97`	`+ return Database.GetCustoms<T>(target);`
`107`	`98`	`}`
`108`	`99`
`109`	`100`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`110`	`101`	`public static bool Is<T>(this MechDef target, out T res)`
`111`	`102`	`{`
`112`		`- return Database.Is(target.ccCustoms, out res);`
	`103`	`+ return Database.Is(target, out res);`
`113`	`104`	`}`
`114`	`105`
`115`	`106`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`116`	`107`	`public static bool Is<T>(this MechDef target)`
`117`	`108`	`{`
`118`		`- return Database.Is<T>(target.ccCustoms);`
	`109`	`+ return Database.Is<T>(target);`
`119`	`110`	`}`
`120`	`111`
`121`	`112`	`public static bool IsBroken(this MechDef def)`
`@@ -159,25 +150,25 @@ public static class ChassisDefExtensions`
`159`	`150`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`160`	`151`	`public static T GetComponent<T>(this ChassisDef target)`
`161`	`152`	`{`
`162`		`- return Database.GetCustom<T>(target.ccCustoms);`
	`153`	`+ return Database.GetCustom<T>(target);`
`163`	`154`	`}`
`164`	`155`
`165`	`156`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`166`	`157`	`public static IEnumerable<T> GetComponents<T>(this ChassisDef target)`
`167`	`158`	`{`
`168`		`- return Database.GetCustoms<T>(target.ccCustoms);`
	`159`	`+ return Database.GetCustoms<T>(target);`
`169`	`160`	`}`
`170`	`161`
`171`	`162`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`172`	`163`	`public static bool Is<T>(this ChassisDef target, out T res)`
`173`	`164`	`{`
`174`		`- return Database.Is(target.ccCustoms, out res);`
	`165`	`+ return Database.Is(target, out res);`
`175`	`166`	`}`
`176`	`167`
`177`	`168`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`178`	`169`	`public static bool Is<T>(this ChassisDef target)`
`179`	`170`	`{`
`180`		`- return Database.Is<T>(target.ccCustoms);`
	`171`	`+ return Database.Is<T>(target);`
`181`	`172`	`}`
`182`	`173`
`183`	`174`	`public static T AddComponent<T>(this ChassisDef target, T component) where T : ICustom`
`@@ -186,7 +177,7 @@ public static T AddComponent<T>(this ChassisDef target, T component) where T : I`
`186`	`177`	`{`
`187`	`178`	`simple.Def = target;`
`188`	`179`	`}`
`189`		`- Database.AddCustom(target.Description.Id, ref target.ccCustoms, component);`
	`180`	`+ Database.AddCustom(target, component);`
`190`	`181`	`return component;`
`191`	`182`	`}`
`192`	`183`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ private static void ProcessCustomFactory(`
`189`	`189`
`190`	`190`	`Log.CCLoading.Trace?.Log($"Created {component} for {identifier}");`
`191`	`191`
`192`		`- if (Database.AddCustom(identifier, target, component))`
	`192`	`+ if (Database.AddCustom(target, component))`
`193`	`193`	`{`
`194`	`194`	`if (component is IAfterLoad load)`
`195`	`195`	`{`