Update our usage of workerpools

src/ServerPrivate.cc

@@ -198,16 +198,22 @@ bool ServerPrivate::Run(const uint64_t _iterations,
   }
   else
   {
+    if (!this->workerPool.has_value())
+    {
+      // Initialize the workerpool if we do have multiple simulation runners and
+      // it hasn't been initialized before
+      this->workerPool.emplace(2);
+    }
     for (std::unique_ptr<SimulationRunner> &runner : this->simRunners)
     {
-      this->workerPool.AddWork([&runner, &_iterations] ()
+      this->workerPool->AddWork([&runner, &_iterations] ()
         {
           runner->Run(_iterations);
         });
     }
 
     // Wait for the runner to complete.
-    result = this->workerPool.WaitForResults();
+    result = this->workerPool->WaitForResults();
   }
 
   // See comments ServerPrivate::Stop() for why we lock this mutex here.

src/ServerPrivate.hh

@@ -154,7 +154,10 @@ namespace gz
         const gz::msgs::ServerControl &_req, msgs::Boolean &_res);
 
       /// \brief A pool of worker threads.
-      public: common::WorkerPool workerPool{2};
+      /// \note We use optional here since most of the time, there will be a
+      /// single simulation runner and a workerpool is not needed. We will
+      /// initialize the workerpool as necessary later on.
+      public: std::optional<common::WorkerPool> workerPool;
 
       /// \brief All the simulation runners.
       public: std::vector<std::unique_ptr<SimulationRunner>> simRunners;

src/SimulationRunner.hh

@@ -41,7 +41,6 @@
 #include <sdf/World.hh>
 
 #include <gz/common/Event.hh>
-#include <gz/common/WorkerPool.hh>
 #include <gz/math/Stopwatch.hh>
 #include <gz/transport/Node.hh>
 
@@ -433,9 +432,6 @@ namespace gz
       /// \brief Manager of distributing/receiving network work.
       private: std::unique_ptr<NetworkManager> networkMgr{nullptr};
 
-      /// \brief A pool of worker threads.
-      private: common::WorkerPool workerPool{2};
-
       /// \brief Wall time of the previous update.
       private: std::chrono::steady_clock::time_point prevUpdateRealTime;