python plugin: Fix some typos in the inline documentation.

[collectd.git] / src / python.c

diff --git a/src/python.c b/src/python.c
index b67a795..ae853c3 100644 (file)
--- a/src/python.c
+++ b/src/python.c
@@ -1,6 +1,7 @@
 #include <Python.h>
 #include <structmember.h>
 
 #include <Python.h>
 #include <structmember.h>
 

+#include <signal.h>

 #if HAVE_PTHREAD_H
 # include <pthread.h>
 #endif
 #if HAVE_PTHREAD_H
 # include <pthread.h>
 #endif


@@ -35,34 +36,32 @@ static char reg_log_doc[] = "register_log(callback[, data][, name]) -> identifie
                "'data' is an optional object that will be passed back to the callback\n"
                "    function every time it is called.\n"
                "'name' is an optional identifier for this callback. The default name\n"
                "'data' is an optional object that will be passed back to the callback\n"
                "    function every time it is called.\n"
                "'name' is an optional identifier for this callback. The default name\n"

-               "    is 'python.<module>.<name>'. If 'name' contains a '.' it\n"
-               "    replaces both module and name, otherwise it replaces only name.\n"
+               "    is 'python.<module>'.\n"

                "    Every callback needs a unique identifier, so if you want to\n"
                "    Every callback needs a unique identifier, so if you want to\n"

-               "    register one function multiple time you need to specify a name\n"
-               "    here.\n"
+               "    register this callback multiple time from the same module you need\n"
+               "    to specify a name here.\n"

                "'identifier' is the full identifier assigned to this callback.\n"
                "\n"
                "The callback function will be called with two or three parameters:\n"
                "severity: An integer that should be compared to the LOG_ constants.\n"
                "message: The text to be logged.\n"
                "data: The optional data parameter passed to the register function.\n"
                "'identifier' is the full identifier assigned to this callback.\n"
                "\n"
                "The callback function will be called with two or three parameters:\n"
                "severity: An integer that should be compared to the LOG_ constants.\n"
                "message: The text to be logged.\n"
                "data: The optional data parameter passed to the register function.\n"

-               "    If the parameter was obmitted it will be obmitted here, too.";
+               "    If the parameter was omitted it will be omitted here, too.";

 
 static char reg_init_doc[] = "register_init(callback[, data][, name]) -> identifier\n"
                "\n"
                "Register a callback function that will be executed once after the config.\n"
                "file has been read, all plugins heve been loaded and the collectd has\n"
 
 static char reg_init_doc[] = "register_init(callback[, data][, name]) -> identifier\n"
                "\n"
                "Register a callback function that will be executed once after the config.\n"
                "file has been read, all plugins heve been loaded and the collectd has\n"

-               "forked into the backgroud.\n"
+               "forked into the background.\n"

                "\n"
                "'callback' is a callable object that will be executed.\n"
                "'data' is an optional object that will be passed back to the callback\n"
                "    function when it is called.\n"
                "'name' is an optional identifier for this callback. The default name\n"
                "\n"
                "'callback' is a callable object that will be executed.\n"
                "'data' is an optional object that will be passed back to the callback\n"
                "    function when it is called.\n"
                "'name' is an optional identifier for this callback. The default name\n"

-               "    is 'python.<module>.<name>'. If 'name' contains a '.' it\n"
-               "    replaces both module and name, otherwise it replaces only name.\n"
+               "    is 'python.<module>'.\n"

                "    Every callback needs a unique identifier, so if you want to\n"
                "    Every callback needs a unique identifier, so if you want to\n"

-               "    register one function multiple time you need to specify a name\n"
-               "    here.\n"
+               "    register this callback multiple time from the same module you need\n"
+               "    to specify a name here.\n"

                "'identifier' is the full identifier assigned to this callback.\n"
                "\n"
                "The callback function will be called without parameters, except for\n"
                "'identifier' is the full identifier assigned to this callback.\n"
                "\n"
                "The callback function will be called without parameters, except for\n"


@@ -75,15 +74,16 @@ static char reg_config_doc[] = "register_config(callback[, data][, name]) -> ide
                "'data' is an optional object that will be passed back to the callback\n"
                "    function every time it is called.\n"
                "'name' is an optional identifier for this callback. The default name\n"
                "'data' is an optional object that will be passed back to the callback\n"
                "    function every time it is called.\n"
                "'name' is an optional identifier for this callback. The default name\n"

-               "    is 'python.<module>'. Every callback needs a unique identifier,\n"
-               "    so if you want to register one function multiple time you need to\n"
-               "    specify a name here.\n"
+               "    is 'python.<module>'.\n"
+               "    Every callback needs a unique identifier, so if you want to\n"
+               "    register this callback multiple time from the same module you need\n"
+               "    to specify a name here.\n"

                "'identifier' is the full identifier assigned to this callback.\n"
                "\n"
                "The callback function will be called with one or two parameters:\n"
                "config: A Config object.\n"
                "data: The optional data parameter passed to the register function.\n"
                "'identifier' is the full identifier assigned to this callback.\n"
                "\n"
                "The callback function will be called with one or two parameters:\n"
                "config: A Config object.\n"
                "data: The optional data parameter passed to the register function.\n"

