Enable threadallow and remove patched code path

Synergetik · Dec 6, 2024 · 5270e4d · 5270e4d
1 parent 7f122fb
commit 5270e4d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/Examples/test-suite/director_thread_lock.i b/Examples/test-suite/director_thread_lock.i
@@ -42,6 +42,9 @@ extern "C" {
 %}
 
 %director Foo;
+%threadallow Foo::invoke_foo;
+%threadallow Foo::invoke_bar;
+%threadallow Foo::stop;
 
 %inline {
   static void MilliSecondSleep(int milliseconds) {

diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
@@ -3130,16 +3130,16 @@ class PYTHON:public Language {
     /* Emit the function call */
     if (director_method) {
       Append(f->code, "try {\n");
-    }
-
-    if (allow_thread) {
-      String *preaction = NewString("");
-      thread_begin_allow(n, preaction);
-      Setattr(n, "wrap:preaction", preaction);
+    } else {
+      if (allow_thread) {
+	String *preaction = NewString("");
+	thread_begin_allow(n, preaction);
+	Setattr(n, "wrap:preaction", preaction);
 
-      String *postaction = NewString("");
-      thread_end_allow(n, postaction);
-      Setattr(n, "wrap:postaction", postaction);
+	String *postaction = NewString("");
+	thread_end_allow(n, postaction);
+	Setattr(n, "wrap:postaction", postaction);
+      }
     }
 
     Setattr(n, "wrap:name", wname);