X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fpython.c;h=61d464d82957ece7ac4300389dd077344404770e;hb=edd9af8a874ebc9f2a7f02846807229a648917db;hp=b90902498d69fdb1b48e3048ac6515dda3200399;hpb=4ac3040668e7a9b595edd334a9179a5f6ae42461;p=collectd.git

diff --git a/src/python.c b/src/python.c
index b9090249..61d464d8 100644
--- a/src/python.c
+++ b/src/python.c
@@ -21,16 +21,13 @@
  * DEALINGS IN THE SOFTWARE.
  *
  * Authors:
- *   Sven Trenkel <collectd at semidefinite.de>  
+ *   Sven Trenkel <collectd at semidefinite.de>
  **/
 
 #include <Python.h>
 #include <structmember.h>
 
 #include <signal.h>
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
 
 #include "collectd.h"
 #include "common.h"
@@ -250,16 +247,16 @@ static void cpy_destroy_user_data(void *data) {
 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) {
 		snprintf(buf, size, "python.%s", name);
 		return;
 	}
-	
+
 	mod = PyObject_GetAttrString(callback, "__module__"); /* New reference. */
 	if (mod != NULL)
 		module = cpy_unicode_or_bytes_to_string(&mod);
-	
+
 	if (module != NULL) {
 		snprintf(buf, size, "python.%s", module);
 		Py_XDECREF(mod);
@@ -267,7 +264,7 @@ static void cpy_build_name(char *buf, size_t size, PyObject *callback, const cha
 		return;
 	}
 	Py_XDECREF(mod);
-	
+
 	snprintf(buf, size, "python.%p", callback);
 	PyErr_Clear();
 }
