X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fperl.c;h=726058044b80931843069737022b300473dd6ca9;hb=44a8f56d76f2ccd0dc736bdebafd3d18ce7a1858;hp=96ba802445b7e6e1aa56b2de17aeec597cda2a74;hpb=9c8848b1b4bc307b18eabc22f913313fecdd36af;p=collectd.git

diff --git a/src/perl.c b/src/perl.c
index 96ba8024..72605804 100644
--- a/src/perl.c
+++ b/src/perl.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/perl.c
- * Copyright (C) 2007, 2008  Sebastian Harl
+ * Copyright (C) 2007-2009  Sebastian Harl
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -33,6 +33,10 @@
 
 #include "configfile.h"
 
+#if HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif
+
 #include <EXTERN.h>
 #include <perl.h>
 
@@ -145,6 +149,11 @@ typedef struct {
 	} while (0)
 
 /*
+ * Public variable
+ */
+extern char **environ;
+
+/*
  * private variables
  */
 
@@ -194,6 +203,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 +278,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 +334,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 +655,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);
@@ -1592,40 +1614,29 @@ static XS (Collectd_plugin_unregister_ds)
 static XS (Collectd_plugin_dispatch_values)
 {
 	SV *values     = NULL;
-	int values_idx = 0;
 
 	int ret = 0;
 
 	dXSARGS;
 
-	if (2 == items) {
-		log_warn ("Collectd::plugin_dispatch_values with two arguments "
-				"is deprecated - pass the type through values->{type}.");
-		values_idx = 1;
-	}
-	else if (1 != items) {
+	if (1 != items) {
 		log_err ("Usage: Collectd::plugin_dispatch_values(values)");
 		XSRETURN_EMPTY;
 	}
 
 	log_debug ("Collectd::plugin_dispatch_values: values=\"%s\"",
-			SvPV_nolen (ST (values_idx)));
+			SvPV_nolen (ST (/* stack index = */ 0)));
 
-	values = ST (values_idx);
+	values = ST (/* stack index = */ 0);
 
+	/* Make sure the argument is a hash reference. */
 	if (! (SvROK (values) && (SVt_PVHV == SvTYPE (SvRV (values))))) {
 		log_err ("Collectd::plugin_dispatch_values: Invalid values.");
 		XSRETURN_EMPTY;
 	}
 
-	if (((2 == items) && (NULL == ST (0))) || (NULL == values))
-		XSRETURN_EMPTY;
-
-	if ((2 == items) && (NULL == hv_store ((HV *)SvRV (values), "type", 4,
-			newSVsv (ST (0)), 0))) {
-		log_err ("Collectd::plugin_dispatch_values: Could not store type.");
+	if (NULL == values)
 		XSRETURN_EMPTY;
-	}
 
 	ret = pplugin_dispatch_values (aTHX_ (HV *)SvRV (values));