solaris-fixes branch: Applied the swap-patch by Christophe Kalt.

[collectd.git] / src / collectd.c

diff --git a/src/collectd.c b/src/collectd.c
index aacc96e..b4ee504 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -1,6 +1,6 @@
 /**
  * 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
@@ -25,31 +25,21 @@
 #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
 kstat_ctl_t *kc;
 #endif /* HAVE_LIBKSTAT */
 
-#if COLLECT_PING
-char *pinghosts[MAX_PINGHOSTS];
-int   num_pinghosts = 0;
-#endif
-
 /*
  * exported variables
  */
 time_t curtime;
-
-#if HAVE_LIBRRD
-int operating_mode;
-#endif
+int    operating_mode;
 
 static void sigIntHandler (int signal)
 {
@@ -136,7 +126,16 @@ static void exit_usage (char *name)
 #if COLLECT_DAEMON
                        "    -f              Don't fork to the background.\n"
 #endif
-                       "\n"PACKAGE" "VERSION", http://verplant.org/collectd/\n"
+                       "\nBuiltin defaults:\n"
+                       "  Config-File       "CONFIGFILE"\n"
+                       "  PID-File          "PIDFILE"\n"
+                       "  Data-Directory    "PKGLOCALSTATEDIR"\n"
+#if COLLECT_DEBUG
+                       "  Log-File          "LOGFILE"\n"
+#endif
+                       "  Step              "COLLECTD_STEP" seconds\n"
+                       "  Heartbeat         "COLLECTD_HEARTBEAT" seconds\n"
+                       "\n"PACKAGE" "VERSION", http://collectd.org/\n"
                        "by Florian octo Forster <octo@verplant.org>\n"
                        "for contributions see `AUTHORS'\n");
        exit (0);
@@ -144,7 +143,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;
@@ -169,18 +176,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
+               /* `curtime' is used by many (all?) plugins as the
+                * data-sample-time passed to RRDTool */
+               curtime = time (NULL);
+
+               /* Issue all plugins */
                plugin_read_all ();
 
-               sleepingtime = 10;
-               while (sleepingtime != 0)
+               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, "No sleeping because `timeval_sub_timespec' returned non-zero!");
+                       continue;
+               }
+
+               while (nanosleep (&ts_wait, &ts_wait) == -1)
+               {
+                       if (errno != EINTR)
+                       {
+                               syslog (LOG_ERR, "nanosleep failed: %s", strerror (errno));
                                break;
-                       sleepingtime = sleep (sleepingtime);
+                       }
                }
        }
 
@@ -190,6 +221,7 @@ static int start_client (void)
 #if HAVE_LIBRRD
 static int start_server (void)
 {
+       /* FIXME use stack here! */
        char *host;
        char *type;
        char *instance;
@@ -197,7 +229,7 @@ static int start_server (void)
 
        while (loop == 0)
        {
-               if (multicast_receive (&host, &type, &instance, &values) == 0)
+               if (network_receive (&host, &type, &instance, &values) == 0)
                        plugin_write (host, type, instance, values);
 
                if (host     != NULL) free (host);     host     = NULL;
@@ -224,7 +256,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);
@@ -269,8 +301,7 @@ int main (int argc, char **argv)
        {
                int c;
 
-               /* FIXME */
-               c = getopt (argc, argv, "C:"
+               c = getopt (argc, argv, "hC:"
 #if COLLECT_DAEMON
                                "f"
 #endif
@@ -401,7 +432,7 @@ 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 ();