X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fpython.c;h=c6ee5544c47dfb0d1be423de1b232275731e898f;hb=96b920e6b7bf70560eb95c911202afbeaab2b965;hp=9c258239c9dda43c3c97a90e74532e5d3c386fb6;hpb=79963d13c1884d1d92667cc502ad20758b084a12;p=collectd.git diff --git a/src/python.c b/src/python.c index 9c258239..c6ee5544 100644 --- a/src/python.c +++ b/src/python.c @@ -718,9 +718,11 @@ static PyObject *cpy_register_generic_userdata(void *reg, void *handler, c->data = data; c->next = NULL; - user_data_t user_data = {.data = c, .free_func = cpy_destroy_user_data}; + register_function(buf, handler, + &(user_data_t){ + .data = c, .free_func = cpy_destroy_user_data, + }); - register_function(buf, handler, &user_data); ++cpy_num_callbacks; return cpy_string_to_unicode_or_bytes(buf); } @@ -757,10 +759,12 @@ static PyObject *cpy_register_read(PyObject *self, PyObject *args, c->data = data; c->next = NULL; - user_data_t user_data = {.data = c, .free_func = cpy_destroy_user_data}; - - plugin_register_complex_read(/* group = */ "python", buf, cpy_read_callback, - DOUBLE_TO_CDTIME_T(interval), &user_data); + plugin_register_complex_read( + /* group = */ "python", buf, cpy_read_callback, + DOUBLE_TO_CDTIME_T(interval), + &(user_data_t){ + .data = c, .free_func = cpy_destroy_user_data, + }); ++cpy_num_callbacks; return cpy_string_to_unicode_or_bytes(buf); } @@ -1094,7 +1098,8 @@ static int cpy_init(void) { ERROR("python: Unable to create pipe."); return 1; } - if (plugin_thread_create(&thread, NULL, cpy_interactive, pipefd + 1)) { + if (plugin_thread_create(&thread, NULL, cpy_interactive, pipefd + 1, + "python interpreter")) { ERROR("python: Error creating thread for interactive interpreter."); } if (read(pipefd[0], &buf, 1))