-               "    If the parameter was obmitted it will be obmitted here, too.";
+               "    If the parameter was omitted it will be omitted here, too.";

 
 static char reg_read_doc[] = "register_read(callback[, interval][, data][, name]) -> identifier\n"
                "\n"
 
 static char reg_read_doc[] = "register_read(callback[, interval][, data][, name]) -> identifier\n"
                "\n"


@@ -96,11 +96,10 @@ static char reg_read_doc[] = "register_read(callback[, interval][, data][, name]
                "'data' is an optional object that will be passed back to the callback\n"
                "    function every time it is called.\n"
                "'name' is an optional identifier for this callback. The default name\n"
                "'data' is an optional object that will be passed back to the callback\n"
                "    function every time it is called.\n"
                "'name' is an optional identifier for this callback. The default name\n"

-               "    is 'python.<module>.<name>'. If 'name' contains a '.' it\n"
-               "    replaces both module and name, otherwise it replaces only name.\n"
+               "    is 'python.<module>'.\n"

                "    Every callback needs a unique identifier, so if you want to\n"
                "    Every callback needs a unique identifier, so if you want to\n"

-               "    register one function multiple time you need to specify a name\n"
-               "    here.\n"
+               "    register this callback multiple time from the same module you need\n"
+               "    to specify a name here.\n"

                "'identifier' is the full identifier assigned to this callback.\n"
                "\n"
                "The callback function will be called without parameters, except for\n"
                "'identifier' is the full identifier assigned to this callback.\n"
                "\n"
                "The callback function will be called without parameters, except for\n"


@@ -114,17 +113,16 @@ static char reg_write_doc[] = "register_write(callback[, data][, name]) -> ident
                "'data' is an optional object that will be passed back to the callback\n"
                "    function every time it is called.\n"
                "'name' is an optional identifier for this callback. The default name\n"
                "'data' is an optional object that will be passed back to the callback\n"
                "    function every time it is called.\n"
                "'name' is an optional identifier for this callback. The default name\n"

-               "    is 'python.<module>.<name>'. If 'name' contains a '.' it\n"
-               "    replaces both module and name, otherwise it replaces only name.\n"
+               "    is 'python.<module>'.\n"

                "    Every callback needs a unique identifier, so if you want to\n"
                "    Every callback needs a unique identifier, so if you want to\n"

-               "    register one function multiple time you need to specify a name\n"
-               "    here.\n"
+               "    register this callback multiple time from the same module you need\n"
+               "    to specify a name here.\n"

                "'identifier' is the full identifier assigned to this callback.\n"
                "\n"
                "The callback function will be called with one or two parameters:\n"
                "values: A Values object which is a copy of the dispatched values.\n"
                "data: The optional data parameter passed to the register function.\n"
                "'identifier' is the full identifier assigned to this callback.\n"
                "\n"
                "The callback function will be called with one or two parameters:\n"
                "values: A Values object which is a copy of the dispatched values.\n"
                "data: The optional data parameter passed to the register function.\n"

-               "    If the parameter was obmitted it will be obmitted here, too.";
+               "    If the parameter was omitted it will be omitted here, too.";

 
 static char reg_notification_doc[] = "register_notification(callback[, data][, name]) -> identifier\n"
                "\n"
 
 static char reg_notification_doc[] = "register_notification(callback[, data][, name]) -> identifier\n"
                "\n"


@@ -134,17 +132,16 @@ static char reg_notification_doc[] = "register_notification(callback[, data][, n
                "'data' is an optional object that will be passed back to the callback\n"
                "    function every time it is called.\n"
                "'name' is an optional identifier for this callback. The default name\n"
                "'data' is an optional object that will be passed back to the callback\n"
                "    function every time it is called.\n"
                "'name' is an optional identifier for this callback. The default name\n"

-               "    is 'python.<module>.<name>'. If 'name' contains a '.' it\n"
-               "    replaces both module and name, otherwise it replaces only name.\n"
+               "    is 'python.<module>'.\n"

                "    Every callback needs a unique identifier, so if you want to\n"
                "    Every callback needs a unique identifier, so if you want to\n"

-               "    register one function multiple time you need to specify a name\n"
-               "    here.\n"
+               "    register this callback multiple time from the same module you need\n"
+               "    to specify a name here.\n"

                "'identifier' is the full identifier assigned to this callback.\n"
                "\n"
                "The callback function will be called with one or two parameters:\n"
                "notification: A copy of the notification that was dispatched.\n"
                "data: The optional data parameter passed to the register function.\n"
                "'identifier' is the full identifier assigned to this callback.\n"
                "\n"
                "The callback function will be called with one or two parameters:\n"
                "notification: A copy of the notification that was dispatched.\n"
                "data: The optional data parameter passed to the register function.\n"

