Changeset 25394

Timestamp:

May 6, 2021, 6:49:34 PM (3 years ago)

Author:

wraitii

Message:

Fix Profiler1 "time per turn".

Actually call Turn() when a turn is processed.

Fixes #6144

Differential Revision: ​https://code.wildfiregames.com/D3885

Location:

ps/trunk/source

Files:

• ps/Game.cpp (modified) (1 diff)
• ps/Profile.h (modified) (2 diffs)
• simulation2/system/TurnManager.cpp (modified) (2 diffs)
• simulation2/system/TurnManager.h (modified) (1 diff)

ps/trunk/source/ps/Game.cpp

@@ -394 +394 @@
     if (deltaSimTime)
     {
-        // To avoid confusing the profiler, we need to trigger the new turn
-        // while we're not nested inside any PROFILE blocks
-        if (m_TurnManager->WillUpdate(deltaSimTime))
-            g_Profiler.Turn();
-
         // At the normal sim rate, we currently want to render at least one
         // frame per simulation turn, so let maxTurns be 1. But for fast-forward

ps/trunk/source/ps/Profile.h

@@ -1 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 202 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -32 +32 @@
 
 #define PROFILE_AMORTIZE_FRAMES 30
-#define PROFILE_AMORTIZE_TURNS 1
+#define PROFILE_AMORTIZE_TURNS 
 
 class CProfileManager;

ps/trunk/source/simulation2/system/TurnManager.cpp

@@ -63 +63 @@
 }
 
-bool CTurnManager::WillUpdate(float simFrameLength) const
-{
-    // Keep this in sync with the return value of Update()
-
-    if (m_CurrentTurn > m_FinalTurn)
-        return false;
-
-    if (m_DeltaSimTime + simFrameLength < 0)
-        return false;
-
-    if (m_ReadyTurn <= m_CurrentTurn)
-        return false;
-
-    return true;
-}
-
 bool CTurnManager::Update(float simFrameLength, size_t maxTurns)
 {
@@ -124 +108 @@
         if (m_ReadyTurn <= m_CurrentTurn && m_CommandDelay > 1)
             break;
+
+
+
+
 
         NotifyFinishedOwnCommands(m_CurrentTurn + m_CommandDelay);

ps/trunk/source/simulation2/system/TurnManager.h

@@ -113 +113 @@
 
     /**
-     * Returns whether Update(simFrameLength, ...) will process at least one new turn.
-     * @param simFrameLength Length of the previous frame, in simulation seconds
-     */
-    bool WillUpdate(float simFrameLength) const;
-
-    /**
      * Advance the graphics by a certain time.
      * @param simFrameLength Length of the previous frame, in simulation seconds