X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fpython.c;h=10ac8f0d149f815fa9d00e54bdda3e0123246029;hb=aee87d9c1665ca8823c7489bfc9900ff12e0e177;hp=22f3db640045bad6ef0dc67c1f425ce48d0a80de;hpb=e1cbbf3d7bce76be363f28f83ac87c59156ef2a2;p=collectd.git diff --git a/src/python.c b/src/python.c index 22f3db64..10ac8f0d 100644 --- a/src/python.c +++ b/src/python.c @@ -433,8 +433,8 @@ static int cpy_write_callback(const data_set_t *ds, const value_list_t *value_li sstrncpy(v->data.type_instance, value_list->type_instance, sizeof(v->data.type_instance)); sstrncpy(v->data.plugin, value_list->plugin, sizeof(v->data.plugin)); sstrncpy(v->data.plugin_instance, value_list->plugin_instance, sizeof(v->data.plugin_instance)); - v->data.time = value_list->time; - v->interval = value_list->interval; + v->data.time = CDTIME_T_TO_DOUBLE(value_list->time); + v->interval = CDTIME_T_TO_DOUBLE(value_list->interval); Py_CLEAR(v->values); v->values = list; Py_CLEAR(v->meta); @@ -463,7 +463,7 @@ static int cpy_notification_callback(const notification_t *notification, user_da sstrncpy(n->data.type_instance, notification->type_instance, sizeof(n->data.type_instance)); sstrncpy(n->data.plugin, notification->plugin, sizeof(n->data.plugin)); sstrncpy(n->data.plugin_instance, notification->plugin_instance, sizeof(n->data.plugin_instance)); - n->data.time = notification->time; + n->data.time = CDTIME_T_TO_DOUBLE(notification->time); sstrncpy(n->message, notification->message, sizeof(n->message)); n->severity = notification->severity; ret = PyObject_CallFunctionObjArgs(c->callback, n, c->data, (void *) 0); /* New reference. */ @@ -933,7 +933,7 @@ static int cpy_init(void) { pthread_sigmask(SIG_BLOCK, &sigset, NULL); state = PyEval_SaveThread(); if (do_interactive) { - if (pthread_create(&thread, NULL, cpy_interactive, NULL)) { + if (plugin_thread_create(&thread, NULL, cpy_interactive, NULL)) { ERROR("python: Error creating thread for interactive interpreter."); } }