-               "    If the parameter was obmitted it will be obmitted here, too.";
+               "    If the parameter was omitted it will be omitted here, too.";

 
 static char reg_flush_doc[] = "register_flush(callback[, data][, name]) -> identifier\n"
                "\n"
 
 static char reg_flush_doc[] = "register_flush(callback[, data][, name]) -> identifier\n"
                "\n"


@@ -154,16 +151,18 @@ static char reg_flush_doc[] = "register_flush(callback[, data][, name]) -> ident
                "'data' is an optional object that will be passed back to the callback\n"
                "    function every time it is called.\n"
                "'name' is an optional identifier for this callback. The default name\n"
                "'data' is an optional object that will be passed back to the callback\n"
                "    function every time it is called.\n"
                "'name' is an optional identifier for this callback. The default name\n"

-               "    is 'python.<module>'. Every callback needs a unique identifier,\n"
-               "    so if you want to register one function multiple time you need to\n"
-               "    specify a name here.\n"
+               "    is 'python.<module>'.\n"
+               "    Every callback needs a unique identifier, so if you want to\n"
+               "    register this callback multiple time from the same module you need\n"
+               "    to specify a name here.\n"

                "'identifier' is the full identifier assigned to this callback.\n"
                "\n"
                "The callback function will be called with two or three parameters:\n"
                "'identifier' is the full identifier assigned to this callback.\n"
                "\n"
                "The callback function will be called with two or three parameters:\n"

-               "timeout: ???.\n"
-               "id: ???.\n"
+               "timeout: Indicates that only data older than 'timeout' seconds is to\n"
+               "    be flushed.\n"
+               "id: Specifies which values are to be flushed.\n"

                "data: The optional data parameter passed to the register function.\n"
                "data: The optional data parameter passed to the register function.\n"

-               "    If the parameter was obmitted it will be obmitted here, too.";
+               "    If the parameter was omitted it will be omitted here, too.";

 
 static char reg_shutdown_doc[] = "register_shutdown(callback[, data][, name]) -> identifier\n"
                "\n"
 
 static char reg_shutdown_doc[] = "register_shutdown(callback[, data][, name]) -> identifier\n"
                "\n"


@@ -173,11 +172,10 @@ static char reg_shutdown_doc[] = "register_shutdown(callback[, data][, name]) ->
                "'data' is an optional object that will be passed back to the callback\n"
                "    function if it is called.\n"
                "'name' is an optional identifier for this callback. The default name\n"
                "'data' is an optional object that will be passed back to the callback\n"
                "    function if it is called.\n"
                "'name' is an optional identifier for this callback. The default name\n"

-               "    is 'python.<module>.<name>'. If 'name' contains a '.' it\n"
-               "    replaces both module and name, otherwise it replaces only name.\n"
+               "    is 'python.<module>'.\n"

                "    Every callback needs a unique identifier, so if you want to\n"
                "    Every callback needs a unique identifier, so if you want to\n"

-               "    register one function multiple time you need to specify a name\n"
-               "    here.\n"
+               "    register this callback multiple time from the same module you need\n"
+               "    to specify a name here.\n"

                "'identifier' is the full identifier assigned to this callback.\n"
                "\n"
                "The callback function will be called with no parameters except for\n"
                "'identifier' is the full identifier assigned to this callback.\n"
                "\n"
                "The callback function will be called with no parameters except for\n"


