From 66f26bb1c10e98ea594a6150bc6d09f018b1a536 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sun, 23 Apr 2023 21:10:25 +1000 Subject: [PATCH] Create and use `IDictionary.GetValueOrPut{,New,New1}` extensions --- src/BizHawk.BizInvoke/BizExvoker.cs | 16 +++------ src/BizHawk.BizInvoke/BizInvoker.cs | 34 ++++++------------- src/BizHawk.Bizware.BizwareGL/Pipeline.cs | 18 ++++------ .../Api/Classes/GuiApi.cs | 9 +++-- .../Api/MemoryMappedFiles.cs | 15 +++----- .../DisplayManager/DisplayManagerBase.cs | 7 ++-- .../config/PathEntryCollection.cs | 9 ++--- .../fwmanager/FirmwareManager.cs | 6 +--- .../RetroAchievements/RCheevos.GameInfo.cs | 4 ++- .../config/ControllerConfig.cs | 7 ++-- .../config/FirmwaresConfig.cs | 18 +++++----- .../tools/Lua/Libraries/TAStudioLuaLibrary.cs | 5 ++- .../tools/Lua/LuaPictureBox.cs | 30 +++------------- .../tools/TAStudio/TAStudio.ListView.cs | 14 ++++---- .../tools/ToolManager.cs | 29 +++------------- src/BizHawk.Common/BinaryQuickSerializer.cs | 12 ++----- src/BizHawk.Common/CustomCollections.cs | 6 ++-- .../Extensions/CollectionExtensions.cs | 27 +++++++++++++++ src/BizHawk.Common/SettingsUtil.cs | 8 ++--- src/BizHawk.Emulation.Common/TextState.cs | 12 +++---- src/BizHawk.Emulation.Cores/CoreInventory.cs | 10 ++---- 21 files changed, 112 insertions(+), 184 deletions(-) diff --git a/src/BizHawk.BizInvoke/BizExvoker.cs b/src/BizHawk.BizInvoke/BizExvoker.cs index 2802d2bc95..c2afe764e8 100644 --- a/src/BizHawk.BizInvoke/BizExvoker.cs +++ b/src/BizHawk.BizInvoke/BizExvoker.cs @@ -5,6 +5,7 @@ using System.Reflection; using System.Reflection.Emit; using System.Runtime.InteropServices; using BizHawk.Common; +using BizHawk.Common.CollectionExtensions; namespace BizHawk.BizInvoke { @@ -101,18 +102,9 @@ namespace BizHawk.BizInvoke public static IImportResolver GetExvoker(object o, ICallingConventionAdapter a) { - DelegateStorage? ds; - lock (Impls) - { - var type = o.GetType(); - if (!Impls.TryGetValue(type, out ds)) - { - ds = new DelegateStorage(type); - Impls.Add(type, ds!); - } - } - - return new ExvokerImpl(o, ds!, a); + DelegateStorage ds; + lock (Impls) ds = Impls.GetValueOrPutNew1(o.GetType()); + return new ExvokerImpl(o, ds, a); } } diff --git a/src/BizHawk.BizInvoke/BizInvoker.cs b/src/BizHawk.BizInvoke/BizInvoker.cs index 2f1bef0495..8e1351fa76 100644 --- a/src/BizHawk.BizInvoke/BizInvoker.cs +++ b/src/BizHawk.BizInvoke/BizInvoker.cs @@ -110,18 +110,11 @@ namespace BizHawk.BizInvoke where T : class { var nonTrivialAdapter = adapter.GetType() != CallingConventionAdapters.Native.GetType(); - InvokerImpl? impl; - lock (Impls) - { - var baseType = typeof(T); - if (!Impls.TryGetValue(baseType, out impl)) - { - impl = CreateProxy(baseType, false, nonTrivialAdapter); - Impls.Add(baseType, impl!); - } - } - - if (impl!.IsMonitored) + InvokerImpl impl; + lock (Impls) impl = Impls.GetValueOrPut( + typeof(T), + baseType => CreateProxy(baseType, monitor: false, nonTrivialAdapter: nonTrivialAdapter)); + if (impl.IsMonitored) { throw new InvalidOperationException("Class was previously proxied with a monitor!"); } @@ -134,18 +127,11 @@ namespace BizHawk.BizInvoke where T : class { var nonTrivialAdapter = adapter.GetType() != CallingConventionAdapters.Native.GetType(); - InvokerImpl? impl; - lock (Impls) - { - var baseType = typeof(T); - if (!Impls.TryGetValue(baseType, out impl)) - { - impl = CreateProxy(baseType, true, nonTrivialAdapter); - Impls.Add(baseType, impl!); - } - } - - if (!(impl!.IsMonitored)) + InvokerImpl impl; + lock (Impls) impl = Impls.GetValueOrPut( + typeof(T), + baseType => CreateProxy(baseType, monitor: true, nonTrivialAdapter: nonTrivialAdapter)); + if (!impl.IsMonitored) { throw new InvalidOperationException("Class was previously proxied without a monitor!"); } diff --git a/src/BizHawk.Bizware.BizwareGL/Pipeline.cs b/src/BizHawk.Bizware.BizwareGL/Pipeline.cs index bdad307bfe..709ec7bae4 100644 --- a/src/BizHawk.Bizware.BizwareGL/Pipeline.cs +++ b/src/BizHawk.Bizware.BizwareGL/Pipeline.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; +using BizHawk.Common.CollectionExtensions; + namespace BizHawk.Bizware.BizwareGL { /// @@ -48,17 +50,11 @@ namespace BizHawk.Bizware.BizwareGL private Pipeline Owner; public new PipelineUniform this[string key] { - get - { - if (!TryGetValue(key, out var temp)) - { - var ui = new UniformInfo {Opaque = null}; - temp = this[key] = new PipelineUniform(null); - } - - return temp; - } - +#if true + get => this.GetValueOrPut(key, static _ => new(null)); +#else + get => this.GetValueOrPut(key, static _ => new(new UniformInfo { Opaque = null })); +#endif internal set => base[key] = value; } } diff --git a/src/BizHawk.Client.Common/Api/Classes/GuiApi.cs b/src/BizHawk.Client.Common/Api/Classes/GuiApi.cs index 047188f0cf..ade09ac08d 100644 --- a/src/BizHawk.Client.Common/Api/Classes/GuiApi.cs +++ b/src/BizHawk.Client.Common/Api/Classes/GuiApi.cs @@ -6,6 +6,7 @@ using System.Drawing.Imaging; using System.Drawing.Text; using System.IO; +using BizHawk.Common.CollectionExtensions; using BizHawk.Emulation.Common; namespace BizHawk.Client.Common @@ -57,9 +58,11 @@ namespace BizHawk.Client.Common _displayManager = displayManager; } - private SolidBrush GetBrush(Color color) => _solidBrushes.TryGetValue(color, out var b) ? b : (_solidBrushes[color] = new SolidBrush(color)); + private SolidBrush GetBrush(Color color) + => _solidBrushes.GetValueOrPutNew1(color); - private Pen GetPen(Color color) => _pens.TryGetValue(color, out var p) ? p : (_pens[color] = new Pen(color)); + private Pen GetPen(Color color) + => _pens.GetValueOrPutNew1(color); private Graphics GetGraphics(DisplaySurfaceID? surfaceID) { @@ -406,7 +409,7 @@ namespace BizHawk.Client.Common using var g = GetGraphics(surfaceID); g.CompositingMode = _compositingMode; g.DrawImage( - _imageCache.TryGetValue(path, out var img) ? img : (_imageCache[path] = Image.FromFile(path)), + _imageCache.GetValueOrPut(path, Image.FromFile), new Rectangle(dest_x, dest_y, dest_width ?? source_width, dest_height ?? source_height), source_x, source_y, diff --git a/src/BizHawk.Client.Common/Api/MemoryMappedFiles.cs b/src/BizHawk.Client.Common/Api/MemoryMappedFiles.cs index e3815279c4..669f0ce024 100644 --- a/src/BizHawk.Client.Common/Api/MemoryMappedFiles.cs +++ b/src/BizHawk.Client.Common/Api/MemoryMappedFiles.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.IO.MemoryMappedFiles; using System.Text; +using BizHawk.Common.CollectionExtensions; + namespace BizHawk.Client.Common { public sealed class MemoryMappedFiles @@ -27,11 +29,7 @@ namespace BizHawk.Client.Common public byte[] ReadBytesFromFile(string filename, int expectedSize) { - if (!_mmfFiles.TryGetValue(filename, out var mmfFile)) - { - mmfFile = _mmfFiles[filename] = MemoryMappedFile.OpenExisting(filename); - } - + var mmfFile = _mmfFiles.GetValueOrPut(filename, MemoryMappedFile.OpenExisting); using var viewAccessor = mmfFile.CreateViewAccessor(0, expectedSize, MemoryMappedFileAccess.Read); var bytes = new byte[expectedSize]; viewAccessor.ReadArray(0, bytes, 0, expectedSize); @@ -56,12 +54,7 @@ namespace BizHawk.Client.Common accessor.WriteArray(0, outputBytes, 0, outputBytes.Length); return outputBytes.Length; } - - if (!_mmfFiles.TryGetValue(filename, out var mmfFile)) - { - mmfFile = _mmfFiles[filename] = MemoryMappedFile.CreateOrOpen(filename, outputBytes.Length); - } - + var mmfFile = _mmfFiles.GetValueOrPut(filename, s => MemoryMappedFile.CreateOrOpen(s, outputBytes.Length)); try { return TryWrite(mmfFile); diff --git a/src/BizHawk.Client.Common/DisplayManager/DisplayManagerBase.cs b/src/BizHawk.Client.Common/DisplayManager/DisplayManagerBase.cs index 1811193be2..00596b9947 100644 --- a/src/BizHawk.Client.Common/DisplayManager/DisplayManagerBase.cs +++ b/src/BizHawk.Client.Common/DisplayManager/DisplayManagerBase.cs @@ -13,6 +13,7 @@ using BizHawk.Bizware.BizwareGL; using BizHawk.Bizware.BizwareGL.DrawingExtensions; using BizHawk.Client.Common.FilterManager; using BizHawk.Client.Common.Filters; +using BizHawk.Common.CollectionExtensions; using BizHawk.Common.PathExtensions; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Consoles.Nintendo.NDS; @@ -1022,11 +1023,7 @@ namespace BizHawk.Client.Common throw new InvalidOperationException($"ApiHawk/Lua surface is already locked: {surfaceID.GetName()}"); } - if (!_apiHawkSurfaceSets.TryGetValue(surfaceID, out var sdss)) - { - sdss = new(CreateDisplaySurface); - _apiHawkSurfaceSets.Add(surfaceID, sdss); - } + var sdss = _apiHawkSurfaceSets.GetValueOrPut(surfaceID, static _ => new(CreateDisplaySurface)); // placeholder logic for more abstracted surface definitions from filter chain var (currNativeWidth, currNativeHeight) = GetPanelNativeSize(); diff --git a/src/BizHawk.Client.Common/config/PathEntryCollection.cs b/src/BizHawk.Client.Common/config/PathEntryCollection.cs index 792319e0eb..eb1d464d2c 100644 --- a/src/BizHawk.Client.Common/config/PathEntryCollection.cs +++ b/src/BizHawk.Client.Common/config/PathEntryCollection.cs @@ -3,6 +3,8 @@ using System.Collections; using System.Collections.Generic; using System.IO; using System.Linq; + +using BizHawk.Common.CollectionExtensions; using BizHawk.Common.PathExtensions; using BizHawk.Emulation.Common; @@ -81,12 +83,7 @@ namespace BizHawk.Client.Common } public static string GetDisplayNameFor(string sysID) - { - if (_displayNameLookup.TryGetValue(sysID, out var dispName)) return dispName; - var newDispName = $"{sysID} (INTERIM)"; - _displayNameLookup[sysID] = newDispName; - return newDispName; - } + => _displayNameLookup.GetValueOrPut(sysID, static s => s + " (INTERIM)"); public static bool InGroup(string sysID, string group) => sysID == group || group.Split('_').Contains(sysID); diff --git a/src/BizHawk.Client.Common/fwmanager/FirmwareManager.cs b/src/BizHawk.Client.Common/fwmanager/FirmwareManager.cs index 76427a44a3..343c0b8e95 100644 --- a/src/BizHawk.Client.Common/fwmanager/FirmwareManager.cs +++ b/src/BizHawk.Client.Common/fwmanager/FirmwareManager.cs @@ -172,11 +172,7 @@ namespace BizHawk.Client.Common // do we have a user specification for this firmware record? if (!userSpecifications.TryGetValue(fr.ID.ConfigKey, out var userSpec)) continue; - if (!_resolutionDictionary.TryGetValue(fr, out var ri)) - { - ri = new ResolutionInfo(); - _resolutionDictionary[fr] = ri; - } + var ri = _resolutionDictionary.GetValueOrPutNew(fr); // local ri is a reference to a ResolutionInfo which is now definitely in the dict // flag it as user specified diff --git a/src/BizHawk.Client.EmuHawk/RetroAchievements/RCheevos.GameInfo.cs b/src/BizHawk.Client.EmuHawk/RetroAchievements/RCheevos.GameInfo.cs index 059cad5d4c..faae607ca2 100644 --- a/src/BizHawk.Client.EmuHawk/RetroAchievements/RCheevos.GameInfo.cs +++ b/src/BizHawk.Client.EmuHawk/RetroAchievements/RCheevos.GameInfo.cs @@ -6,6 +6,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using BizHawk.Common.CollectionExtensions; + namespace BizHawk.Client.EmuHawk { public partial class RCheevos @@ -150,7 +152,7 @@ namespace BizHawk.Client.EmuHawk protected override int IdentifyHash(string hash) { _gameHash ??= hash; - return _cachedGameIds.TryGetValue(hash, out var id) ? id : (_cachedGameIds[hash] = SendHash(hash)); + return _cachedGameIds.GetValueOrPut(hash, SendHash); } protected override int IdentifyRom(byte[] rom) diff --git a/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs b/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs index 26c3284941..03df2722c1 100644 --- a/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs @@ -8,6 +8,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; using BizHawk.Common; +using BizHawk.Common.CollectionExtensions; using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk @@ -108,11 +109,7 @@ namespace BizHawk.Client.EmuHawk PanelCreator createPanel ) { - if (!settingsBlock.TryGetValue(controllerName, out var settings)) - { - settings = new Dictionary(); - settingsBlock[controllerName] = settings; - } + var settings = settingsBlock.GetValueOrPutNew(controllerName); // check to make sure that the settings object has all of the appropriate bool buttons foreach (var button in controllerButtons) diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs index db5a36136b..cb4b3c1254 100644 --- a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs @@ -177,6 +177,14 @@ namespace BizHawk.Client.EmuHawk private void FirmwaresConfig_Load(object sender, EventArgs e) { + ListViewGroup AddGroup(string sysID) + { + lvFirmwares.Groups.Add( + key: sysID, + headerText: SystemGroupNames.TryGetValue(sysID, out var name) ? name : "FIX ME (FirmwaresConfig.cs)"); + return lvFirmwares.Groups[lvFirmwares.Groups.Count - 1]; + } + // we'll use this font for displaying the hash, so they don't look all jagged in a long list _fixedFont = new Font(new FontFamily("Courier New"), 8); _boldFont = new Font(lvFirmwares.Font, FontStyle.Bold); @@ -206,15 +214,7 @@ namespace BizHawk.Client.EmuHawk lvFirmwares.Items.Add(lvi); // build the groups in the ListView as we go: - if (!groups.TryGetValue(sysID, out var group)) - { - if (!SystemGroupNames.TryGetValue(sysID, out var name)) - name = "FIX ME (FirmwaresConfig.cs)"; - lvFirmwares.Groups.Add(sysID, name); - var lvg = lvFirmwares.Groups[lvFirmwares.Groups.Count - 1]; - group = groups[sysID] = lvg; - } - lvi.Group = group; + lvi.Group = groups.GetValueOrPut(sysID, AddGroup); } // now that we have some items in the ListView, we can size some columns to sensible widths diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/TAStudioLuaLibrary.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/TAStudioLuaLibrary.cs index 42bf4446a8..739ad36370 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/TAStudioLuaLibrary.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/TAStudioLuaLibrary.cs @@ -7,6 +7,7 @@ using System.Linq; using NLua; using BizHawk.Client.Common; using BizHawk.Common; +using BizHawk.Common.CollectionExtensions; // ReSharper disable UnusedMember.Global // ReSharper disable StringLiteralTypo @@ -517,9 +518,7 @@ namespace BizHawk.Client.EmuHawk var result = luaf.Call(index, name); if (result?[0] != null) { - string path = result[0].ToString(); - if (!_iconCache.TryGetValue(path, out var icon)) _iconCache[path] = icon = new(path); - return icon.ToBitmap(); + return _iconCache.GetValueOrPutNew1(result[0].ToString()).ToBitmap(); } return null; diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs index 840d6d8b90..c1f5fef621 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Windows.Forms; using BizHawk.Client.Common; +using BizHawk.Common.CollectionExtensions; using NLua; @@ -20,28 +21,10 @@ namespace BizHawk.Client.EmuHawk internal NLuaTableHelper TableHelper { get; set; } private SolidBrush GetBrush([LuaColorParam] object color) - { - var color1 = TableHelper.ParseColor(color); - if (!_solidBrushes.TryGetValue(color1, out var b)) - { - b = new SolidBrush(color1); - _solidBrushes[color1] = b; - } - - return b; - } + => _solidBrushes.GetValueOrPutNew1(TableHelper.ParseColor(color)); private Pen GetPen([LuaColorParam] object color) - { - var color1 = TableHelper.ParseColor(color); - if (!_pens.TryGetValue(color1, out var p)) - { - p = new Pen(color1); - _pens[color1] = p; - } - - return p; - } + => _pens.GetValueOrPutNew1(TableHelper.ParseColor(color)); private Color _defaultForeground = Color.Black; private Color? _defaultBackground; @@ -190,12 +173,7 @@ namespace BizHawk.Client.EmuHawk public void DrawImageRegion(string path, int sourceX, int sourceY, int sourceWidth, int sourceHeight, int destX, int destY, int? destWidth = null, int? destHeight = null) { - if (!_imageCache.TryGetValue(path, out var img)) - { - img = Image.FromFile(path); - _imageCache.Add(path, img); - } - + var img = _imageCache.GetValueOrPut(path, Image.FromFile); var destRect = new Rectangle(destX, destY, destWidth ?? sourceWidth, destHeight ?? sourceHeight); var boxBackground = Graphics.FromImage(Image); diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index b18d945755..d39bfb6a7c 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -8,6 +8,7 @@ using BizHawk.Emulation.Common; using BizHawk.Common.NumberExtensions; using BizHawk.Client.Common; using BizHawk.Common; +using BizHawk.Common.CollectionExtensions; namespace BizHawk.Client.EmuHawk { @@ -249,13 +250,12 @@ namespace BizHawk.Client.EmuHawk color = Palette.AnalogEdit_Col; } - if (!_alternateRowColor.TryGetValue(columnName, out var useAltColor)) - { - int playerNumber = ControllerDefinition.PlayerNumber(columnName); - _alternateRowColor[columnName] = useAltColor = playerNumber % 2 is 0 && playerNumber is not 0; - } - - if (useAltColor) + if (_alternateRowColor.GetValueOrPut( + columnName, + columnName1 => { + var playerNumber = ControllerDefinition.PlayerNumber(columnName1); + return playerNumber % 2 is 0 && playerNumber is not 0; + })) { color = Color.FromArgb(0x0D, 0x00, 0x00, 0x00); } diff --git a/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs index 1ebbbd0679..ab0d1c71ae 100644 --- a/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs +++ b/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs @@ -10,6 +10,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; using BizHawk.Common; +using BizHawk.Common.CollectionExtensions; using BizHawk.Common.ReflectionExtensions; using BizHawk.Emulation.Common; using BizHawk.WinForms.Controls; @@ -129,22 +130,12 @@ namespace BizHawk.Client.EmuHawk // auto settings if (newTool is IToolFormAutoConfig autoConfigTool) { - AttachSettingHooks( - autoConfigTool, - _config.CommonToolSettings.TryGetValue(toolTypeName, out var settings) - ? settings - : (_config.CommonToolSettings[toolTypeName] = new ToolDialogSettings()) - ); + AttachSettingHooks(autoConfigTool, _config.CommonToolSettings.GetValueOrPutNew(toolTypeName)); } // custom settings if (HasCustomConfig(newTool)) { - InstallCustomConfig( - newTool, - _config.CustomToolSettings.TryGetValue(toolTypeName, out var settings) - ? settings - : (_config.CustomToolSettings[toolTypeName] = new Dictionary()) - ); + InstallCustomConfig(newTool, _config.CustomToolSettings.GetValueOrPutNew(toolTypeName)); } newTool.Restart(); @@ -179,22 +170,12 @@ namespace BizHawk.Client.EmuHawk // auto settings if (newTool is IToolFormAutoConfig autoConfigTool) { - AttachSettingHooks( - autoConfigTool, - _config.CommonToolSettings.TryGetValue(customFormTypeName, out var settings) - ? settings - : (_config.CommonToolSettings[customFormTypeName] = new ToolDialogSettings()) - ); + AttachSettingHooks(autoConfigTool, _config.CommonToolSettings.GetValueOrPutNew(customFormTypeName)); } // custom settings if (HasCustomConfig(newTool)) { - InstallCustomConfig( - newTool, - _config.CustomToolSettings.TryGetValue(customFormTypeName, out var settings) - ? settings - : (_config.CustomToolSettings[customFormTypeName] = new Dictionary()) - ); + InstallCustomConfig(newTool, _config.CustomToolSettings.GetValueOrPutNew(customFormTypeName)); } newTool.Restart(); diff --git a/src/BizHawk.Common/BinaryQuickSerializer.cs b/src/BizHawk.Common/BinaryQuickSerializer.cs index e808cb6bb7..fcb487708d 100644 --- a/src/BizHawk.Common/BinaryQuickSerializer.cs +++ b/src/BizHawk.Common/BinaryQuickSerializer.cs @@ -8,6 +8,8 @@ using System.Reflection; using System.Reflection.Emit; using System.Runtime.InteropServices; +using BizHawk.Common.CollectionExtensions; + namespace BizHawk.Common { // fields are serialized/deserialized in their memory order as reported by Marshal.OffsetOf @@ -162,15 +164,7 @@ namespace BizHawk.Common new ConcurrentDictionary(); private static SerializationFactory GetFactory(Type t) - { - if (!Serializers.TryGetValue(t, out var f)) - { - f = CreateFactory(t); - Serializers[t] = f; - } - - return f; - } + => Serializers.GetValueOrPut(t, CreateFactory); public static T Create(BinaryReader r) where T : new() diff --git a/src/BizHawk.Common/CustomCollections.cs b/src/BizHawk.Common/CustomCollections.cs index ab6afa5c5f..eaf172bf88 100644 --- a/src/BizHawk.Common/CustomCollections.cs +++ b/src/BizHawk.Common/CustomCollections.cs @@ -5,6 +5,8 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Runtime.Serialization; +using BizHawk.Common.CollectionExtensions; + namespace BizHawk.Common { /// Wrapper over WorkingDictionary<, List<>>. @@ -132,9 +134,7 @@ namespace BizHawk.Common [property: MaybeNull] public new TValue this[TKey key] { - get => TryGetValue(key, out var temp) - ? temp - : base[key] = new TValue(); + get => this.GetValueOrPutNew(key); set => base[key] = value; } } diff --git a/src/BizHawk.Common/Extensions/CollectionExtensions.cs b/src/BizHawk.Common/Extensions/CollectionExtensions.cs index 7016bb666a..71506350a2 100644 --- a/src/BizHawk.Common/Extensions/CollectionExtensions.cs +++ b/src/BizHawk.Common/Extensions/CollectionExtensions.cs @@ -160,6 +160,33 @@ namespace BizHawk.Common.CollectionExtensions ? countable.Count == n : collection.Take(n + 1).Count() == n; + /// + /// Returns the value at . + /// If the key is not present, stores the result of defaultValue(key) in the dict, and then returns that. + /// + public static TValue GetValueOrPut(this IDictionary dictionary, TKey key, Func defaultValue) + => dictionary.TryGetValue(key, out var found) ? found : (dictionary[key] = defaultValue(key)); + + /// + /// Returns the value at . + /// If the key is not present, stores the result of new TValue() in the dict, and then returns that. + /// + public static TValue GetValueOrPutNew(this IDictionary dictionary, TKey key) + where TValue : new() + => dictionary.TryGetValue(key, out var found) ? found : (dictionary[key] = new()); + + /// + /// Returns the value at . + /// If the key is not present, stores the result of new TValue(key) in the dict, and then returns that. + /// + /// + /// Will throw if such a constructor does not exist, or exists but is not .
+ /// TODO is fast enough? + /// I suppose it's not that important because it's called on cache miss --yoshi + /// + public static TValue GetValueOrPutNew1(this IDictionary dictionary, TKey key) + => dictionary.GetValueOrPut(key, static k => (TValue) Activator.CreateInstance(typeof(TValue), k)); + /// /// /// (This is an extension method which reimplements for other collections. diff --git a/src/BizHawk.Common/SettingsUtil.cs b/src/BizHawk.Common/SettingsUtil.cs index 6777541ca2..25176ac761 100644 --- a/src/BizHawk.Common/SettingsUtil.cs +++ b/src/BizHawk.Common/SettingsUtil.cs @@ -5,6 +5,8 @@ using System.Reflection.Emit; using System.Collections.Concurrent; using System.ComponentModel; +using BizHawk.Common.CollectionExtensions; + namespace BizHawk.Common { public static class SettingsUtil @@ -32,11 +34,7 @@ namespace BizHawk.Common public static void SetDefaultValues(T obj) where T : notnull { - if (!DefaultValueSetters.TryGetValue(typeof(T), out var f)) - { - f = CreateSetter(typeof(T)); - DefaultValueSetters[typeof(T)] = f; - } + var f = DefaultValueSetters.GetValueOrPut(typeof(T), CreateSetter); f.SetDefaultValues(obj, f.DefaultValues); } diff --git a/src/BizHawk.Emulation.Common/TextState.cs b/src/BizHawk.Emulation.Common/TextState.cs index d3c89356ac..2500b79b31 100644 --- a/src/BizHawk.Emulation.Common/TextState.cs +++ b/src/BizHawk.Emulation.Common/TextState.cs @@ -3,6 +3,9 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; + +using BizHawk.Common.CollectionExtensions; + using Newtonsoft.Json; namespace BizHawk.Emulation.Common @@ -88,14 +91,7 @@ namespace BizHawk.Emulation.Common { // works for either save or load, but as a consequence cannot report intelligent // errors about section name mismatches - Current.Objects.TryGetValue(name, out var next); - if (next == null) - { - next = new Node(); - Current.Objects.Add(name, next); - } - - Nodes.Push(next); + Nodes.Push(Current.Objects.GetValueOrPutNew(name)); } /// doesn't match the section being closed diff --git a/src/BizHawk.Emulation.Cores/CoreInventory.cs b/src/BizHawk.Emulation.Cores/CoreInventory.cs index 3228e38231..5edcde5fd8 100644 --- a/src/BizHawk.Emulation.Cores/CoreInventory.cs +++ b/src/BizHawk.Emulation.Cores/CoreInventory.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Runtime.ExceptionServices; + +using BizHawk.Common.CollectionExtensions; using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores @@ -162,13 +164,7 @@ namespace BizHawk.Emulation.Cores void ProcessConstructor(Type type, CoreConstructorAttribute consAttr, CoreAttribute coreAttr, ConstructorInfo cons) { var core = new Core(type, consAttr, coreAttr, cons); - if (!_systems.TryGetValue(consAttr.System, out var ss)) - { - ss = new List(); - _systems.Add(consAttr.System, ss); - } - - ss.Add(core); + _systems.GetValueOrPutNew(consAttr.System).Add(core); systemsFlat[type] = core; } foreach (var assy in assys)