MNT: improve process ordering for spawned workers.

phmbressan · phmbressan · commit d22c95741474 · 2024-08-23T10:17:59.000-03:00
diff --git a/rocketpy/simulation/monte_carlo.py b/rocketpy/simulation/monte_carlo.py
@@ -298,8 +298,7 @@ def __run_in_parallel(self, n_workers=None):
         None
         """
         if n_workers is None or n_workers > os.cpu_count():
-            # For Windows, the number of workers must be at most os.cpu_count() - 1
-            n_workers = os.cpu_count() - 1
+            n_workers = os.cpu_count()
 
         if n_workers < 2:
             raise ValueError("Number of workers must be at least 2 for parallel mode.")
@@ -321,6 +320,13 @@ def __run_in_parallel(self, n_workers=None):
             processes = []
             seeds = np.random.SeedSequence().spawn(n_workers - 1)
 
+            sim_consumer = multiprocess.Process(
+                target=self.__sim_consumer,
+                args=(export_queue, mutex, consumer_stop_event, simulation_error_event),
+            )
+
+            sim_consumer.start()
+
             for seed in seeds:
                 sim_producer = multiprocess.Process(
                     target=self.__sim_producer,
@@ -337,13 +343,6 @@ def __run_in_parallel(self, n_workers=None):
             for sim_producer in processes:
                 sim_producer.start()
 
-            sim_consumer = multiprocess.Process(
-                target=self.__sim_consumer,
-                args=(export_queue, mutex, consumer_stop_event, simulation_error_event),
-            )
-
-            sim_consumer.start()
-
             try:
                 for sim_producer in processes:
                     sim_producer.join()
@@ -455,14 +454,18 @@ def __sim_consumer(
             The event indicating that an error occurred during the simulation.
         """
         trials = 0
-        while not stop_event.is_set() and not error_event.is_set():
+
+        while not error_event.is_set():
             try:
                 mutex.acquire()
                 inputs_dict, outputs_dict = export_queue.get(timeout=3)
 
                 self.__export_flight_data(inputs_dict, outputs_dict)
 
             except queue.Empty as exc:
+                if stop_event.is_set():
+                    break
+
                 trials += 1
 
                 if trials > 10:
