Fix: CTF writer: validate and set `timestamp_begin`/`timestamp_end`

[babeltrace.git] / python-plugin-provider / python-plugin-provider.c

diff --git a/python-plugin-provider/python-plugin-provider.c b/python-plugin-provider/python-plugin-provider.c
index 2cb5a7334f82169b608d557180875e9f619dd3ec..9044d8a23f1ed373e1eb343438710e30d0caf637 100644 (file)
--- a/python-plugin-provider/python-plugin-provider.c
+++ b/python-plugin-provider/python-plugin-provider.c
@@ -57,6 +57,7 @@ enum python_state {
 } python_state = PYTHON_STATE_NOT_INITED;
 
 static PyObject *py_try_load_plugin_module_func = NULL;
+static bool python_was_initialized_by_us;
 
 static
 void print_python_traceback_warn(void)
@@ -80,7 +81,9 @@ void init_python(void)
 {
        PyObject *py_bt2_py_plugin_mod = NULL;
        const char *dis_python_env;
+#ifndef __MINGW32__
        sighandler_t old_sigint = signal(SIGINT, SIG_DFL);
+#endif
 
        if (python_state != PYTHON_STATE_NOT_INITED) {
                goto end;
@@ -101,6 +104,7 @@ void init_python(void)
        if (!Py_IsInitialized()) {
                BT_LOGI_STR("Python interpreter is not initialized: initializing Python interpreter.");
                Py_InitializeEx(0);
+               python_was_initialized_by_us = true;
                BT_LOGI("Initialized Python interpreter: version=\"%s\"",
                        Py_GetVersion());
        } else {
@@ -126,9 +130,11 @@ void init_python(void)
        python_state = PYTHON_STATE_FULLY_INITIALIZED;
 
 end:
+#ifndef __MINGW32__
        if (old_sigint != SIG_ERR) {
                (void) signal(SIGINT, old_sigint);
        }
+#endif
 
        print_python_traceback_warn();
        pyerr_clear();
@@ -138,7 +144,7 @@ end:
 
 __attribute__((destructor)) static
 void fini_python(void) {
-       if (Py_IsInitialized()) {
+       if (Py_IsInitialized() && python_was_initialized_by_us) {
                if (py_try_load_plugin_module_func) {
                        Py_DECREF(py_try_load_plugin_module_func);
                        py_try_load_plugin_module_func = NULL;