@@ -276,7 +273,7 @@ void cpy_log_exception(const char *context) {
 	int l = 0, i;
 	const char *typename = NULL, *message = NULL;
 	PyObject *type, *value, *traceback, *tn, *m, *list;
-	
+
 	PyErr_Fetch(&type, &value, &traceback);
 	PyErr_NormalizeException(&type, &value, &traceback);
 	if (type == NULL) return;
@@ -402,7 +399,7 @@ static int cpy_write_callback(const data_set_t *ds, const value_list_t *value_li
 				uint64_t ui;
 				double d;
 				_Bool b;
-				
+
 				type = meta_data_type(meta, table[i]);
 				if (type == MD_TYPE_STRING) {
 					if (meta_data_get_string(meta, table[i], &string))
@@ -540,7 +537,7 @@ static PyObject *cpy_register_generic(cpy_callback_t **list_head, PyObject *args
 	char *name = NULL;
 	PyObject *callback = NULL, *data = NULL, *mod = NULL;
 	static char *kwlist[] = {"callback", "data", "name", NULL};
-	
+
 	if (PyArg_ParseTupleAndKeywords(args, kwds, "O|Oet", kwlist, &callback, &data, NULL, &name) == 0) return NULL;
 	if (PyCallable_Check(callback) == 0) {
 		PyMem_Free(name);
@@ -552,10 +549,9 @@ static PyObject *cpy_register_generic(cpy_callback_t **list_head, PyObject *args
 	Py_INCREF(callback);
 	Py_XINCREF(data);
 
-	c = malloc(sizeof(*c));
+	c = calloc(1, sizeof(*c));
 	if (c == NULL)
 		return NULL;
-	memset (c, 0, sizeof (*c));
 
 	c->name = strdup(buf);
 	c->callback = callback;
@@ -603,7 +599,7 @@ static PyObject *cpy_flush(PyObject *self, PyObject *args, PyObject *kwds) {
 	int timeout = -1;
 	char *plugin = NULL, *identifier = NULL;
 	static char *kwlist[] = {"plugin", "timeout", "identifier", NULL};
-	
+
 	if (PyArg_ParseTupleAndKeywords(args, kwds, "|etiet", kwlist, NULL, &plugin, &timeout, NULL, &identifier) == 0) return NULL;
 	Py_BEGIN_ALLOW_THREADS
 	plugin_flush(plugin, timeout, identifier);
@@ -631,7 +627,7 @@ static PyObject *cpy_register_generic_userdata(void *reg, void *handler, PyObjec
 	char *name = NULL;
 	PyObject *callback = NULL, *data = NULL;
 	static char *kwlist[] = {"callback", "data", "name", NULL};
-	
+
 	if (PyArg_ParseTupleAndKeywords(args, kwds, "O|Oet", kwlist, &callback, &data, NULL, &name) == 0) return NULL;
 	if (PyCallable_Check(callback) == 0) {
 		PyMem_Free(name);
@@ -640,14 +636,13 @@ static PyObject *cpy_register_generic_userdata(void *reg, void *handler, PyObjec
 	}
 	cpy_build_name(buf, sizeof(buf), callback, name);
 	PyMem_Free(name);
-	
+
 	Py_INCREF(callback);
 	Py_XINCREF(data);
 
-	c = malloc(sizeof(*c));
+	c = calloc(1, sizeof(*c));
 	if (c == NULL)
 		return NULL;
-	memset (c, 0, sizeof (*c));
 
 	c->name = strdup(buf);
 	c->callback = callback;
@@ -670,7 +665,7 @@ static PyObject *cpy_register_read(PyObject *self, PyObject *args, PyObject *kwd
 	char *name = NULL;
 	PyObject *callback = NULL, *data = NULL;
 	static char *kwlist[] = {"callback", "interval", "data", "name", NULL};
-	
+
 	if (PyArg_ParseTupleAndKeywords(args, kwds, "O|dOet", kwlist, &callback, &interval, &data, NULL, &name) == 0) return NULL;
 	if (PyCallable_Check(callback) == 0) {
 		PyMem_Free(name);
@@ -679,14 +674,13 @@ static PyObject *cpy_register_read(PyObject *self, PyObject *args, PyObject *kwd
 	}
 	cpy_build_name(buf, sizeof(buf), callback, name);
 	PyMem_Free(name);
-	
+
 	Py_INCREF(callback);
 	Py_XINCREF(data);
 
-	c = malloc(sizeof(*c));
+	c = calloc(1, sizeof(*c));
 	if (c == NULL)
 		return NULL;
-	memset (c, 0, sizeof (*c));
 
 	c->name = strdup(buf);
 	c->callback = callback;
@@ -903,7 +897,7 @@ static PyMethodDef cpy_methods[] = {
 static int cpy_shutdown(void) {
 	cpy_callback_t *c;
 	PyObject *ret;
-	
+
 	/* This can happen if the module was loaded but not configured. */
 	if (state != NULL)
 		PyEval_RestoreThread(state);
@@ -927,14 +921,14 @@ static void cpy_int_handler(int sig) {
 static void *cpy_interactive(void *data) {
 	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.
@@ -947,7 +941,7 @@ static void *cpy_interactive(void *data) {
 	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);
@@ -976,7 +970,7 @@ static int cpy_init(void) {
 	PyObject *ret;
 	static pthread_t thread;
 	sigset_t sigset;
-	
+
 	if (!Py_IsInitialized()) {
 		WARNING("python: Plugin loaded but not configured.");
 		plugin_unregister_shutdown("python");
@@ -1007,10 +1001,10 @@ static int cpy_init(void) {
 static PyObject *cpy_oconfig_to_pyconfig(oconfig_item_t *ci, PyObject *parent) {
 	int i;
 	PyObject *item, *values, *children, *tmp;
-	
+
 	if (parent == NULL)
 		parent = Py_None;
-	
+
 	values = PyTuple_New(ci->values_num); /* New reference. */
 	for (i = 0; i < ci->values_num; ++i) {
 		if (ci->values[i].type == OCONFIG_TYPE_STRING) {
@@ -1021,7 +1015,7 @@ static PyObject *cpy_oconfig_to_pyconfig(oconfig_item_t *ci, PyObject *parent) {
 			PyTuple_SET_ITEM(values, i, PyBool_FromLong(ci->values[i].value.boolean));
 		}
 	}
-	
+
 	tmp = cpy_string_to_unicode_or_bytes(ci->key);
 	item = PyObject_CallFunction((void *) &ConfigType, "NONO", tmp, parent, values, Py_None);
 	if (item == NULL)
@@ -1061,9 +1055,9 @@ static int cpy_init_python(void) {
 #else
 	char *argv = "";
 #endif
-	
+
 	Py_Initialize();
-	
+
 	PyType_Ready(&ConfigType);
 	PyType_Ready(&PluginDataType);
 	ValuesType.tp_base = &PluginDataType;
@@ -1128,7 +1122,7 @@ static int cpy_config(oconfig_item_t *ci) {
 
 	for (i = 0; i < ci->children_num; ++i) {
 		oconfig_item_t *item = ci->children + i;
-		
+
 		if (strcasecmp(item->key, "Interactive") == 0) {
 			if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN)
 				continue;
@@ -1165,8 +1159,8 @@ static int cpy_config(oconfig_item_t *ci) {
 		} else if (strcasecmp(item->key, "ModulePath") == 0) {
 			char *dir = NULL;
 			PyObject *dir_object;
-			
-			if (cf_util_get_string(item, &dir) != 0) 
+
+			if (cf_util_get_string(item, &dir) != 0)
 				continue;
 			dir_object = cpy_string_to_unicode_or_bytes(dir); /* New reference. */
 			if (dir_object == NULL) {
@@ -1186,8 +1180,8 @@ static int cpy_config(oconfig_item_t *ci) {
 		} else if (strcasecmp(item->key, "Import") == 0) {
 			char *module_name = NULL;
 			PyObject *module;
-			
-			if (cf_util_get_string(item, &module_name) != 0) 
+
+			if (cf_util_get_string(item, &module_name) != 0)
 				continue;
 			module = PyImport_ImportModule(module_name); /* New reference. */
 			if (module == NULL) {
@@ -1200,7 +1194,7 @@ static int cpy_config(oconfig_item_t *ci) {
 			char *name = NULL;
 			cpy_callback_t *c;
 			PyObject *ret;
-			
+
 			if (cf_util_get_string(item, &name) != 0)
 				continue;
 			for (c = cpy_config_callbacks; c; c = c->next) {