Changeset 3633

Timestamp:

03/20/07 07:16:55 (2 years ago)

Author:

timothy

Message:

The calls in callScriptFunctionNamed should acquire the python GIL lock. With this change, Colloquy no longer get a SIGBUS when calling some Python functions. Patch by Nall. #1029

Files:

• trunk/Plug-Ins/Python Support/JVPythonChatPlugin.m (modified) (3 diffs)

trunk/Plug-Ins/Python Support/JVPythonChatPlugin.m

@@ -264 +264 @@
-        if( ! _scriptModule ) return nil;
-
+    PyGILState_STATE state;
+        
-        PyObject *dict = PyModule_GetDict( _scriptModule );
-        if( ! dict ) return nil;
@@ -282 +284 @@
-                }
-
+                state = PyGILState_Ensure();
-                PyObject *ret = PyObject_CallObject( func, args );
-
@@ -289 +292 @@
-                Py_XDECREF( ret );
-                Py_DECREF( args );
-
+
-                [self reportErrorIfNeededInFunction:functionName];
+
+                PyGILState_Release(state);
-
-                return realRet;