@@ -210,11 +208,11 @@ static void cpy_destroy_user_data(void *data) {
 /* You must hold the GIL to call this function!
  * But if you managed to extract the callback parameter then you probably already do. */
 
 /* You must hold the GIL to call this function!
  * But if you managed to extract the callback parameter then you probably already do. */
 

-static void cpy_build_name(char *buf, size_t size, PyObject *callback, const char *name, int short_name) {
-       const char *module;
-       PyObject *mod = NULL, *n = NULL;
+static void cpy_build_name(char *buf, size_t size, PyObject *callback, const char *name) {
+       const char *module = NULL;
+       PyObject *mod = NULL;

        
        

-       if (name != NULL && (strchr(name, '.') != NULL || short_name)) {
+       if (name != NULL) {

                snprintf(buf, size, "python.%s", name);
                return;
        }
                snprintf(buf, size, "python.%s", name);
                return;
        }


@@ -222,31 +220,17 @@ static void cpy_build_name(char *buf, size_t size, PyObject *callback, const cha
        mod = PyObject_GetAttrString(callback, "__module__"); /* New reference. */
        if (mod != NULL)
                module = PyString_AsString(mod);
        mod = PyObject_GetAttrString(callback, "__module__"); /* New reference. */
        if (mod != NULL)
                module = PyString_AsString(mod);

-       else
-               module = "collectd";

        
        

-       if (short_name) {
+       if (module != NULL) {

                snprintf(buf, size, "python.%s", module);
                Py_XDECREF(mod);
                snprintf(buf, size, "python.%s", module);
                Py_XDECREF(mod);

+               PyErr_Clear();

                return;
        }
                return;
        }

-       
-       if (name != NULL) {
-               snprintf(buf, size, "python.%s.%s", module, name);
-               Py_XDECREF(mod);
-               return;
-       }
-       
-       n = PyObject_GetAttrString(callback, "__name__"); /* New reference. */
-       if (n != NULL)
-               name = PyString_AsString(n);
-       
-       if (name != NULL)
-               snprintf(buf, size, "python.%s.%s", module, name);
-       else
-               snprintf(buf, size, "python.%s.%p", module, callback);

        Py_XDECREF(mod);
        Py_XDECREF(mod);

-       Py_XDECREF(n);
+       
+       snprintf(buf, size, "python.%p", callback);
+       PyErr_Clear();

 }
 
 static void cpy_log_exception(const char *context) {
 }
 
 static void cpy_log_exception(const char *context) {


@@ -267,7 +251,9 @@ static void cpy_log_exception(const char *context) {
                typename = "NamelessException";
        if (message == NULL)
                message = "N/A";
                typename = "NamelessException";
        if (message == NULL)
                message = "N/A";

+       Py_BEGIN_ALLOW_THREADS

        ERROR("Unhandled python exception in %s: %s: %s", context, typename, message);
        ERROR("Unhandled python exception in %s: %s: %s", context, typename, message);

+       Py_END_ALLOW_THREADS

        Py_XDECREF(tn);
        Py_XDECREF(m);
        if (!cpy_format_exception) {
        Py_XDECREF(tn);
        Py_XDECREF(m);
        if (!cpy_format_exception) {


@@ -293,7 +279,9 @@ static void cpy_log_exception(const char *context) {
                Py_DECREF(line);
                if (s[strlen(s) - 1] == '\n')
                        s[strlen(s) - 1] = 0;
                Py_DECREF(line);
                if (s[strlen(s) - 1] == '\n')
                        s[strlen(s) - 1] = 0;

+               Py_BEGIN_ALLOW_THREADS

                ERROR("%s", s);
                ERROR("%s", s);

+               Py_END_ALLOW_THREADS

                free(s);
        }
        Py_XDECREF(list);
                free(s);
        }
        Py_XDECREF(list);


@@ -312,6 +300,8 @@ static int cpy_read_callback(user_data_t *data) {
                        Py_DECREF(ret);
                }
        CPY_RELEASE_THREADS
                        Py_DECREF(ret);
                }
        CPY_RELEASE_THREADS

+       if (ret == NULL)
+               return 1;

        return 0;
 }
 
        return 0;
 }
 


@@ -345,7 +335,9 @@ static int cpy_write_callback(const data_set_t *ds, const value_list_t *value_li
                                else
                                        PyList_SetItem(list, i, PyLong_FromUnsignedLongLong(value_list->values[i].absolute));
                        } else {
                                else
                                        PyList_SetItem(list, i, PyLong_FromUnsignedLongLong(value_list->values[i].absolute));
                        } else {

+                               Py_BEGIN_ALLOW_THREADS

                                ERROR("cpy_write_callback: Unknown value type %d.", ds->ds->type);
                                ERROR("cpy_write_callback: Unknown value type %d.", ds->ds->type);

+                               Py_END_ALLOW_THREADS

                                Py_DECREF(list);
                                CPY_RETURN_FROM_THREADS 0;
                        }
                                Py_DECREF(list);
                                CPY_RETURN_FROM_THREADS 0;
                        }


@@ -401,6 +393,8 @@ static void cpy_log_callback(int severity, const char *message, user_data_t *dat
                /* Do we really want to trigger a log callback because a log callback failed?
                 * Probably not. */
                PyErr_Print();
                /* Do we really want to trigger a log callback because a log callback failed?
                 * Probably not. */
                PyErr_Print();

+               /* In case someone wanted to be clever, replaced stderr and failed at that. */
+               PyErr_Clear();

        } else {
                Py_DECREF(ret);
        }
        } else {
                Py_DECREF(ret);
        }


@@ -425,7 +419,7 @@ static void cpy_flush_callback(int timeout, const char *id, user_data_t *data) {
        CPY_RELEASE_THREADS
 }
 
        CPY_RELEASE_THREADS
 }
 

