Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cache reflection portion of SettingSource lookups #14674

Merged
merged 6 commits into from Sep 9, 2021
Merged

Cache reflection portion of SettingSource lookups #14674

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
81c9d83
Cache reflection portion of `SettingSource` lookups
peppy Sep 8, 2021
a622a0b
Use a more traditional method of caching
peppy Sep 8, 2021
41a2e6e
Fix cache not actually caching anything
peppy Sep 9, 2021
efaf07d
Add benchmark coverage of mod retrieval
peppy Sep 9, 2021
4708cb7
Fix enumerable not being consumed
peppy Sep 9, 2021
38f4b0c
Merge branch 'master' into cache-setting-source
peppy Sep 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 10 additions & 12 deletions osu.Game/Configuration/SettingSourceAttribute.cs
View file
Open in desktop
Expand Up @@ -167,18 +167,7 @@ public static IEnumerable<Drawable> CreateSettingsControls(this object obj)
}
}

public static IEnumerable<(SettingSourceAttribute, PropertyInfo)> GetSettingsSourceProperties(this object obj)
{
foreach (var property in obj.GetType().GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance))
{
var attr = property.GetCustomAttribute<SettingSourceAttribute>(true);

if (attr == null)
continue;

yield return (attr, property);
}
}
public static IEnumerable<(SettingSourceAttribute, PropertyInfo)> GetSettingsSourceProperties<T>(this T obj) => SettingSourceCache<T>.SettingSourceProperties;

public static ICollection<(SettingSourceAttribute, PropertyInfo)> GetOrderedSettingsSourceProperties(this object obj)
=> obj.GetSettingsSourceProperties()
Expand All @@ -196,5 +185,14 @@ private class ModDropdownControl : DropdownControl
protected override DropdownMenu CreateMenu() => base.CreateMenu().With(m => m.MaxHeight = 100);
}
}

private static class SettingSourceCache<T>
{
public static (SettingSourceAttribute, PropertyInfo)[] SettingSourceProperties { get; } =
typeof(T).GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance)
.Select(property => (property.GetCustomAttribute<SettingSourceAttribute>(), property))
.Where(pair => pair.Item1 != null)
.ToArray();
}
}
}