From fb20d72ee29de9311a81aec6eb9f02fd2aa35fc4 Mon Sep 17 00:00:00 2001
From: Sébastien Crozet <developer@crozet.re>
Date: Sun, 20 Feb 2022 12:55:00 +0100
Subject: Joint API and joint motors improvements

---
 src_testbed/harness/mod.rs | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

(limited to 'src_testbed/harness/mod.rs')

diff --git a/src_testbed/harness/mod.rs b/src_testbed/harness/mod.rs
index beebe80..59cccc3 100644
--- a/src_testbed/harness/mod.rs
+++ b/src_testbed/harness/mod.rs
@@ -16,32 +16,58 @@ pub mod plugin;
 pub struct RunState {
     #[cfg(feature = "parallel")]
     pub thread_pool: rapier::rayon::ThreadPool,
-    pub num_threads: usize,
+    #[cfg(feature = "parallel")]
+    num_threads: usize,
     pub timestep_id: usize,
     pub time: f32,
 }
 
 impl RunState {
+    #[cfg(feature = "parallel")]
     pub fn new() -> Self {
-        #[cfg(feature = "parallel")]
         let num_threads = num_cpus::get_physical();
-        #[cfg(not(feature = "parallel"))]
-        let num_threads = 1;
 
-        #[cfg(feature = "parallel")]
         let thread_pool = rapier::rayon::ThreadPoolBuilder::new()
             .num_threads(num_threads)
             .build()
             .unwrap();
 
         Self {
-            #[cfg(feature = "parallel")]
             thread_pool: thread_pool,
             num_threads,
             timestep_id: 0,
             time: 0.0,
         }
     }
+
+    #[cfg(not(feature = "parallel"))]
+    pub fn new() -> Self {
+        Self {
+            timestep_id: 0,
+            time: 0.0,
+        }
+    }
+
+    #[cfg(feature = "parallel")]
+    pub fn num_threads(&self) -> usize {
+        self.num_threads
+    }
+
+    #[cfg(not(feature = "parallel"))]
+    pub fn num_threads(&self) -> usize {
+        1
+    }
+
+    #[cfg(feature = "parallel")]
+    pub fn set_num_threads(&mut self, num_threads: usize) {
+        if self.num_threads != num_threads {
+            self.thread_pool = rapier::rayon::ThreadPoolBuilder::new()
+                .num_threads(num_threads)
+                .build()
+                .unwrap();
+            self.num_threads = num_threads;
+        }
+    }
 }
 
 pub struct Harness {
-- 
cgit