-static PyObject *cpy_register_generic(cpy_callback_t **list_head, PyObject *args, PyObject *kwds, int short_name) {
+static PyObject *cpy_register_generic(cpy_callback_t **list_head, PyObject *args, PyObject *kwds) {

        char buf[512];
        cpy_callback_t *c;
        const char *name = NULL;
        char buf[512];
        cpy_callback_t *c;
        const char *name = NULL;


@@ -437,7 +431,7 @@ static PyObject *cpy_register_generic(cpy_callback_t **list_head, PyObject *args
                PyErr_SetString(PyExc_TypeError, "callback needs a be a callable object.");
                return NULL;
        }
                PyErr_SetString(PyExc_TypeError, "callback needs a be a callable object.");
                return NULL;
        }

-       cpy_build_name(buf, sizeof(buf), callback, name, short_name);
+       cpy_build_name(buf, sizeof(buf), callback, name);

 
        Py_INCREF(callback);
        Py_XINCREF(data);
 
        Py_INCREF(callback);
        Py_XINCREF(data);


@@ -464,16 +458,16 @@ static PyObject *cpy_flush(cpy_callback_t **list_head, PyObject *args, PyObject
 }
 
 static PyObject *cpy_register_config(PyObject *self, PyObject *args, PyObject *kwds) {
 }
 
 static PyObject *cpy_register_config(PyObject *self, PyObject *args, PyObject *kwds) {

-       return cpy_register_generic(&cpy_config_callbacks, args, kwds, 1);
+       return cpy_register_generic(&cpy_config_callbacks, args, kwds);

 }
 
 static PyObject *cpy_register_init(PyObject *self, PyObject *args, PyObject *kwds) {
 }
 
 static PyObject *cpy_register_init(PyObject *self, PyObject *args, PyObject *kwds) {

-       return cpy_register_generic(&cpy_init_callbacks, args, kwds, 0);
+       return cpy_register_generic(&cpy_init_callbacks, args, kwds);

 }
 
 typedef int reg_function_t(const char *name, void *callback, void *data);
 
 }
 
 typedef int reg_function_t(const char *name, void *callback, void *data);
 

-static PyObject *cpy_register_generic_userdata(void *reg, void *handler, PyObject *args, PyObject *kwds, int short_name) {
+static PyObject *cpy_register_generic_userdata(void *reg, void *handler, PyObject *args, PyObject *kwds) {

        char buf[512];
        reg_function_t *register_function = (reg_function_t *) reg;
        cpy_callback_t *c = NULL;
        char buf[512];
        reg_function_t *register_function = (reg_function_t *) reg;
        cpy_callback_t *c = NULL;


@@ -487,7 +481,7 @@ static PyObject *cpy_register_generic_userdata(void *reg, void *handler, PyObjec
                PyErr_SetString(PyExc_TypeError, "callback needs a be a callable object.");
                return NULL;
        }
                PyErr_SetString(PyExc_TypeError, "callback needs a be a callable object.");
                return NULL;
        }

-       cpy_build_name(buf, sizeof(buf), callback, name, short_name);
+       cpy_build_name(buf, sizeof(buf), callback, name);

        
        Py_INCREF(callback);
        Py_XINCREF(data);
        
        Py_INCREF(callback);
        Py_XINCREF(data);


@@ -518,7 +512,7 @@ static PyObject *cpy_register_read(PyObject *self, PyObject *args, PyObject *kwd
                PyErr_SetString(PyExc_TypeError, "callback needs a be a callable object.");
                return NULL;
        }
                PyErr_SetString(PyExc_TypeError, "callback needs a be a callable object.");
                return NULL;
        }

-       cpy_build_name(buf, sizeof(buf), callback, name, 0);
+       cpy_build_name(buf, sizeof(buf), callback, name);

        
        Py_INCREF(callback);
        Py_XINCREF(data);
        
        Py_INCREF(callback);
        Py_XINCREF(data);


