X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fpyvalues.c;h=36a717e9bfec401b54d8e2b629f110a01a303d7a;hb=965246d5039b0e6689398752f5c9771a844b491b;hp=a928cbc2803846b68681c18837a9f96d53f7da56;hpb=f7cf0dad2e933ac6066ca5f27645ee577f065710;p=collectd.git

diff --git a/src/pyvalues.c b/src/pyvalues.c
index a928cbc2..36a717e9 100644
--- a/src/pyvalues.c
+++ b/src/pyvalues.c
@@ -91,7 +91,7 @@ static PyObject *cpy_common_repr(PyObject *s) {
 
 	if (self->time != 0) {
 		CPY_STRCAT(&ret, l_time);
-		tmp = PyInt_FromLong(self->time);
+		tmp = PyFloat_FromDouble(self->time);
 		CPY_SUBSTITUTE(PyObject_Repr, tmp, tmp);
 		CPY_STRCAT_AND_DEL(&ret, tmp);
 	}
@@ -309,8 +309,12 @@ static char values_doc[] = "These are the actual values that get dispatched to c
 		"a TypeError exception will be raised.";
 
 static char meta_doc[] = "These are the meta data for this Value object.\n"
-		"It has to be a dictionary of numbers, strings or bools.\n"
-		"If the dict contains anything else a TypeError exception will be raised.";
+		"It has to be a dictionary of numbers, strings or bools. All keys must be\n"
+		"strings. int and long objects will be dispatched as signed integers unless\n"
+		"they are between 2**63 and 2**64-1, which will result in a unsigned integer.\n"
+		"You can force one of these storage classes by using the classes\n"
+		"collectd.Signed and collectd.Unsigned. A meta object received by a write\n"
+		"callback will always contain Signed or Unsigned objects.";
 
 static char dispatch_doc[] = "dispatch([type][, values][, plugin_instance][, type_instance]"
 		"[, plugin][, host][, time][, interval]) -> None.  Dispatch a value list.\n"
@@ -340,20 +344,20 @@ static PyObject *Values_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 		return NULL;
 	
 	self->values = PyList_New(0);
+	self->meta = PyDict_New();
 	self->interval = 0;
 	return (PyObject *) self;
 }
 
 static int Values_init(PyObject *s, PyObject *args, PyObject *kwds) {
 	Values *self = (Values *) s;
-	int interval = 0;
-	double time = 0;
+	double interval = 0, time = 0;
 	PyObject *values = NULL, *meta = NULL, *tmp;
 	const char *type = "", *plugin_instance = "", *type_instance = "", *plugin = "", *host = "";
 	static char *kwlist[] = {"type", "values", "plugin_instance", "type_instance",
 			"plugin", "host", "time", "interval", "meta", NULL};
 	
-	if (!PyArg_ParseTupleAndKeywords(args, kwds, "|etOetetetetdiO", kwlist,
+	if (!PyArg_ParseTupleAndKeywords(args, kwds, "|etOetetetetddO", kwlist,
 			NULL, &type, &values, NULL, &plugin_instance, NULL, &type_instance,
 			NULL, &plugin, NULL, &host, &time, &interval, &meta))
 		return -1;
@@ -386,9 +390,12 @@ static int Values_init(PyObject *s, PyObject *args, PyObject *kwds) {
 	
 	tmp = self->values;
 	self->values = values;
-	self->meta = meta;
 	Py_XDECREF(tmp);
 	
+	tmp = self->meta;
+	self->meta = meta;
+	Py_XDECREF(tmp);
+
 	self->interval = interval;
 	return 0;
 }
@@ -465,7 +472,7 @@ static meta_data_t *cpy_build_meta(PyObject *meta) {
 		if (PyErr_Occurred())
 			cpy_log_exception("building meta data");
 		Py_XDECREF(value);
-		Py_DECREF(keystring);
+		Py_DECREF(key);
 	}
 	return m;
 }
@@ -477,8 +484,7 @@ static PyObject *Values_dispatch(Values *self, PyObject *args, PyObject *kwds) {
 	value_t *value;
 	value_list_t value_list = VALUE_LIST_INIT;
 	PyObject *values = self->values, *meta = self->meta;
-	double time = self->data.time;
-	int interval = self->interval;
+	double time = self->data.time, interval = self->interval;
 	const char *host = self->data.host;
 	const char *plugin = self->data.plugin;
 	const char *plugin_instance = self->data.plugin_instance;
@@ -487,7 +493,7 @@ static PyObject *Values_dispatch(Values *self, PyObject *args, PyObject *kwds) {
 	
 	static char *kwlist[] = {"type", "values", "plugin_instance", "type_instance",
 			"plugin", "host", "time", "interval", "meta", NULL};
-	if (!PyArg_ParseTupleAndKeywords(args, kwds, "|etOetetetetdiO", kwlist,
+	if (!PyArg_ParseTupleAndKeywords(args, kwds, "|etOetetetetddO", kwlist,
 			NULL, &type, &values, NULL, &plugin_instance, NULL, &type_instance,
 			NULL, &plugin, NULL, &host, &time, &interval, &meta))
 		return NULL;
@@ -551,8 +557,8 @@ static PyObject *Values_dispatch(Values *self, PyObject *args, PyObject *kwds) {
 	value_list.values = value;
 	value_list.meta = cpy_build_meta(meta);
 	value_list.values_len = size;
-	value_list.time = time;
-	value_list.interval = interval;
+	value_list.time = DOUBLE_TO_CDTIME_T(time);
+	value_list.interval = DOUBLE_TO_CDTIME_T(interval);
 	sstrncpy(value_list.host, host, sizeof(value_list.host));
 	sstrncpy(value_list.plugin, plugin, sizeof(value_list.plugin));
 	sstrncpy(value_list.plugin_instance, plugin_instance, sizeof(value_list.plugin_instance));
@@ -580,8 +586,7 @@ static PyObject *Values_write(Values *self, PyObject *args, PyObject *kwds) {
 	value_t *value;
 	value_list_t value_list = VALUE_LIST_INIT;
 	PyObject *values = self->values, *meta = self->meta;
-	double time = self->data.time;
-	int interval = self->interval;
+	double time = self->data.time, interval = self->interval;
 	const char *host = self->data.host;
 	const char *plugin = self->data.plugin;
 	const char *plugin_instance = self->data.plugin_instance;
@@ -591,7 +596,7 @@ static PyObject *Values_write(Values *self, PyObject *args, PyObject *kwds) {
 	
 	static char *kwlist[] = {"destination", "type", "values", "plugin_instance", "type_instance",
 			"plugin", "host", "time", "interval", "meta", NULL};
-	if (!PyArg_ParseTupleAndKeywords(args, kwds, "|etOetetetetdiO", kwlist,
+	if (!PyArg_ParseTupleAndKeywords(args, kwds, "|etOetetetetddO", kwlist,
 			NULL, &type, &values, NULL, &plugin_instance, NULL, &type_instance,
 			NULL, &plugin, NULL, &host, &time, &interval, &meta))
 		return NULL;
@@ -650,8 +655,8 @@ static PyObject *Values_write(Values *self, PyObject *args, PyObject *kwds) {
 	}
 	value_list.values = value;
 	value_list.values_len = size;
-	value_list.time = time;
-	value_list.interval = interval;
+	value_list.time = DOUBLE_TO_CDTIME_T(time);
+	value_list.interval = DOUBLE_TO_CDTIME_T(interval);
 	sstrncpy(value_list.host, host, sizeof(value_list.host));
 	sstrncpy(value_list.plugin, plugin, sizeof(value_list.plugin));
 	sstrncpy(value_list.plugin_instance, plugin_instance, sizeof(value_list.plugin_instance));
@@ -693,7 +698,7 @@ static PyObject *Values_repr(PyObject *s) {
 	ret = cpy_common_repr(s);
 	if (self->interval != 0) {
 		CPY_STRCAT(&ret, l_interval);
-		tmp = PyInt_FromLong(self->interval);
+		tmp = PyFloat_FromDouble(self->interval);
 		CPY_SUBSTITUTE(PyObject_Repr, tmp, tmp);
 		CPY_STRCAT_AND_DEL(&ret, tmp);
 	}
@@ -856,7 +861,7 @@ static PyObject *Notification_dispatch(Notification *self, PyObject *args, PyObj
 		return NULL;
 	}
 
-	notification.time = t;
+	notification.time = DOUBLE_TO_CDTIME_T(t);
 	notification.severity = severity;
 	sstrncpy(notification.message, message, sizeof(notification.message));
 	sstrncpy(notification.host, host, sizeof(notification.host));
@@ -865,8 +870,8 @@ static PyObject *Notification_dispatch(Notification *self, PyObject *args, PyObj
 	sstrncpy(notification.type, type, sizeof(notification.type));
 	sstrncpy(notification.type_instance, type_instance, sizeof(notification.type_instance));
 	notification.meta = NULL;
-	if (notification.time < 1)
-		notification.time = time(0);
+	if (notification.time == 0)
+		notification.time = cdtime();
 	if (notification.host[0] == 0)
 		sstrncpy(notification.host, hostname_g, sizeof(notification.host));
 	if (notification.plugin[0] == 0)
@@ -1001,6 +1006,9 @@ PyTypeObject NotificationType = {
 	Notification_new           /* tp_new */
 };
 
+static char Signed_doc[] = "This is a long by another name. Use it in meta data dicts\n"
+		"to choose the way it is stored in the meta data.";
+
 PyTypeObject SignedType = {
 	CPY_INIT_TYPE
 	"collectd.Signed",         /* tp_name */
@@ -1022,8 +1030,12 @@ PyTypeObject SignedType = {
 	0,                         /* tp_setattro */
 	0,                         /* tp_as_buffer */
 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
+	Signed_doc                 /* tp_doc */
 };
 
+static char Unsigned_doc[] = "This is a long by another name. Use it in meta data dicts\n"
+		"to choose the way it is stored in the meta data.";
+
 PyTypeObject UnsignedType = {
 	CPY_INIT_TYPE
 	"collectd.Unsigned",       /* tp_name */
@@ -1045,4 +1057,5 @@ PyTypeObject UnsignedType = {
 	0,                         /* tp_setattro */
 	0,                         /* tp_as_buffer */
 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
+	Unsigned_doc               /* tp_doc */
 };