Changeset 2242

Timestamp:

07/03/07 09:39:37 (1 year ago)

Author:

abaumann

Message:

Fix a locking bug I introduced. Also adds extra tracing and error handling.

Files:

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

plugins/python-module/src/python_module.c

@@ -325 +325 @@
-static void *pm_initialize(OSyncPlugin *plugin, OSyncPluginInfo *info, OSyncError **error)
-{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, plugin, info, error);
-        MemberData *data = g_malloc0(sizeof(MemberData));
-        char *modulename;
@@ -370 +371 @@
-
-        PyGILState_Release(pystate);
+        osync_trace(TRACE_EXIT, "%s", __func__);
-        return data;
-
@@ -377 +379 @@
-        PyGILState_Release(pystate);
-        free(data);
+        osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
-        return NULL;
-}
@@ -382 +385 @@
-static osync_bool pm_discover(void *data_in, OSyncPluginInfo *info, OSyncError **error)
-{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data_in, info, error);
+
-        MemberData *data = data_in;
-
@@ -397 +402 @@
-        Py_DECREF(ret);
-        PyGILState_Release(pystate);
+        osync_trace(TRACE_EXIT, "%s", __func__);
-        return TRUE;
-
@@ -403 +409 @@
-        PYERR_CLEAR();
-        PyGILState_Release(pystate);
+        osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
-        return FALSE;
-}
@@ -493 +500 @@
-static osync_bool scan_for_plugins(OSyncPluginEnv *env, PyObject *osync_module, OSyncError **error)
-{
-)", __func__, env
+, %p)", __func__, env, osync_module
-
-        GError *gerror = NULL;
@@ -581 +588 @@
-osync_bool get_sync_info(OSyncPluginEnv *env, OSyncError **error)
-{
-
-
+
+
+
+
+
-         *  * init python only once
-make sure we save and re-acquire the main thread before making any python
+acquire the Python lock before making any
-         */
-
-        if (!Py_IsInitialized()) {
-
+
+
+
-                Py_InitializeEx(0);
-                PyEval_InitThreads();
+                PyEval_ReleaseLock();
-        } else if (!PyEval_ThreadsInitialized()) {
-The python interpreter has been initialised, but threads are not
-* I'm going to assume we're the only thread and continue, but this
- * is possibly unsafe! */
-PyEval_InitThreads()
+Python has been initialised, but threads are not. */
+osync_error_set(error, OSYNC_ERROR_GENERIC, "The Python interpreter in this process has been initialised without threading support.");
+osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
+return FALSE
-        }
-
@@ -615 +628 @@
-        PyGILState_Release(pystate);
-
+        osync_trace(ret ? TRACE_EXIT : TRACE_EXIT_ERROR, "%s", __func__);
-        return ret;
-}