Ticket #1756: pathperf7_dry1.patch

source/simulation2/components/CCmpPathfinder.cpp

@@ -629 +629 @@
     }
 }
 
-void CCmpPathfinder::ProcessSameTurnMoves()
+
+template <class RequestType> void CCmpPathfinder::ProcessSameTurnMoves(std::vector<RequestType> &m_AsyncPathRequests, void (CCmpPathfinder::*ProcessRequests)(const std::vector<RequestType>&))
 {
-    if (!m_AsyncLongPathRequests.empty())
+    if (!m_AsyncPathRequests.empty())
     {
         // Figure out how many moves we can do this time
         i32 moveCount = m_MaxSameTurnMoves - m_SameTurnMovesCount;
@@ -640 +641 @@
             return;
 
         // Copy the long request elements we are going to process into a new array
-        std::vector<AsyncLongPathRequest> longRequests;
-        if ((i32)m_AsyncLongPathRequests.size() <= moveCount)
+        std::vector<RequestType> requests;
+        if ((i32)m_AsyncPathRequests.size() <= moveCount)
         {
-            m_AsyncLongPathRequests.swap(longRequests);
-            moveCount = (i32)longRequests.size();
+            m_AsyncPathRequests.swap(requests);
+            moveCount = (i32)requests.size();
         }
         else
         {
-            longRequests.resize(moveCount);
-            copy(m_AsyncLongPathRequests.begin(), m_AsyncLongPathRequests.begin() + moveCount, longRequests.begin());
-            m_AsyncLongPathRequests.erase(m_AsyncLongPathRequests.begin(), m_AsyncLongPathRequests.begin() + moveCount);
+            requests.resize(moveCount);
+            copy(m_AsyncPathRequests.begin(), m_AsyncPathRequests.begin() + moveCount, requests.begin());
+            m_AsyncPathRequests.erase(m_AsyncPathRequests.begin(), m_AsyncPathRequests.begin() + moveCount);
         }
 
-        ProcessLongRequests(longRequests);
+        (this->*ProcessRequests)(requests);
 
         m_SameTurnMovesCount = (u16)(m_SameTurnMovesCount + moveCount);
     }
-    
-    if (!m_AsyncShortPathRequests.empty())
-    {
-        // Figure out how many moves we can do now
-        i32 moveCount = m_MaxSameTurnMoves - m_SameTurnMovesCount;
+}
 
-        if (moveCount <= 0)
-            return;
 
-        // Copy the short request elements we are going to process into a new array
-        std::vector<AsyncShortPathRequest> shortRequests;
-        if ((i32)m_AsyncShortPathRequests.size() <= moveCount)
-        {
-            m_AsyncShortPathRequests.swap(shortRequests);
-            moveCount = (i32)shortRequests.size();
-        }
-        else
-        {
-            shortRequests.resize(moveCount);
-            copy(m_AsyncShortPathRequests.begin(), m_AsyncShortPathRequests.begin() + moveCount, shortRequests.begin());
-            m_AsyncShortPathRequests.erase(m_AsyncShortPathRequests.begin(), m_AsyncShortPathRequests.begin() + moveCount);
-        }
+void CCmpPathfinder::ProcessSameTurnMoves()
+{
+    ProcessSameTurnMoves(m_AsyncLongPathRequests, &CCmpPathfinder::ProcessLongRequests);
+    ProcessSameTurnMoves(m_AsyncShortPathRequests, &CCmpPathfinder::ProcessShortRequests);
+}
 
-        ProcessShortRequests(shortRequests);
 
-        m_SameTurnMovesCount = (u16)(m_SameTurnMovesCount + moveCount);
-    }
-}
 
 //////////////////////////////////////////////////////////
 

source/simulation2/components/CCmpPathfinder_Common.h

@@ -394 +394 @@
     void ProcessShortRequests(const std::vector<AsyncShortPathRequest>& shortRequests);
 
     virtual void ProcessSameTurnMoves();
+    template <class RequestType> void ProcessSameTurnMoves(std::vector<RequestType> &m_AsyncPathRequests, void (CCmpPathfinder::*ProcessRequests)(const std::vector<RequestType>&));
 
     /**
      * Compute the navcell indexes on the grid nearest to a given point