X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fperl.c;h=a2f5da299bf92ae9679d3fd69b478f691540e3e4;hb=43ea89b8f320b54cc6d1bb05c5cc13488bb438c9;hp=efd13abd354851f65e448d21025acb74e5ba1571;hpb=8f4bc7d5dcaf6fb96caa8d222382916990cbdac1;p=collectd.git

diff --git a/src/perl.c b/src/perl.c
index efd13abd..a2f5da29 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
@@ -145,6 +145,11 @@ typedef struct {
 	} while (0)
 
 /*
+ * Public variable
+ */
+extern char **environ;
+
+/*
  * private variables
  */
 
@@ -194,6 +199,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 +274,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 +330,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 +651,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);
@@ -1910,7 +1928,8 @@ static int perl_read (void)
 	return pplugin_call_all (aTHX_ PLUGIN_READ);
 } /* static int perl_read (void) */
 
-static int perl_write (const data_set_t *ds, const value_list_t *vl)
+static int perl_write (const data_set_t *ds, const value_list_t *vl,
+		user_data_t __attribute__((unused)) *user_data)
 {
 	dTHX;
 
@@ -1932,7 +1951,8 @@ static int perl_write (const data_set_t *ds, const value_list_t *vl)
 	return pplugin_call_all (aTHX_ PLUGIN_WRITE, ds, vl);
 } /* static int perl_write (const data_set_t *, const value_list_t *) */
 
-static void perl_log (int level, const char *msg)
+static void perl_log (int level, const char *msg,
+		user_data_t __attribute__((unused)) *user_data)
 {
 	dTHX;
 
@@ -1953,7 +1973,8 @@ static void perl_log (int level, const char *msg)
 	return;
 } /* static void perl_log (int, const char *) */
 
-static int perl_notify (const notification_t *notif)
+static int perl_notify (const notification_t *notif,
+		user_data_t __attribute__((unused)) *user_data)
 {
 	dTHX;
 
@@ -1972,7 +1993,8 @@ static int perl_notify (const notification_t *notif)
 	return pplugin_call_all (aTHX_ PLUGIN_NOTIF, notif);
 } /* static int perl_notify (const notification_t *) */
 
-static int perl_flush (int timeout, const char *identifier)
+static int perl_flush (int timeout, const char *identifier,
+		user_data_t __attribute__((unused)) *user_data)
 {
 	dTHX;
 
@@ -2218,14 +2240,15 @@ static int init_pi (int argc, char **argv)
 
 	perl_run (aTHX);
 
-	plugin_register_log ("perl", perl_log);
-	plugin_register_notification ("perl", perl_notify);
+	plugin_register_log ("perl", perl_log, /* user_data = */ NULL);
+	plugin_register_notification ("perl", perl_notify,
+			/* user_data = */ NULL);
 	plugin_register_init ("perl", perl_init);
 
 	plugin_register_read ("perl", perl_read);
 
-	plugin_register_write ("perl", perl_write);
-	plugin_register_flush ("perl", perl_flush);
+	plugin_register_write ("perl", perl_write, /* user_data = */ NULL);
+	plugin_register_flush ("perl", perl_flush, /* user_data = */ NULL);
 	plugin_register_shutdown ("perl", perl_shutdown);
 	return 0;
 } /* static int init_pi (const char **, const int) */