From afac512a1bfd09d115fc60b9dcfc5d8c0b7e776e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Sep 2019 02:12:17 +0900
Subject: [PATCH 1/3] Fix databased config save performance

Adds proper save debounce logic. Closes #5991.
---
 .../Configuration/DatabasedConfigManager.cs   | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Configuration/DatabasedConfigManager.cs b/osu.Game/Configuration/DatabasedConfigManager.cs
index d5cdd7e4bc..6aa89cdd69 100644
--- a/osu.Game/Configuration/DatabasedConfigManager.cs
+++ b/osu.Game/Configuration/DatabasedConfigManager.cs
@@ -16,11 +16,11 @@ namespace osu.Game.Configuration
 
         private readonly int? variant;
 
-        private readonly List<DatabasedSetting> databasedSettings;
+        private List<DatabasedSetting> databasedSettings;
 
         private readonly RulesetInfo ruleset;
 
-        private readonly bool legacySettingsExist;
+        private bool legacySettingsExist;
 
         protected DatabasedConfigManager(SettingsStore settings, RulesetInfo ruleset = null, int? variant = null)
         {
@@ -28,21 +28,34 @@ namespace osu.Game.Configuration
             this.ruleset = ruleset;
             this.variant = variant;
 
-            databasedSettings = settings.Query(ruleset?.ID, variant);
-            legacySettingsExist = databasedSettings.Any(s => int.TryParse(s.Key, out var _));
+            Load();
 
             InitialiseDefaults();
         }
 
         protected override void PerformLoad()
         {
+            databasedSettings = settings.Query(ruleset?.ID, variant);
+            legacySettingsExist = databasedSettings.Any(s => int.TryParse(s.Key, out var _));
         }
 
         protected override bool PerformSave()
         {
+            lock (dirtySettings)
+            {
+                if (dirtySettings.Count > 0)
+                {
+                    foreach (var setting in dirtySettings)
+                        settings.Update(setting);
+                    dirtySettings.Clear();
+                }
+            }
+
             return true;
         }
 
+        private readonly List<DatabasedSetting> dirtySettings = new List<DatabasedSetting>();
+
         protected override void AddBindable<TBindable>(T lookup, Bindable<TBindable> bindable)
         {
             base.AddBindable(lookup, bindable);
@@ -80,7 +93,9 @@ namespace osu.Game.Configuration
             bindable.ValueChanged += b =>
             {
                 setting.Value = b.NewValue;
-                settings.Update(setting);
+                lock (dirtySettings)
+                    if (!dirtySettings.Contains(setting))
+                        dirtySettings.Add(setting);
             };
         }
     }

From d40129aabe9a8947add0a28b6a51fa85b7017365 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 5 Sep 2019 13:36:37 +0900
Subject: [PATCH 2/3] Remove unnecessary count check

---
 osu.Game/Configuration/DatabasedConfigManager.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Configuration/DatabasedConfigManager.cs b/osu.Game/Configuration/DatabasedConfigManager.cs
index 6aa89cdd69..0046f4fa7f 100644
--- a/osu.Game/Configuration/DatabasedConfigManager.cs
+++ b/osu.Game/Configuration/DatabasedConfigManager.cs
@@ -43,12 +43,9 @@ namespace osu.Game.Configuration
         {
             lock (dirtySettings)
             {
-                if (dirtySettings.Count > 0)
-                {
-                    foreach (var setting in dirtySettings)
-                        settings.Update(setting);
-                    dirtySettings.Clear();
-                }
+                foreach (var setting in dirtySettings)
+                    settings.Update(setting);
+                dirtySettings.Clear();
             }
 
             return true;

From 070a005294668614deaf2779450eed7b1e90051e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 5 Sep 2019 13:37:11 +0900
Subject: [PATCH 3/3] Add braces to lock()

Personal preference, I want to be sure that everything is wrapped correctly.
---
 osu.Game/Configuration/DatabasedConfigManager.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Configuration/DatabasedConfigManager.cs b/osu.Game/Configuration/DatabasedConfigManager.cs
index 0046f4fa7f..02382cfd2b 100644
--- a/osu.Game/Configuration/DatabasedConfigManager.cs
+++ b/osu.Game/Configuration/DatabasedConfigManager.cs
@@ -90,9 +90,12 @@ namespace osu.Game.Configuration
             bindable.ValueChanged += b =>
             {
                 setting.Value = b.NewValue;
+
                 lock (dirtySettings)
+                {
                     if (!dirtySettings.Contains(setting))
                         dirtySettings.Add(setting);
+                }
             };
         }
     }