X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fping.c;h=2a2f03eb39b80f062b652d4240c8fd3cddcee849;hb=refs%2Fheads%2Fcollectd-3.11;hp=d82ce06e3fea93bf8c0ea0e20527577b3ca3aa1a;hpb=601abecb59b6041e84f11877345a98efba7b651b;p=collectd.git

diff --git a/src/ping.c b/src/ping.c
index d82ce06e..2a2f03eb 100644
--- a/src/ping.c
+++ b/src/ping.c
@@ -29,9 +29,19 @@
 #define MODULE_NAME "ping"
 
 #include <netinet/in.h>
-#include "liboping/liboping.h"
+#include "liboping/oping.h"
+
+struct hostlist_s
+{
+	char *host;
+	int   wait_time;
+	int   wait_left;
+	struct hostlist_s *next;
+};
+typedef struct hostlist_s hostlist_t;
 
 static pingobj_t *pingobj = NULL;
+static hostlist_t *hosts = NULL;
 
 static char *file_template = "ping-%s.rrd";
 
@@ -50,9 +60,59 @@ static char *config_keys[] =
 };
 static int config_keys_num = 2;
 
+static void add_hosts (void)
+{
+	hostlist_t *hl_this;
+	hostlist_t *hl_prev;
+
+	int step = atoi (COLLECTD_STEP);
+
+	hl_this = hosts;
+	hl_prev = NULL;
+	while (hl_this != NULL)
+	{
+		DBG ("host = %s, wait_left = %i, wait_time = %i, next = %p",
+				hl_this->host, hl_this->wait_left, hl_this->wait_time, (void *) hl_this->next);
+
+		if (hl_this->wait_left <= 0)
+		{
+			if (ping_host_add (pingobj, hl_this->host) == 0)
+			{
+				DBG ("Successfully added host %s", hl_this->host);
+				/* Remove the host from the linked list */
+				if (hl_prev != NULL)
+					hl_prev->next = hl_this->next;
+				else
+					hosts = hl_this->next;
+				free (hl_this->host);
+				free (hl_this);
+				hl_this = (hl_prev != NULL) ? hl_prev : hosts;
+			}
+			else
+			{
+				hl_this->wait_left = hl_this->wait_time;
+				hl_this->wait_time *= 2;
+				if (hl_this->wait_time > 86400)
+					hl_this->wait_time = 86400;
+			}
+		}
+		else
+		{
+			hl_this->wait_left -= step;
+		}
+
+		if (hl_this != NULL)
+		{
+			hl_prev = hl_this;
+			hl_this = hl_this->next;
+		}
+	}
+}
+
 static void ping_init (void)
 {
-	return;
+	if (hosts != NULL)
+		add_hosts ();
 }
 
 static int ping_config (char *key, char *value)
@@ -61,18 +121,37 @@ static int ping_config (char *key, char *value)
 	{
 		if ((pingobj = ping_construct ()) == NULL)
 		{
-			syslog (LOG_ERR, "ping: `ping_construct' failed.\n");
+			syslog (LOG_ERR, "ping: `ping_construct' failed: %s",
+				       	ping_get_error (pingobj));
 			return (1);
 		}
 	}
 
 	if (strcasecmp (key, "host") == 0)
 	{
-		if (ping_host_add (pingobj, value) < 0)
+		hostlist_t *hl;
+		char *host;
+		int step = atoi (COLLECTD_STEP);
+
+		if ((hl = (hostlist_t *) malloc (sizeof (hostlist_t))) == NULL)
+		{
+			syslog (LOG_ERR, "ping plugin: malloc failed: %s",
+					strerror (errno));
+			return (1);
+		}
+		if ((host = strdup (value)) == NULL)
 		{
-			syslog (LOG_WARNING, "ping: `ping_host_add' failed.");
+			free (hl);
+			syslog (LOG_ERR, "ping plugin: strdup failed: %s",
+					strerror (errno));
 			return (1);
 		}
+
+		hl->host = host;
+		hl->wait_time = 2 * step;
+		hl->wait_left = 0;
+		hl->next = hosts;
+		hosts = hl;
 	}
 	else if (strcasecmp (key, "ttl") == 0)
 	{
@@ -121,33 +200,39 @@ static void ping_read (void)
 {
 	pingobj_iter_t *iter;
 
-	char   *host;
-	double  latency;
+	char   host[512];
+	double latency;
+	size_t buf_len;
 
 	if (pingobj == NULL)
 		return;
 
+	if (hosts != NULL)
+		add_hosts ();
+
 	if (ping_send (pingobj) < 0)
 	{
-		syslog (LOG_ERR, "ping: `ping_send' failed.");
+		syslog (LOG_ERR, "ping: `ping_send' failed: %s",
+				ping_get_error (pingobj));
 		return;
 	}
 
-	for (iter = ping_iterator_get (pingobj); iter != NULL; iter = ping_iterator_next (iter))
+	for (iter = ping_iterator_get (pingobj);
+			iter != NULL;
+			iter = ping_iterator_next (iter))
 	{
-		const char *tmp;
-
-		if ((tmp = ping_iterator_get_host (iter)) == NULL)
-			continue;
-		if ((host = strdup (tmp)) == NULL)
+		buf_len = sizeof (host);
+		if (ping_iterator_get_info (iter, PING_INFO_HOSTNAME,
+					host, &buf_len))
 			continue;
 
-		latency = ping_iterator_get_latency (iter);
+		buf_len = sizeof (latency);
+		if (ping_iterator_get_info (iter, PING_INFO_LATENCY,
+					&latency, &buf_len))
+			continue;
 
 		DBG ("host = %s, latency = %f", host, latency);
 		ping_submit (host, latency);
-
-		free (host); host = NULL;
 	}
 }