Merge pull request #1390 from peppy/thread-name-fix

Fix regression in frame statistics display thread names
ppy · Feb 13, 2018 · 63c9440 · 63c9440
2 parents 0299306 + 3d2017d
commit 63c9440
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 18 deletions.
diff --git a/osu.Framework/Development/ThreadSafety.cs b/osu.Framework/Development/ThreadSafety.cs
@@ -36,10 +36,10 @@ internal static void EnsureDrawThread()
             Debug.Assert(IsDrawThread);
         }
 
-        public static bool IsUpdateThread => Thread.CurrentThread.Name == UpdateThread.THREAD_NAME;
+        public static bool IsUpdateThread => Thread.CurrentThread.Name == GameThread.PrefixedThreadNameFor("Update");
 
-        public static bool IsDrawThread => Thread.CurrentThread.Name == DrawThread.THREAD_NAME;
+        public static bool IsDrawThread => Thread.CurrentThread.Name == GameThread.PrefixedThreadNameFor("Draw");
 
-        public static bool IsAudioThread => Thread.CurrentThread.Name == AudioThread.THREAD_NAME;
+        public static bool IsAudioThread => Thread.CurrentThread.Name == GameThread.PrefixedThreadNameFor("Audio");
     }
 }
diff --git a/osu.Framework/Graphics/Performance/FrameStatisticsDisplay.cs b/osu.Framework/Graphics/Performance/FrameStatisticsDisplay.cs
@@ -103,7 +103,7 @@ public FrameStatisticsMode State
 
         public FrameStatisticsDisplay(GameThread thread, TextureAtlas atlas)
         {
-            Name = thread.Thread.Name;
+            Name = thread.Name;
             monitor = thread.Monitor;
 
             Origin = Anchor.TopRight;

diff --git a/osu.Framework/Threading/AudioThread.cs b/osu.Framework/Threading/AudioThread.cs
@@ -9,10 +9,8 @@ namespace osu.Framework.Threading
 {
     public class AudioThread : GameThread
     {
-        internal const string THREAD_NAME = "Framework.Audio.Thread";
-
         public AudioThread(Action onNewFrame)
-            : base(onNewFrame, THREAD_NAME)
+            : base(onNewFrame, "Audio")
         {
         }
 

diff --git a/osu.Framework/Threading/DrawThread.cs b/osu.Framework/Threading/DrawThread.cs
@@ -9,10 +9,8 @@ namespace osu.Framework.Threading
 {
     public class DrawThread : GameThread
     {
-        internal const string THREAD_NAME = "Framework.Draw.Thread";
-
         public DrawThread(Action onNewFrame)
-            : base(onNewFrame, THREAD_NAME)
+            : base(onNewFrame, "Draw")
         {
         }
 

diff --git a/osu.Framework/Threading/GameThread.cs b/osu.Framework/Threading/GameThread.cs
@@ -61,6 +61,8 @@ public double InactiveHz
             }
         }
 
+        public static string PrefixedThreadNameFor(string name) => $"{nameof(GameThread)}.{name}";
+
         public bool Running => Thread.IsAlive;
 
         public virtual void Exit() => exitRequested = true;
@@ -73,15 +75,19 @@ public double InactiveHz
 
         internal virtual IEnumerable<StatisticsCounterType> StatisticsCounters => Array.Empty<StatisticsCounterType>();
 
-        public GameThread(Action onNewFrame, string threadName)
+        public readonly string Name;
+
+        internal GameThread(Action onNewFrame, string name)
         {
             this.onNewFrame = onNewFrame;
+
             Thread = new Thread(runWork)
             {
-                Name = threadName,
+                Name = PrefixedThreadNameFor(name),
                 IsBackground = true,
             };
 
+            Name = name;
             Clock = new ThrottledFrameClock();
             Monitor = new PerformanceMonitor(Clock, Thread, StatisticsCounters);
             Scheduler = new Scheduler(null, Clock);

diff --git a/osu.Framework/Threading/InputThread.cs b/osu.Framework/Threading/InputThread.cs
@@ -9,10 +9,8 @@ namespace osu.Framework.Threading
 {
     public class InputThread : GameThread
     {
-        internal const string THREAD_NAME = "Framework.Input.Thread";
-
         public InputThread(Action onNewFrame)
-            : base(onNewFrame, THREAD_NAME)
+            : base(onNewFrame, "Input")
         {
         }
 

diff --git a/osu.Framework/Threading/UpdateThread.cs b/osu.Framework/Threading/UpdateThread.cs
@@ -9,10 +9,8 @@ namespace osu.Framework.Threading
 {
     public class UpdateThread : GameThread
     {
-        internal const string THREAD_NAME = "Framework.Update.Thread";
-
         public UpdateThread(Action onNewFrame)
-            : base(onNewFrame, THREAD_NAME)
+            : base(onNewFrame, "Update")
         {
         }