Fix Python sim.wait() #385

CauldronDevelopmentLLC · Mar 9, 2023 · 8a867d3 · 8a867d3
1 parent d7e9288
commit 8a867d3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/python/PySimulation.cpp b/src/python/PySimulation.cpp
@@ -565,7 +565,7 @@ namespace {
       auto &task = self->s->task;
 
       if (task.isSet()) {
-        task->join();
+        task->wait();
         task.release();
       }
 

diff --git a/src/python/PyTask.cpp b/src/python/PyTask.cpp
@@ -35,6 +35,13 @@ void PyTask::join() {
 }
 
 
+void PyTask::wait() {
+  Py_BEGIN_ALLOW_THREADS;
+  Thread::wait();
+  Py_END_ALLOW_THREADS;
+}
+
+
 void PyTask::setCallback(PyObject *cb) {
   if (cb && cb != Py_None && !PyCallable_Check(cb))
     THROW("`callback` object not callable");

diff --git a/src/python/PyTask.h b/src/python/PyTask.h
@@ -37,6 +37,7 @@ class PyTask : public CAMotics::Task, public cb::Thread {
 
   // From cb::Thread
   void join();
+  void wait();
 
   // From CAMotics::Task
   void updated(const std::string &status, double progress);