X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fpython.c;h=3a282918c6eafe6ae32b3de7109fff388edf1075;hb=aa3811995bfae69f0d1a0f897acfa4a9a4c0138a;hp=d2ef1648742e4050aa7b4d645a552d73f3b9a18e;hpb=f995a5d563c2832553b7d172332028811a47db4a;p=collectd.git

diff --git a/src/python.c b/src/python.c
index d2ef1648..3a282918 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;
@@ -302,29 +299,39 @@ void cpy_log_exception(const char *context) {
 		Py_XDECREF(traceback);
 		return;
 	}
-	list = PyObject_CallFunction(cpy_format_exception, "NNN", type, value, traceback); /* New reference. */
+	list = PyObject_CallFunction(cpy_format_exception, "NNN", type, value, traceback); /* New reference. Steals references from "type", "value" and "traceback". */
 	if (list)
 		l = PyObject_Length(list);
+
 	for (i = 0; i < l; ++i) {
-		char *s;
 		PyObject *line;
-		
+		char const *msg;
+		char *cpy;
+
 		line = PyList_GET_ITEM(list, i); /* Borrowed reference. */
 		Py_INCREF(line);
-		s = strdup(cpy_unicode_or_bytes_to_string(&line));
+
+		msg = cpy_unicode_or_bytes_to_string(&line);
 		Py_DECREF(line);
-		if (s[strlen(s) - 1] == '\n')
-			s[strlen(s) - 1] = 0;
+		if (msg == NULL)
+			continue;
+
+		cpy = strdup(msg);
+		if (cpy == NULL)
+			continue;
+
+		if (cpy[strlen(cpy) - 1] == '\n')
+			cpy[strlen(cpy) - 1] = 0;
+
 		Py_BEGIN_ALLOW_THREADS
-		ERROR("%s", s);
+		ERROR("%s", cpy);
 		Py_END_ALLOW_THREADS
-		free(s);
+
+		free(cpy);
 	}
+
 	Py_XDECREF(list);
 	PyErr_Clear();
-	Py_DECREF(type);
-	Py_XDECREF(value);
-	Py_XDECREF(traceback);
 }
 
 static int cpy_read_callback(user_data_t *data) {
@@ -345,7 +352,7 @@ static int cpy_read_callback(user_data_t *data) {
 }
 
 static int cpy_write_callback(const data_set_t *ds, const value_list_t *value_list, user_data_t *data) {
-	int i;
+	size_t i;
 	cpy_callback_t *c = data->data;
 	PyObject *ret, *list, *temp, *dict = NULL;
 	Values *v;
@@ -358,22 +365,13 @@ static int cpy_write_callback(const data_set_t *ds, const value_list_t *value_li
 		}
 		for (i = 0; i < value_list->values_len; ++i) {
 			if (ds->ds[i].type == DS_TYPE_COUNTER) {
-				if ((long) value_list->values[i].counter == value_list->values[i].counter)
-					PyList_SetItem(list, i, PyInt_FromLong(value_list->values[i].counter));
-				else
-					PyList_SetItem(list, i, PyLong_FromUnsignedLongLong(value_list->values[i].counter));
+				PyList_SetItem(list, i, PyLong_FromUnsignedLongLong(value_list->values[i].counter));
 			} else if (ds->ds[i].type == DS_TYPE_GAUGE) {
 				PyList_SetItem(list, i, PyFloat_FromDouble(value_list->values[i].gauge));
 			} else if (ds->ds[i].type == DS_TYPE_DERIVE) {
-				if ((long) value_list->values[i].derive == value_list->values[i].derive)
-					PyList_SetItem(list, i, PyInt_FromLong(value_list->values[i].derive));
-				else
-					PyList_SetItem(list, i, PyLong_FromLongLong(value_list->values[i].derive));
+				PyList_SetItem(list, i, PyLong_FromLongLong(value_list->values[i].derive));
 			} else if (ds->ds[i].type == DS_TYPE_ABSOLUTE) {
-				if ((long) value_list->values[i].absolute == value_list->values[i].absolute)
-					PyList_SetItem(list, i, PyInt_FromLong(value_list->values[i].absolute));
-				else
-					PyList_SetItem(list, i, PyLong_FromUnsignedLongLong(value_list->values[i].absolute));
+				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[i].type);
@@ -389,7 +387,7 @@ static int cpy_write_callback(const data_set_t *ds, const value_list_t *value_li
 		}
 		dict = PyDict_New();  /* New reference. */
 		if (value_list->meta) {
-			int i, num;
+			int num;
 			char **table;
 			meta_data_t *meta = value_list->meta;
 
@@ -401,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))
@@ -539,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);
@@ -550,7 +548,11 @@ 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;
+
 	c->name = strdup(buf);
 	c->callback = callback;
 	c->data = data;
@@ -569,7 +571,7 @@ static PyObject *float_or_none(float number) {
 }
 
 static PyObject *cpy_get_dataset(PyObject *self, PyObject *args) {
-	int i;
+	size_t i;
 	char *name;
 	const data_set_t *ds;
 	PyObject *list, *tuple;
@@ -597,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);
@@ -621,11 +623,11 @@ static PyObject *cpy_register_generic_userdata(void *reg, void *handler, PyObjec
 	char buf[512];
 	reg_function_t *register_function = (reg_function_t *) reg;
 	cpy_callback_t *c = NULL;
-	user_data_t *user_data = NULL;
+	user_data_t user_data = { 0 };
 	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);
@@ -634,30 +636,35 @@ 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;
+
 	c->name = strdup(buf);
 	c->callback = callback;
 	c->data = data;
 	c->next = NULL;
-	user_data = malloc(sizeof(*user_data));
-	user_data->free_func = cpy_destroy_user_data;
-	user_data->data = c;
-	register_function(buf, handler, user_data);
+
+	user_data.free_func = cpy_destroy_user_data;
+	user_data.data = c;
+
+	register_function(buf, handler, &user_data);
 	return cpy_string_to_unicode_or_bytes(buf);
 }
 
 static PyObject *cpy_register_read(PyObject *self, PyObject *args, PyObject *kwds) {
 	char buf[512];
 	cpy_callback_t *c = NULL;
-	user_data_t *user_data = NULL;
+	user_data_t user_data = { 0 };
 	double interval = 0;
 	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);