@@ -537,23 +531,23 @@ static PyObject *cpy_register_read(PyObject *self, PyObject *args, PyObject *kwd
 }
 
 static PyObject *cpy_register_log(PyObject *self, PyObject *args, PyObject *kwds) {
 }
 
 static PyObject *cpy_register_log(PyObject *self, PyObject *args, PyObject *kwds) {

-       return cpy_register_generic_userdata(plugin_register_log, cpy_log_callback, args, kwds, 0);
+       return cpy_register_generic_userdata(plugin_register_log, cpy_log_callback, args, kwds);

 }
 
 static PyObject *cpy_register_write(PyObject *self, PyObject *args, PyObject *kwds) {
 }
 
 static PyObject *cpy_register_write(PyObject *self, PyObject *args, PyObject *kwds) {

-       return cpy_register_generic_userdata(plugin_register_write, cpy_write_callback, args, kwds, 0);
+       return cpy_register_generic_userdata(plugin_register_write, cpy_write_callback, args, kwds);

 }
 
 static PyObject *cpy_register_notification(PyObject *self, PyObject *args, PyObject *kwds) {
 }
 
 static PyObject *cpy_register_notification(PyObject *self, PyObject *args, PyObject *kwds) {

-       return cpy_register_generic_userdata(plugin_register_notification, cpy_notification_callback, args, kwds, 0);
+       return cpy_register_generic_userdata(plugin_register_notification, cpy_notification_callback, args, kwds);

 }
 
 static PyObject *cpy_register_flush(PyObject *self, PyObject *args, PyObject *kwds) {
 }
 
 static PyObject *cpy_register_flush(PyObject *self, PyObject *args, PyObject *kwds) {

-       return cpy_register_generic_userdata(plugin_register_flush, cpy_flush_callback, args, kwds, 1);
+       return cpy_register_generic_userdata(plugin_register_flush, cpy_flush_callback, args, kwds);

 }
 
 static PyObject *cpy_register_shutdown(PyObject *self, PyObject *args, PyObject *kwds) {
 }
 
 static PyObject *cpy_register_shutdown(PyObject *self, PyObject *args, PyObject *kwds) {

-       return cpy_register_generic(&cpy_shutdown_callbacks, args, kwds, 0);
+       return cpy_register_generic(&cpy_shutdown_callbacks, args, kwds);

 }
 
 static PyObject *cpy_error(PyObject *self, PyObject *args) {
 }
 
 static PyObject *cpy_error(PyObject *self, PyObject *args) {


@@ -596,24 +590,32 @@ static PyObject *cpy_debug(PyObject *self, PyObject *args) {
 #ifdef COLLECT_DEBUG
        const char *text;
        if (PyArg_ParseTuple(args, "s", &text) == 0) return NULL;
 #ifdef COLLECT_DEBUG
        const char *text;
        if (PyArg_ParseTuple(args, "s", &text) == 0) return NULL;

+       Py_BEGIN_ALLOW_THREADS

        plugin_log(LOG_DEBUG, "%s", text);
        plugin_log(LOG_DEBUG, "%s", text);

+       Py_END_ALLOW_THREADS

 #endif
        Py_RETURN_NONE;
 }
 
 #endif
        Py_RETURN_NONE;
 }
 

