X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmemcached.c;h=5af2091453a439aa090a09ba8dabdde27886ae33;hb=108068f268cad453e5d3b54e288917409db1e467;hp=ca93102f2a2865a9ab2b1bbb3919f7b1b064d272;hpb=4e6812d3e5073e5b4bd7eaef9f2539c8c9dd28a4;p=collectd.git

diff --git a/src/memcached.c b/src/memcached.c
index ca93102f..5af20914 100644
--- a/src/memcached.c
+++ b/src/memcached.c
@@ -1,7 +1,8 @@
 /**
  * collectd - src/memcached.c, based on src/hddtemp.c
- * Copyright (C) 2007  Antony Dovgal
- * Copyright (C) 2005,2006  Vincent Stehlé
+ * Copyright (C) 2007       Antony Dovgal
+ * Copyright (C) 2007-2009  Florian Forster
+ * Copyright (C) 2009       Doug MacEachern
  *
  * 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
@@ -19,8 +20,8 @@
  *
  * Authors:
  *   Antony Dovgal <tony at daylessday dot org>
- *   Vincent Stehlé <vincent.stehle at free.fr>
  *   Florian octo Forster <octo at verplant.org>
+ *   Doug MacEachern <dougm at hyperic.com>
  **/
 
 #include "collectd.h"
@@ -127,17 +128,29 @@ static int memcached_query_daemon (char *buffer, int buffer_size) /* {{{ */
 
 	{
 		struct pollfd p;
-		int n;
+		int status;
 
+		memset (&p, 0, sizeof (p));
 		p.fd = fd;
-		p.events = POLLIN|POLLERR|POLLHUP;
+		p.events = POLLIN | POLLERR | POLLHUP;
 		p.revents = 0;
 
-		n = poll(&p, 1, 3);
-
-		if (n <= 0) {
-			ERROR ("memcached: poll() failed or timed out");
-			return -1;
+		status = poll (&p, /* nfds = */ 1, /* timeout = */ 1000 * interval_g);
+		if (status <= 0)
+		{
+			if (status == 0)
+			{
+				ERROR ("memcached: poll(2) timed out after %i seconds.", interval_g);
+			}
+			else
+			{
+				char errbuf[1024];
+				ERROR ("memcached: poll(2) failed: %s",
+						sstrerror (errno, errbuf, sizeof (errbuf)));
+			}
+			shutdown (fd, SHUT_RDWR);
+			close (fd);
+			return (-1);
 		}
 	}
 
@@ -222,9 +235,8 @@ static void submit_counter (const char *type, const char *type_inst,
 
 	vl.values = values;
 	vl.values_len = 1;
-	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "memcached");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "memcached", sizeof (vl.plugin));
 	sstrncpy (vl.type, type, sizeof (vl.type));
 	if (type_inst != NULL)
 		sstrncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
@@ -245,8 +257,8 @@ static void submit_counter2 (const char *type, const char *type_inst,
 	vl.values = values;
 	vl.values_len = 2;
 	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "memcached");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "memcached", sizeof (vl.plugin));
 	sstrncpy (vl.type, type, sizeof (vl.type));
 	if (type_inst != NULL)
 		sstrncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
@@ -266,8 +278,8 @@ static void submit_gauge (const char *type, const char *type_inst,
 	vl.values = values;
 	vl.values_len = 1;
 	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "memcached");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "memcached", sizeof (vl.plugin));
 	sstrncpy (vl.type, type, sizeof (vl.type));
 	if (type_inst != NULL)
 		sstrncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
@@ -288,8 +300,8 @@ static void submit_gauge2 (const char *type, const char *type_inst,
 	vl.values = values;
 	vl.values_len = 2;
 	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "memcached");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "memcached", sizeof (vl.plugin));
 	sstrncpy (vl.type, type, sizeof (vl.type));
 	if (type_inst != NULL)
 		sstrncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
@@ -309,6 +321,8 @@ static int memcached_read (void) /* {{{ */
 
 	gauge_t bytes_used = NAN;
 	gauge_t bytes_total = NAN;
+	gauge_t hits = NAN;
+	gauge_t gets = NAN;
 	counter_t rusage_user = 0;
 	counter_t rusage_syst = 0;
 	counter_t octets_rx = 0;
@@ -418,6 +432,8 @@ static int memcached_read (void) /* {{{ */
 		{
 			const char *name = fields[1] + 4;
 			submit_counter ("memcached_command", name, atoll (fields[2]));
+			if (strcmp (name, "get") == 0)
+				gets = atof (fields[2]);
 		}
 
 		/*
@@ -426,6 +442,7 @@ static int memcached_read (void) /* {{{ */
 		else if (FIELD_IS ("get_hits"))
 		{
 			submit_counter ("memcached_ops", "hits", atoll (fields[2]));
+			hits = atof (fields[2]);
 		}
 		else if (FIELD_IS ("get_misses"))
 		{
@@ -458,6 +475,16 @@ static int memcached_read (void) /* {{{ */
 	if ((octets_rx != 0) || (octets_tx != 0))
 		submit_counter2 ("memcached_octets", NULL, octets_rx, octets_tx);
 	
+	if (!isnan (gets) && !isnan (hits))
+	{
+		gauge_t rate = NAN;
+
+		if (gets != 0.0)
+			rate = 100.0 * hits / gets;
+
+		submit_gauge ("percent", "hitratio", rate);
+	}
+
 	return 0;
 }
 /* }}} */