X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcollectd.c;h=e13064771dcef9878bef79a3bf5bd289e4ded6ac;hb=2cea8075c666a6c6c7d6e1b4f95e1bee6f3803ac;hp=c2c6dc0eb64d16d0a8ac3c422a453eaf7b1440e6;hpb=d3b918437ab91f7ad9c12f9157c6a19f973a64c4;p=collectd.git diff --git a/src/collectd.c b/src/collectd.c index c2c6dc0e..e1306477 100644 --- a/src/collectd.c +++ b/src/collectd.c @@ -1,11 +1,10 @@ /** * collectd - src/collectd.c - * Copyright (C) 2005 Florian octo Forster + * Copyright (C) 2005,2006 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; either version 2 of the License, or (at your - * option) any later version. + * Free Software Foundation; only version 2 of the License is applicable. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -25,12 +24,10 @@ #include "common.h" #include "utils_debug.h" -#include "multicast.h" +#include "network.h" #include "plugin.h" #include "configfile.h" -#include "ping.h" - static int loop = 0; #if HAVE_LIBKSTAT @@ -41,10 +38,7 @@ kstat_ctl_t *kc; * exported variables */ time_t curtime; - -#if HAVE_LIBRRD -int operating_mode; -#endif +int operating_mode; static void sigIntHandler (int signal) { @@ -128,6 +122,8 @@ static void exit_usage (char *name) " General:\n" " -C Configuration file.\n" " Default: "CONFIGFILE"\n" + " -P PID-file.\n" + " Default: "PIDFILE"\n" #if COLLECT_DAEMON " -f Don't fork to the background.\n" #endif @@ -138,7 +134,9 @@ static void exit_usage (char *name) #if COLLECT_DEBUG " Log-File "LOGFILE"\n" #endif - "\n"PACKAGE" "VERSION", http://verplant.org/collectd/\n" + " Step "COLLECTD_STEP" seconds\n" + " Heartbeat "COLLECTD_HEARTBEAT" seconds\n" + "\n"PACKAGE" "VERSION", http://collectd.org/\n" "by Florian octo Forster \n" "for contributions see `AUTHORS'\n"); exit (0); @@ -146,7 +144,15 @@ static void exit_usage (char *name) static int start_client (void) { - int sleepingtime; + int step; + + struct timeval tv_now; + struct timeval tv_next; + struct timespec ts_wait; + + step = atoi (COLLECTD_STEP); + if (step <= 0) + step = 10; #if HAVE_LIBKSTAT kc = NULL; @@ -171,18 +177,42 @@ static int start_client (void) while (loop == 0) { - curtime = time (NULL); + if (gettimeofday (&tv_next, NULL) < 0) + { + syslog (LOG_ERR, "gettimeofday failed: %s", strerror (errno)); + return (-1); + } + tv_next.tv_sec += step; + #if HAVE_LIBKSTAT update_kstat (); #endif - plugin_read_all (); + /* `curtime' is used by many (all?) plugins as the + * data-sample-time passed to RRDTool */ + curtime = time (NULL); - sleepingtime = 10; - while (sleepingtime != 0) + /* Issue all plugins */ + plugin_read_all (&loop); + + if (gettimeofday (&tv_now, NULL) < 0) { - if (loop != 0) + syslog (LOG_ERR, "gettimeofday failed: %s", strerror (errno)); + return (-1); + } + + if (timeval_sub_timespec (&tv_next, &tv_now, &ts_wait) != 0) + { + syslog (LOG_WARNING, "Not sleeping because `timeval_sub_timespec' returned non-zero!"); + continue; + } + + while ((loop == 0) && (nanosleep (&ts_wait, &ts_wait) == -1)) + { + if (errno != EINTR) + { + syslog (LOG_ERR, "nanosleep failed: %s", strerror (errno)); break; - sleepingtime = sleep (sleepingtime); + } } } @@ -192,15 +222,29 @@ static int start_client (void) #if HAVE_LIBRRD static int start_server (void) { + /* FIXME */ +#if 0 char *host; char *type; char *instance; char *values; - while (loop == 0) + int error_counter = 0; + int status; + + while ((loop == 0) && (error_counter < 3)) { - if (multicast_receive (&host, &type, &instance, &values) == 0) - plugin_write (host, type, instance, values); + status = network_receive (&host, &type, &instance, &values); + + if (status != 0) + { + if (status < 0) + error_counter++; + continue; + } + error_counter = 0; + + plugin_write (host, type, instance, values); if (host != NULL) free (host); host = NULL; if (type != NULL) free (type); type = NULL; @@ -208,6 +252,7 @@ static int start_server (void) if (values != NULL) free (values); values = NULL; } +#endif return (0); } /* static int start_server (void) */ #endif /* HAVE_LIBRRD */ @@ -226,7 +271,7 @@ static int pidfile_create (const char *file) return (1); } - fprintf (fh, "%d\n", getpid()); + fprintf (fh, "%i\n", (int) getpid ()); fclose(fh); return (0); @@ -251,7 +296,7 @@ int main (int argc, char **argv) char *configfile = CONFIGFILE; #if COLLECT_DAEMON struct sigaction sigChldAction; - char *pidfile = PIDFILE; + char *pidfile = NULL; pid_t pid; int daemonize = 1; #endif @@ -261,6 +306,8 @@ int main (int argc, char **argv) #if HAVE_LIBRRD operating_mode = MODE_LOCAL; +#else + operating_mode = MODE_CLIENT; #endif /* open syslog */ @@ -273,7 +320,7 @@ int main (int argc, char **argv) c = getopt (argc, argv, "hC:" #if COLLECT_DAEMON - "f" + "fP:" #endif ); @@ -286,6 +333,9 @@ int main (int argc, char **argv) configfile = optarg; break; #if COLLECT_DAEMON + case 'P': + pidfile = optarg; + break; case 'f': daemonize = 0; break; @@ -336,7 +386,8 @@ int main (int argc, char **argv) sigChldAction.sa_handler = SIG_IGN; sigaction (SIGCHLD, &sigChldAction, NULL); - if ((pidfile = cf_get_option ("PIDFile", PIDFILE)) == NULL) + if ((pidfile == NULL) + && ((pidfile = cf_get_option ("PIDFile", PIDFILE)) == NULL)) { fprintf (stderr, "Cannot obtain pidfile. This shoud not happen. Ever."); return (1); @@ -402,10 +453,12 @@ int main (int argc, char **argv) #if HAVE_LIBRRD if (operating_mode == MODE_SERVER) start_server (); - else /* if (operating_mode == MODE_CLIENT || operating_mode == MODE_LOCAL) */ + else /* if (operating_mode == MODE_CLIENT || operating_mode == MODE_LOCAL || operating_mode == MODE_LOG) */ #endif start_client (); + plugin_shutdown_all (); + #if COLLECT_DEBUG if (logfile != NULL) DBG_STOPFILE("debug file closed.");