@@ -666,19 +673,24 @@ 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;
+
 	c->name = strdup(buf);
 	c->callback = callback;
 	c->data = data;
 	c->next = NULL;
-	user_data = malloc(sizeof(*user_data));
-	user_data->free_func = cpy_destroy_user_data;
-	user_data->data = c;
-	plugin_register_complex_read(/* group = */ NULL, buf,
-			cpy_read_callback, DOUBLE_TO_CDTIME_T (interval), user_data);
+
+	user_data.free_func = cpy_destroy_user_data;
+	user_data.data = c;
+
+	plugin_register_complex_read(/* group = */ "python", buf,
+			cpy_read_callback, DOUBLE_TO_CDTIME_T (interval), &user_data);
 	return cpy_string_to_unicode_or_bytes(buf);
 }
 
@@ -778,7 +790,7 @@ static PyObject *cpy_unregister_generic(cpy_callback_t **list_head, PyObject *ar
 	for (tmp = *list_head; tmp; prev = tmp, tmp = tmp->next)
 		if (strcmp(name, tmp->name) == 0)
 			break;
-	
+
 	Py_DECREF(arg);
 	if (tmp == NULL) {
 		PyErr_Format(PyExc_RuntimeError, "Unable to unregister %s callback '%s'.", desc, name);
@@ -883,7 +895,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);
@@ -906,15 +918,15 @@ static void cpy_int_handler(int sig) {
 
 static void *cpy_interactive(void *data) {
 	sigset_t sigset;
-	struct sigaction sig_int_action, old;
-	
+	struct sigaction 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.
@@ -924,10 +936,11 @@ static void *cpy_interactive(void *data) {
 	 * 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;
+	struct sigaction 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);
@@ -956,7 +969,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");
@@ -987,10 +1000,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) {
@@ -1001,7 +1014,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)
@@ -1030,7 +1043,7 @@ PyMODINIT_FUNC PyInit_collectd(void) {
 }
 #endif
 
-static int cpy_init_python() {
+static int cpy_init_python(void) {
 	PyObject *sys;
 	PyObject *module;
 
@@ -1041,9 +1054,9 @@ static int cpy_init_python() {
 #else
 	char *argv = "";
 #endif
-	
+
 	Py_Initialize();
-	
+
 	PyType_Ready(&ConfigType);
 	PyType_Ready(&PluginDataType);
 	ValuesType.tp_base = &PluginDataType;
@@ -1108,7 +1121,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;
@@ -1145,8 +1158,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) {
@@ -1166,8 +1179,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) {
@@ -1180,7 +1193,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) {