X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapcups.c;h=50c45e7bdb051b8bca91f920b18aa1ebd1c2e4b7;hb=0a8741b9061f8df4a78a448c021612db06e17425;hp=af5f24c70f2f2d1e5544a7a1c62cd7f880b27ba4;hpb=d061c270fabc5dba961cf2b94ebe968e9a89b899;p=collectd.git

diff --git a/src/apcups.c b/src/apcups.c
index af5f24c7..50c45e7b 100644
--- a/src/apcups.c
+++ b/src/apcups.c
@@ -55,17 +55,17 @@
 /*
  * Private data types
  */
-struct apc_detail_s
+typedef struct
 {
-	double linev;
-	double loadpct;
-	double bcharge;
-	double timeleft;
-	double outputv;
-	double itemp;
-	double battv;
-	double linefreq;
-};
+	gauge_t linev;
+	gauge_t loadpct;
+	gauge_t bcharge;
+	gauge_t timeleft;
+	gauge_t outputv;
+	gauge_t itemp;
+	gauge_t battv;
+	gauge_t linefreq;
+} apc_detail_t;
 
 /*
  * Private variables
@@ -253,14 +253,12 @@ static int net_send (int *sockfd, const char *buff, int len)
 
 /* Get and print status from apcupsd NIS server */
 static int apc_query_server (char const *node, char const *service,
-		struct apc_detail_s *apcups_detail)
+		apc_detail_t *apcups_detail)
 {
 	int     n;
 	char    recvline[1024];
 	char   *tokptr;
 	char   *toksaveptr;
-	char   *key;
-	double  value;
 	_Bool retry = 1;
 	int status;
 
@@ -329,10 +327,13 @@ static int apc_query_server (char const *node, char const *service,
 		tokptr = strtok_r (recvline, " :\t", &toksaveptr);
 		while (tokptr != NULL)
 		{
-			key = tokptr;
+			char *key = tokptr;
 			if ((tokptr = strtok_r (NULL, " :\t", &toksaveptr)) == NULL)
 				continue;
-			value = atof (tokptr);
+
+			gauge_t value;
+			if (strtogauge (tokptr, &value) != 0)
+				continue;
 
 			PRINT_VALUE (key, value);
 
@@ -414,25 +415,22 @@ static int apcups_config (oconfig_item_t *ci)
 	return (0);
 } /* int apcups_config */
 
-static void apc_submit_generic (const char *type, const char *type_inst, double value)
+static void apc_submit_generic (const char *type, const char *type_inst, gauge_t value)
 {
-	value_t values[1];
-	value_list_t vl = VALUE_LIST_INIT;
-
-	values[0].gauge = value;
+	if (isnan (value))
+		return;
 
-	vl.values = values;
+	value_list_t vl = VALUE_LIST_INIT;
+	vl.values = &(value_t) { .gauge = value };
 	vl.values_len = 1;
-	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "apcups", sizeof (vl.plugin));
-	sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
 	sstrncpy (vl.type, type, sizeof (vl.type));
 	sstrncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
 
 	plugin_dispatch_values (&vl);
 }
 
-static void apc_submit (struct apc_detail_s *apcups_detail)
+static void apc_submit (apc_detail_t const *apcups_detail)
 {
 	apc_submit_generic ("voltage",    "input",   apcups_detail->linev);
 	apc_submit_generic ("voltage",    "output",  apcups_detail->outputv);
@@ -446,33 +444,27 @@ static void apc_submit (struct apc_detail_s *apcups_detail)
 
 static int apcups_read (void)
 {
-	struct apc_detail_s apcups_detail;
-	int status;
+	apc_detail_t apcups_detail = {
+		.linev    = NAN,
+		.outputv  = NAN,
+		.battv    = NAN,
+		.loadpct  = NAN,
+		.bcharge  = NAN,
+		.timeleft = NAN,
+		.itemp    = NAN,
+		.linefreq = NAN,
+	};
 
-	apcups_detail.linev    =   -1.0;
-	apcups_detail.outputv  =   -1.0;
-	apcups_detail.battv    =   -1.0;
-	apcups_detail.loadpct  =   -1.0;
-	apcups_detail.bcharge  =   -1.0;
-	apcups_detail.timeleft =    NAN;
-	apcups_detail.itemp    = -300.0;
-	apcups_detail.linefreq =   -1.0;
-
-	status = apc_query_server ((conf_node == NULL) ? APCUPS_DEFAULT_NODE : conf_node,
-			(conf_service == NULL) ? APCUPS_DEFAULT_SERVICE : conf_service,
-			&apcups_detail);
-
-	/*
-	 * if we did not connect then do not bother submitting
-	 * zeros. We want rrd files to have NAN.
-	 */
+	int status = apc_query_server (conf_node == NULL
+			? APCUPS_DEFAULT_NODE
+			: conf_node,
+			conf_service, &apcups_detail);
 	if (status != 0)
 	{
-		DEBUG ("apcups plugin: apc_query_server (%s, %s) = %i",
-				(conf_node == NULL) ? APCUPS_DEFAULT_NODE : conf_node,
-				(conf_service == NULL) ? APCUPS_DEFAULT_SERVICE : conf_service,
-				status);
-		return (-1);
+		DEBUG ("apcups plugin: apc_query_server (\"%s\", \"%s\") = %d",
+				conf_node == NULL ? APCUPS_DEFAULT_NODE : conf_node,
+				conf_service, status);
+		return (status);
 	}
 
 	apc_submit (&apcups_detail);