X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fperl.c;h=50def1fccb7032ffb8be01efb3f161d305f2c3d8;hb=ee203ecd5fae28ab12f158e03e18f2b57394897a;hp=b6e7b22d27bcf724603d7f85f9a6a86da6ed99d4;hpb=3f0d178e58251171272a643e1667abcb9946edce;p=collectd.git

diff --git a/src/perl.c b/src/perl.c
index b6e7b22d..50def1fc 100644
--- a/src/perl.c
+++ b/src/perl.c
@@ -194,6 +194,8 @@ struct {
 	{ "Collectd::TYPE_DATASET",       PLUGIN_DATASET },
 	{ "Collectd::DS_TYPE_COUNTER",    DS_TYPE_COUNTER },
 	{ "Collectd::DS_TYPE_GAUGE",      DS_TYPE_GAUGE },
+	{ "Collectd::DS_TYPE_DERIVE",     DS_TYPE_DERIVE },
+	{ "Collectd::DS_TYPE_ABSOLUTE",   DS_TYPE_ABSOLUTE },
 	{ "Collectd::LOG_ERR",            LOG_ERR },
 	{ "Collectd::LOG_WARNING",        LOG_WARNING },
 	{ "Collectd::LOG_NOTICE",         LOG_NOTICE },
@@ -267,7 +269,10 @@ static int hv2data_source (pTHX_ HV *hash, data_source_t *ds)
 	if (NULL != (tmp = hv_fetch (hash, "type", 4, 0))) {
 		ds->type = SvIV (*tmp);
 
-		if ((DS_TYPE_COUNTER != ds->type) && (DS_TYPE_GAUGE != ds->type)) {
+		if ((DS_TYPE_COUNTER != ds->type)
+				&& (DS_TYPE_GAUGE != ds->type)
+				&& (DS_TYPE_DERIVE != ds->type)
+				&& (DS_TYPE_ABSOLUTE != ds->type)) {
 			log_err ("hv2data_source: Invalid DS type.");
 			return -1;
 		}
@@ -320,8 +325,12 @@ static int av2value (pTHX_ char *name, AV *array, value_t *value, int len)
 		if (NULL != tmp) {
 			if (DS_TYPE_COUNTER == ds->ds[i].type)
 				value[i].counter = SvIV (*tmp);
-			else
+			else if (DS_TYPE_GAUGE == ds->ds[i].type)
 				value[i].gauge = SvNV (*tmp);
+			else if (DS_TYPE_DERIVE == ds->ds[i].type)
+				value[i].derive = SvIV (*tmp);
+			else if (DS_TYPE_ABSOLUTE == ds->ds[i].type)
+				value[i].absolute = SvIV (*tmp);
 		}
 		else {
 			return -1;
@@ -637,8 +646,12 @@ static int value_list2hv (pTHX_ value_list_t *vl, data_set_t *ds, HV *hash)
 
 		if (DS_TYPE_COUNTER == ds->ds[i].type)
 			val = newSViv (vl->values[i].counter);
-		else
+		else if (DS_TYPE_GAUGE == ds->ds[i].type)
 			val = newSVnv (vl->values[i].gauge);
+		else if (DS_TYPE_DERIVE == ds->ds[i].type)
+			val = newSViv (vl->values[i].derive);
+		else if (DS_TYPE_ABSOLUTE == ds->ds[i].type)
+			val = newSViv (vl->values[i].absolute);
 
 		if (NULL == av_store (values, i, val)) {
 			av_undef (values);