-static PyObject *cpy_unregister_generic(cpy_callback_t **list_head, PyObject *arg, const char *desc, int short_name) {
+static PyObject *cpy_unregister_generic(cpy_callback_t **list_head, PyObject *arg, const char *desc) {

        char buf[512];
        const char *name;
        cpy_callback_t *prev = NULL, *tmp;
 
        char buf[512];
        const char *name;
        cpy_callback_t *prev = NULL, *tmp;
 

-       if (PyString_Check(arg)) {
+       if (PyUnicode_Check(arg)) {
+               arg = PyUnicode_AsEncodedString(arg, NULL, NULL);
+               if (arg == NULL)
+                       return NULL;
+               name = PyString_AsString(arg);
+               Py_DECREF(arg);
+       } else if (PyString_Check(arg)) {

                name = PyString_AsString(arg);
        } else {
                if (!PyCallable_Check(arg)) {
                        PyErr_SetString(PyExc_TypeError, "This function needs a string or a callable object as its only parameter.");
                        return NULL;
                }
                name = PyString_AsString(arg);
        } else {
                if (!PyCallable_Check(arg)) {
                        PyErr_SetString(PyExc_TypeError, "This function needs a string or a callable object as its only parameter.");
                        return NULL;
                }

-               cpy_build_name(buf, sizeof(buf), arg, NULL, short_name);
+               cpy_build_name(buf, sizeof(buf), arg, NULL);

                name = buf;
        }
        for (tmp = *list_head; tmp; prev = tmp, tmp = tmp->next)
                name = buf;
        }
        for (tmp = *list_head; tmp; prev = tmp, tmp = tmp->next)


@@ -624,7 +626,7 @@ static PyObject *cpy_unregister_generic(cpy_callback_t **list_head, PyObject *ar
                PyErr_Format(PyExc_RuntimeError, "Unable to unregister %s callback '%s'.", desc, name);
                return NULL;
        }
                PyErr_Format(PyExc_RuntimeError, "Unable to unregister %s callback '%s'.", desc, name);
                return NULL;
        }

-       /* Yes, this is actually save. To call this function the calles has to
+       /* Yes, this is actually save. To call this function the caller has to

         * hold the GIL. Well, save as long as there is only one GIL anyway ... */
        if (prev == NULL)
                *list_head = tmp->next;
         * hold the GIL. Well, save as long as there is only one GIL anyway ... */
        if (prev == NULL)
                *list_head = tmp->next;


@@ -636,18 +638,24 @@ static PyObject *cpy_unregister_generic(cpy_callback_t **list_head, PyObject *ar
 
 typedef int cpy_unregister_function_t(const char *name);
 
 
 typedef int cpy_unregister_function_t(const char *name);
 

-static PyObject *cpy_unregister_generic_userdata(cpy_unregister_function_t *unreg, PyObject *arg, const char *desc, int short_name) {
+static PyObject *cpy_unregister_generic_userdata(cpy_unregister_function_t *unreg, PyObject *arg, const char *desc) {

        char buf[512];
        const char *name;
 
        char buf[512];
        const char *name;
 

-       if (PyString_Check(arg)) {
+       if (PyUnicode_Check(arg)) {
+               arg = PyUnicode_AsEncodedString(arg, NULL, NULL);
+               if (arg == NULL)
+                       return NULL;
+               name = PyString_AsString(arg);
+               Py_DECREF(arg);
+       } else if (PyString_Check(arg)) {

                name = PyString_AsString(arg);
        } else {
                if (!PyCallable_Check(arg)) {
                        PyErr_SetString(PyExc_TypeError, "This function needs a string or a callable object as its only parameter.");
                        return NULL;
                }
                name = PyString_AsString(arg);
        } else {
                if (!PyCallable_Check(arg)) {
                        PyErr_SetString(PyExc_TypeError, "This function needs a string or a callable object as its only parameter.");
                        return NULL;
                }

-               cpy_build_name(buf, sizeof(buf), arg, NULL, short_name);
+               cpy_build_name(buf, sizeof(buf), arg, NULL);

                name = buf;
        }
        if (unreg(name) == 0)
                name = buf;
        }
        if (unreg(name) == 0)


@@ -657,35 +665,35 @@ static PyObject *cpy_unregister_generic_userdata(cpy_unregister_function_t *unre
 }
 
 static PyObject *cpy_unregister_log(PyObject *self, PyObject *arg) {
 }
 
 static PyObject *cpy_unregister_log(PyObject *self, PyObject *arg) {

-       return cpy_unregister_generic_userdata(plugin_unregister_log, arg, "log", 0);
+       return cpy_unregister_generic_userdata(plugin_unregister_log, arg, "log");

 }
 
 static PyObject *cpy_unregister_init(PyObject *self, PyObject *arg) {
 }
 
 static PyObject *cpy_unregister_init(PyObject *self, PyObject *arg) {

-       return cpy_unregister_generic(&cpy_init_callbacks, arg, "init", 0);
+       return cpy_unregister_generic(&cpy_init_callbacks, arg, "init");

 }
 
 static PyObject *cpy_unregister_config(PyObject *self, PyObject *arg) {
 }
 
 static PyObject *cpy_unregister_config(PyObject *self, PyObject *arg) {

-       return cpy_unregister_generic(&cpy_config_callbacks, arg, "config", 1);
+       return cpy_unregister_generic(&cpy_config_callbacks, arg, "config");

 }
 
 static PyObject *cpy_unregister_read(PyObject *self, PyObject *arg) {
 }
 
 static PyObject *cpy_unregister_read(PyObject *self, PyObject *arg) {

-       return cpy_unregister_generic_userdata(plugin_unregister_read, arg, "read", 0);
+       return cpy_unregister_generic_userdata(plugin_unregister_read, arg, "read");

 }
 
 static PyObject *cpy_unregister_write(PyObject *self, PyObject *arg) {
 }
 
 static PyObject *cpy_unregister_write(PyObject *self, PyObject *arg) {

-       return cpy_unregister_generic_userdata(plugin_unregister_write, arg, "write", 0);
+       return cpy_unregister_generic_userdata(plugin_unregister_write, arg, "write");

 }
 
 static PyObject *cpy_unregister_notification(PyObject *self, PyObject *arg) {
 }
 
 static PyObject *cpy_unregister_notification(PyObject *self, PyObject *arg) {

-       return cpy_unregister_generic_userdata(plugin_unregister_notification, arg, "notification", 0);
+       return cpy_unregister_generic_userdata(plugin_unregister_notification, arg, "notification");

 }
 
 static PyObject *cpy_unregister_flush(PyObject *self, PyObject *arg) {
 }
 
 static PyObject *cpy_unregister_flush(PyObject *self, PyObject *arg) {

-       return cpy_unregister_generic_userdata(plugin_unregister_flush, arg, "flush", 1);
+       return cpy_unregister_generic_userdata(plugin_unregister_flush, arg, "flush");

 }
 
 static PyObject *cpy_unregister_shutdown(PyObject *self, PyObject *arg) {
 }
 
 static PyObject *cpy_unregister_shutdown(PyObject *self, PyObject *arg) {

-       return cpy_unregister_generic(&cpy_shutdown_callbacks, arg, "shutdown", 0);
+       return cpy_unregister_generic(&cpy_shutdown_callbacks, arg, "shutdown");

 }
 
 static PyMethodDef cpy_methods[] = {
 }
 
 static PyMethodDef cpy_methods[] = {


@@ -729,20 +737,59 @@ static int cpy_shutdown(void) {
                else
                        Py_DECREF(ret);
        }
                else
                        Py_DECREF(ret);
        }

+       PyErr_Print();

        Py_Finalize();
        return 0;
 }
 
        Py_Finalize();
        return 0;
 }
 

+static void cpy_int_handler(int sig) {
+       return;
+}
+

 static void *cpy_interactive(void *data) {
 static void *cpy_interactive(void *data) {

-       CPY_LOCK_THREADS
-               if (PyImport_ImportModule("readline") == NULL) {
-                       /* This interactive session will suck. */
-                       cpy_log_exception("interactive session init");
-               }
-               PyRun_InteractiveLoop(stdin, "<stdin>");
-       CPY_RELEASE_THREADS
+       sigset_t sigset;
+       struct sigaction sig_int_action, old;
+       
+       /* Signal handler in a plugin? Bad stuff, but the best way to
+        * handle it I guess. In an interactive session people will
+        * press Ctrl+C at some time, which will generate a SIGINT.
+        * This will cause collectd to shutdown, thus killing the
+        * interactive interpreter, and leaving the terminal in a
+        * mess. Chances are, this isn't what the user wanted to do.
+        * 
+        * So this is the plan:
+        * 1. Block SIGINT in the main thread.
+        * 2. Install our own signal handler that does nothing.
+        * 3. Unblock SIGINT in the interactive thread.
+        *
+        * This will make sure that SIGINT won't kill collectd but
+        * still interrupt syscalls like sleep and pause.
+        * It does not raise a KeyboardInterrupt exception because so
+        * far nobody managed to figure out how to do that. */
+       memset (&sig_int_action, '\0', sizeof (sig_int_action));
+       sig_int_action.sa_handler = cpy_int_handler;
+       sigaction (SIGINT, &sig_int_action, &old);
+       
+       sigemptyset(&sigset);
+       sigaddset(&sigset, SIGINT);
+       pthread_sigmask(SIG_UNBLOCK, &sigset, NULL);
+       PyEval_AcquireThread(state);
+       if (PyImport_ImportModule("readline") == NULL) {
+               /* This interactive session will suck. */
+               cpy_log_exception("interactive session init");
+       }
+       PyRun_InteractiveLoop(stdin, "<stdin>");
+       PyErr_Print();
+       PyEval_ReleaseThread(state);

        NOTICE("python: Interactive interpreter exited, stopping collectd ...");
        NOTICE("python: Interactive interpreter exited, stopping collectd ...");

+       /* Restore the original collectd SIGINT handler and raise SIGINT.
+        * The main thread still has SIGINT blocked and there's nothing we
+        * can do about that so this thread will handle it. But that's not
+        * important, except that it won't interrupt the main loop and so
+        * it might take a few seconds before collectd really shuts down. */
+       sigaction (SIGINT, &old, NULL);

        raise(SIGINT);
        raise(SIGINT);

+       pause();

        return NULL;
 }
 
        return NULL;
 }
 


@@ -750,6 +797,7 @@ static int cpy_init(void) {
        cpy_callback_t *c;
        PyObject *ret;
        static pthread_t thread;
        cpy_callback_t *c;
        PyObject *ret;
        static pthread_t thread;

+       sigset_t sigset;

        
        PyEval_InitThreads();
        /* Now it's finally OK to use python threads. */
        
        PyEval_InitThreads();
        /* Now it's finally OK to use python threads. */


@@ -760,6 +808,9 @@ static int cpy_init(void) {
                else
                        Py_DECREF(ret);
        }
                else
                        Py_DECREF(ret);
        }

+       sigemptyset(&sigset);
+       sigaddset(&sigset, SIGINT);
+       pthread_sigmask(SIG_BLOCK, &sigset, NULL);

        state = PyEval_SaveThread();
        if (do_interactive) {
                if (pthread_create(&thread, NULL, cpy_interactive, NULL)) {
        state = PyEval_SaveThread();
        if (do_interactive) {
                if (pthread_create(&thread, NULL, cpy_interactive, NULL)) {


@@ -851,6 +902,12 @@ static int cpy_config(oconfig_item_t *ci) {
                        if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN)
                                continue;
                        do_interactive = item->values[0].value.boolean;
                        if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN)
                                continue;
                        do_interactive = item->values[0].value.boolean;

+               } else if (strcasecmp(item->key, "Encoding") == 0) {
+                       if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_STRING)
+                               continue;
+                       /* Why is this even necessary? And undocumented? */
+                       if (PyUnicode_SetDefaultEncoding(item->values[0].value.string))
+                               cpy_log_exception("setting default encoding");

                } else if (strcasecmp(item->key, "LogTraces") == 0) {
                        if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN)
                                continue;
                } else if (strcasecmp(item->key, "LogTraces") == 0) {
                        if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN)
                                continue;