Changeset 2230

Timestamp:

07/01/07 08:45:42 (1 year ago)

Author:

abaumann

Message:

Don't assume that we are the only user of the Python interpreter in the
process. These fixes allow python plugins to work when other python
code uses the opensync bindings (eg. as an engine). Specifically:

• Add the module directory to sys.path within the Python environment
  if it's not already there, rather than modifying PYTHONPATH and
  reinitialising the whole interpreter.
  

• Change to use the PyGILState API instead of PyEval?_AcquireThread/
  ReleaseThread?. This simplifies the code, and means we don't have to
  worry about the state of all the threads in the system. The drawback
  is that we can't use a separate interpreter for each plugin, but
  it's up to the plugins to play nice anyway (and if they really need
  isolation then that should be supported by running in a separate
  process).
  

Files:

• plugins/python-module/src/python_module.c (modified) (14 diffs)

plugins/python-module/src/python_module.c

@@ -36 +36 @@
-
-typedef struct MemberData {
-        PyThreadState *interp_thread;
-        PyObject *osync_module;
-        PyObject *module;
@@ -170 +169 @@
-        osync_bool report_error = TRUE;
-
-Eval_AcquireThread(data->interp_thread
+GILState_STATE pystate = PyGILState_Ensure(
-
-        PyObject *pyinfo = pm_make_info(data->osync_module, info, &error);
@@ -205 +204 @@
-                Py_DECREF(pycontext);
-                Py_DECREF(ret);
-Eval_ReleaseThread(data->interp_thread
+GILState_Release(pystate
-                osync_context_report_success(ctx);
-                osync_trace(TRACE_EXIT, "%s", __func__);
@@ -260 +259 @@
-
-error:
-Eval_ReleaseThread(data->interp_thread
+GILState_Release(pystate
-        if (report_error)
-                osync_context_report_osyncerror(ctx, error);
@@ -333 +332 @@
-        osync_plugin_set_data(plugin, NULL);
-
-
-
-
-
-
-
-
+
-
-        if (!(data->module = PyImport_ImportModule(modulename))) {
@@ -376 +369 @@
-        }
-
-
-
+
-        return data;
-
@@ -383 +375 @@
-        Py_XDECREF(data->module);
-        Py_XDECREF(data->osync_module);
-
-
+
-        free(data);
-        return NULL;
@@ -393 +384 @@
-        MemberData *data = data_in;
-
-Eval_AcquireThread(data->interp_thread
+GILState_STATE pystate = PyGILState_Ensure(
-
-        PyObject *pyinfo = pm_make_info(data->osync_module, info, error);
@@ -405 +396 @@
-
-        Py_DECREF(ret);
-Eval_ReleaseThread(data->interp_thread
+GILState_Release(pystate
-        return TRUE;
-
@@ -411 +402 @@
-        osync_error_set(error, OSYNC_ERROR_GENERIC, "Couldn't call discover method");
-        PYERR_CLEAR();
-Eval_ReleaseThread(data->interp_thread
+GILState_Release(pystate
-        return FALSE;
-}
@@ -419 +410 @@
-        osync_trace(TRACE_ENTRY, "%s(%p)", __func__, data);
-        MemberData *mydata = data;
-Eval_AcquireThread(mydata->interp_thread
+GILState_STATE pystate = PyGILState_Ensure(
-
-        /* free all sink objects */
@@ -429 +420 @@
-        Py_DECREF(mydata->module);
-        Py_DECREF(mydata->osync_module);
-        Py_EndInterpreter(mydata->interp_thread);
-        free(mydata);
+        PyGILState_Release(pystate);
-        osync_trace(TRACE_EXIT, "%s", __func__);
-}
@@ -528 +519 @@
-}
-
+/* set python search path to look in our module directory first */
+static osync_bool set_search_path(OSyncError **error)
+{
+        PyObject *sys_module = PyImport_ImportModule("sys");
+        if (!sys_module) {
+                osync_error_set(error, OSYNC_ERROR_GENERIC, "Couldn't import sys module");
+                PYERR_CLEAR();
+                return FALSE;
+        }
+        
+        PyObject *path = PyObject_GetAttrString(sys_module, "path");
+        if (!path) {
+                osync_error_set(error, OSYNC_ERROR_GENERIC, "sys module has no path attribute?");
+                PYERR_CLEAR();
+                Py_DECREF(sys_module);
+                return FALSE;
+        }
+        
+        if (!PyList_Check(path)) {
+                osync_error_set(error, OSYNC_ERROR_GENERIC, "sys.path is not a list?");
+                Py_DECREF(sys_module);
+                Py_DECREF(path);
+                return FALSE;
+        }
+        
+        PyObject *plugindir = Py_BuildValue("s", OPENSYNC_PYTHONPLG_DIR);
+        if (!plugindir) {
+                osync_error_set(error, OSYNC_ERROR_GENERIC, "Error constructing plugindir string for sys.path");
+                PYERR_CLEAR();
+                Py_DECREF(sys_module);
+                Py_DECREF(path);
+                return FALSE;
+        }
+        
+        int r = PySequence_Contains(path, plugindir);
+        if (r < 0) {
+                osync_error_set(error, OSYNC_ERROR_GENERIC, "Error checking for 'plugindir in sys.path'");
+                PYERR_CLEAR();
+                Py_DECREF(sys_module);
+                Py_DECREF(path);
+                Py_DECREF(plugindir);
+                return FALSE;
+        }
+        
+        if (r == 0 && PyList_Insert(path, 0, plugindir) != 0) {
+                osync_error_set(error, OSYNC_ERROR_GENERIC, "Error inserting plugin directory into sys.path");
+                PYERR_CLEAR();
+                Py_DECREF(sys_module);
+                Py_DECREF(path);
+                Py_DECREF(plugindir);
+                return FALSE;
+        }
+        
+        Py_DECREF(sys_module);
+        Py_DECREF(path);
+        Py_DECREF(plugindir);
+
+        return TRUE;
+}
+
-osync_bool get_sync_info(OSyncPluginEnv *env, OSyncError **error)
-{
@@ -536 +587 @@
-         */
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-                Py_InitializeEx(0);
-                PyEval_InitThreads();
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-        /* import opensync module */
-        PyObject *osync_module = pm_load_opensync(error); 
-        if (!osync_module)
-return FALSE
-
-osync_bool 
+goto out
+
+
-        Py_DECREF(osync_module);
-
-
+
+
+
-        return ret;
-}