X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fping.c;h=c97571b85c066c695fd66369269b6035bba00097;hb=11733d9b2702d81c1e75edaea277afac178d2717;hp=927838007a2cffc856640ab7d9fe4bfbbf08af80;hpb=edb6c3544ab2755c85e8931cbef960e9cedd48cf;p=collectd.git diff --git a/src/ping.c b/src/ping.c index 92783800..c97571b8 100644 --- a/src/ping.c +++ b/src/ping.c @@ -1,28 +1,34 @@ /** * collectd - src/ping.c - * Copyright (C) 2005-2009 Florian octo Forster + * Copyright (C) 2005-2012 Florian octo Forster * - * 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 - * Free Software Foundation; only version 2 of the License is applicable. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * Authors: - * Florian octo Forster + * Florian octo Forster **/ #include "collectd.h" #include "common.h" #include "plugin.h" #include "configfile.h" +#include "utils_complain.h" #include #include @@ -49,6 +55,7 @@ struct hostlist_s uint32_t pkg_sent; uint32_t pkg_recv; + uint32_t pkg_missed; double latency_total; double latency_squared; @@ -69,6 +76,7 @@ static char *ping_device = NULL; static int ping_ttl = PING_DEF_TTL; static double ping_interval = 1.0; static double ping_timeout = 0.9; +static int ping_max_missed = -1; static int ping_thread_loop = 0; static int ping_thread_error = 0; @@ -85,7 +93,8 @@ static const char *config_keys[] = #endif "TTL", "Interval", - "Timeout" + "Timeout", + "MaxMissed" }; static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); @@ -139,9 +148,100 @@ static void time_calc (struct timespec *ts_dest, /* {{{ */ time_normalize (ts_dest); } /* }}} void time_calc */ +static int ping_dispatch_all (pingobj_t *pingobj) /* {{{ */ +{ + pingobj_iter_t *iter; + hostlist_t *hl; + int status; + + for (iter = ping_iterator_get (pingobj); + iter != NULL; + iter = ping_iterator_next (iter)) + { /* {{{ */ + char userhost[NI_MAXHOST]; + double latency; + size_t param_size; + + param_size = sizeof (userhost); + status = ping_iterator_get_info (iter, +#ifdef PING_INFO_USERNAME + PING_INFO_USERNAME, +#else + PING_INFO_HOSTNAME, +#endif + userhost, ¶m_size); + if (status != 0) + { + WARNING ("ping plugin: ping_iterator_get_info failed: %s", + ping_get_error (pingobj)); + continue; + } + + for (hl = hostlist_head; hl != NULL; hl = hl->next) + if (strcmp (userhost, hl->host) == 0) + break; + + if (hl == NULL) + { + WARNING ("ping plugin: Cannot find host %s.", userhost); + continue; + } + + param_size = sizeof (latency); + status = ping_iterator_get_info (iter, PING_INFO_LATENCY, + (void *) &latency, ¶m_size); + if (status != 0) + { + WARNING ("ping plugin: ping_iterator_get_info failed: %s", + ping_get_error (pingobj)); + continue; + } + + hl->pkg_sent++; + if (latency >= 0.0) + { + hl->pkg_recv++; + hl->latency_total += latency; + hl->latency_squared += (latency * latency); + + /* reset missed packages counter */ + hl->pkg_missed = 0; + } else + hl->pkg_missed++; + + /* if the host did not answer our last N packages, trigger a resolv. */ + if (ping_max_missed >= 0 && hl->pkg_missed >= ping_max_missed) + { /* {{{ */ + /* we reset the missed package counter here, since we only want to + * trigger a resolv every N packages and not every package _AFTER_ N + * missed packages */ + hl->pkg_missed = 0; + + WARNING ("ping plugin: host %s has not answered %d PING requests," + " triggering resolve", hl->host, ping_max_missed); + + /* we trigger the resolv simply be removeing and adding the host to our + * ping object */ + status = ping_host_remove (pingobj, hl->host); + if (status != 0) + { + WARNING ("ping plugin: ping_host_remove (%s) failed.", hl->host); + } + else + { + status = ping_host_add (pingobj, hl->host); + if (status != 0) + ERROR ("ping plugin: ping_host_add (%s) failed.", hl->host); + } + } /* }}} ping_max_missed */ + } /* }}} for (iter) */ + + return (0); +} /* }}} int ping_dispatch_all */ + static void *ping_thread (void *arg) /* {{{ */ { - static pingobj_t *pingobj = NULL; + pingobj_t *pingobj = NULL; struct timeval tv_begin; struct timeval tv_end; @@ -149,7 +249,9 @@ static void *ping_thread (void *arg) /* {{{ */ struct timespec ts_int; hostlist_t *hl; - int status; + int count; + + c_complain_t complaint = C_COMPLAIN_INIT_STATIC; pthread_mutex_lock (&ping_lock); @@ -178,18 +280,19 @@ static void *ping_thread (void *arg) /* {{{ */ ping_setopt (pingobj, PING_OPT_TTL, (void *) &ping_ttl); /* Add all the hosts to the ping object. */ - status = 0; + count = 0; for (hl = hostlist_head; hl != NULL; hl = hl->next) { int tmp_status; tmp_status = ping_host_add (pingobj, hl->host); if (tmp_status != 0) - WARNING ("ping plugin: ping_host_add (%s) failed.", hl->host); + WARNING ("ping plugin: ping_host_add (%s) failed: %s", + hl->host, ping_get_error (pingobj)); else - status++; + count++; } - if (status == 0) + if (count == 0) { ERROR ("ping plugin: No host could be added to ping object. Giving up."); ping_thread_error = 1; @@ -209,12 +312,14 @@ static void *ping_thread (void *arg) /* {{{ */ while (ping_thread_loop > 0) { - pingobj_iter_t *iter; int status; + _Bool send_successful = 0; if (gettimeofday (&tv_begin, NULL) < 0) { - ERROR ("ping plugin: gettimeofday failed"); + char errbuf[1024]; + ERROR ("ping plugin: gettimeofday failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); ping_thread_error = 1; break; } @@ -224,10 +329,13 @@ static void *ping_thread (void *arg) /* {{{ */ status = ping_send (pingobj); if (status < 0) { - ERROR ("ping plugin: ping_send failed: %s", ping_get_error (pingobj)); - pthread_mutex_lock (&ping_lock); - ping_thread_error = 1; - break; + c_complain (LOG_ERR, &complaint, "ping plugin: ping_send failed: %s", + ping_get_error (pingobj)); + } + else + { + c_release (LOG_NOTICE, &complaint, "ping plugin: ping_send succeeded."); + send_successful = 1; } pthread_mutex_lock (&ping_lock); @@ -235,61 +343,14 @@ static void *ping_thread (void *arg) /* {{{ */ if (ping_thread_loop <= 0) break; - for (iter = ping_iterator_get (pingobj); - iter != NULL; - iter = ping_iterator_next (iter)) - { /* {{{ */ - char userhost[NI_MAXHOST]; - double latency; - size_t param_size; - - param_size = sizeof (userhost); - status = ping_iterator_get_info (iter, -#ifdef PING_INFO_USERNAME - PING_INFO_USERNAME, -#else - PING_INFO_HOSTNAME, -#endif - userhost, ¶m_size); - if (status != 0) - { - WARNING ("ping plugin: ping_iterator_get_info failed: %s", - ping_get_error (pingobj)); - continue; - } - - for (hl = hostlist_head; hl != NULL; hl = hl->next) - if (strcmp (userhost, hl->host) == 0) - break; - - if (hl == NULL) - { - WARNING ("ping plugin: Cannot find host %s.", userhost); - continue; - } - - param_size = sizeof (latency); - status = ping_iterator_get_info (iter, PING_INFO_LATENCY, - (void *) &latency, ¶m_size); - if (status != 0) - { - WARNING ("ping plugin: ping_iterator_get_info failed: %s", - ping_get_error (pingobj)); - continue; - } - - hl->pkg_sent++; - if (latency >= 0.0) - { - hl->pkg_recv++; - hl->latency_total += latency; - hl->latency_squared += (latency * latency); - } - } /* }}} for (iter) */ + if (send_successful) + (void) ping_dispatch_all (pingobj); if (gettimeofday (&tv_end, NULL) < 0) { - ERROR ("ping plugin: gettimeofday failed"); + char errbuf[1024]; + ERROR ("ping plugin: gettimeofday failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); ping_thread_error = 1; break; } @@ -298,7 +359,7 @@ static void *ping_thread (void *arg) /* {{{ */ * `ts_wait'. */ time_calc (&ts_wait, &ts_int, &tv_begin, &tv_end); - status = pthread_cond_timedwait (&ping_cond, &ping_lock, &ts_wait); + pthread_cond_timedwait (&ping_cond, &ping_lock, &ts_wait); if (ping_thread_loop <= 0) break; } /* while (ping_thread_loop > 0) */ @@ -323,7 +384,7 @@ static int start_thread (void) /* {{{ */ ping_thread_loop = 1; ping_thread_error = 0; - status = pthread_create (&ping_thread_id, /* attr = */ NULL, + status = plugin_thread_create (&ping_thread_id, /* attr = */ NULL, ping_thread, /* arg = */ (void *) 0); if (status != 0) { @@ -360,8 +421,10 @@ static int stop_thread (void) /* {{{ */ status = -1; } + pthread_mutex_lock (&ping_lock); memset (&ping_thread_id, 0, sizeof (ping_thread_id)); ping_thread_error = 0; + pthread_mutex_unlock (&ping_lock); return (status); } /* }}} int stop_thread */ @@ -436,6 +499,7 @@ static int ping_config (const char *key, const char *value) /* {{{ */ hl->host = host; hl->pkg_sent = 0; hl->pkg_recv = 0; + hl->pkg_missed = 0; hl->latency_total = 0.0; hl->latency_squared = 0.0; hl->next = hostlist_head; @@ -485,6 +549,12 @@ static int ping_config (const char *key, const char *value) /* {{{ */ WARNING ("ping plugin: Ignoring invalid timeout %g (%s)", tmp, value); } + else if (strcasecmp (key, "MaxMissed") == 0) + { + ping_max_missed = atoi (value); + if (ping_max_missed < 0) + INFO ("ping plugin: MaxMissed < 0, disabled re-resolving of hosts"); + } else { return (-1);