X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.c;h=d33d1d6685ff4755d9ab460a526313b468d6f71d;hb=59c7ee1cafaf53814838794908dd84f8101334c7;hp=548a8fdd989c0772cb8b361079cdccbda4377edd;hpb=98062438c25226e2e4a28ab629de5dfa27a79913;p=collectd.git

diff --git a/src/collectd.c b/src/collectd.c
index 548a8fdd..d33d1d66 100644
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -40,33 +40,36 @@
  * Global variables
  */
 char hostname_g[DATA_MAX_NAME_LEN];
-int  interval_g;
+cdtime_t interval_g;
+int  timeout_g;
 #if HAVE_LIBKSTAT
 kstat_ctl_t *kc;
 #endif /* HAVE_LIBKSTAT */
 
 static int loop = 0;
 
-static void *do_flush (void *arg)
+static void *do_flush (void __attribute__((unused)) *arg)
 {
 	INFO ("Flushing all data.");
-	plugin_flush (NULL, -1, NULL);
+	plugin_flush (/* plugin = */ NULL,
+			/* timeout = */ 0,
+			/* ident = */ NULL);
 	INFO ("Finished flushing all data.");
 	pthread_exit (NULL);
 	return NULL;
 }
 
-static void sig_int_handler (int signal)
+static void sig_int_handler (int __attribute__((unused)) signal)
 {
 	loop++;
 }
 
-static void sig_term_handler (int signal)
+static void sig_term_handler (int __attribute__((unused)) signal)
 {
 	loop++;
 }
 
-static void sig_usr1_handler (int signal)
+static void sig_usr1_handler (int __attribute__((unused)) signal)
 {
 	pthread_t      thread;
 	pthread_attr_t attr;
@@ -102,9 +105,7 @@ static int init_hostname (void)
 	}
 
 	str = global_option_get ("FQDNLookup");
-	if ((strcasecmp ("false", str) == 0)
-			|| (strcasecmp ("no", str) == 0)
-			|| (strcasecmp ("off", str) == 0))
+	if (IS_FALSE (str))
 		return (0);
 
 	memset (&ai_hints, '\0', sizeof (ai_hints));
@@ -140,15 +141,37 @@ static int init_global_variables (void)
 
 	str = global_option_get ("Interval");
 	if (str == NULL)
-		str = "10";
-	interval_g = atoi (str);
-	if (interval_g <= 0)
 	{
-		fprintf (stderr, "Cannot set the interval to a correct value.\n"
+		interval_g = TIME_T_TO_CDTIME_T (10);
+	}
+	else
+	{
+		double tmp;
+
+		tmp = atof (str);
+		if (tmp <= 0.0)
+		{
+			fprintf (stderr, "Cannot set the interval to a "
+					"correct value.\n"
+					"Please check your settings.\n");
+			return (-1);
+		}
+
+		interval_g = DOUBLE_TO_CDTIME_T (tmp);
+	}
+	DEBUG ("interval_g = %.3f;", CDTIME_T_TO_DOUBLE (interval_g));
+
+	str = global_option_get ("Timeout");
+	if (str == NULL)
+		str = "2";
+	timeout_g = atoi (str);
+	if (timeout_g <= 1)
+	{
+		fprintf (stderr, "Cannot set the timeout to a correct value.\n"
 				"Please check your settings.\n");
 		return (-1);
 	}
-	DEBUG ("interval_g = %i;", interval_g);
+	DEBUG ("timeout_g = %i;", timeout_g);
 
 	if (init_hostname () != 0)
 		return (-1);
@@ -261,9 +284,10 @@ static void exit_usage (int status)
 #endif
 			"    -h              Display help (this message)\n"
 			"\nBuiltin defaults:\n"
-			"  Config-File       "CONFIGFILE"\n"
-			"  PID-File          "PIDFILE"\n"
-			"  Data-Directory    "PKGLOCALSTATEDIR"\n"
+			"  Config file       "CONFIGFILE"\n"
+			"  PID file          "PIDFILE"\n"
+			"  Plugin directory  "PLUGINDIR"\n"
+			"  Data directory    "PKGLOCALSTATEDIR"\n"
 			"\n"PACKAGE" "VERSION", http://collectd.org/\n"
 			"by Florian octo Forster <octo@verplant.org>\n"
 			"for contributions see `AUTHORS'\n");
@@ -299,21 +323,14 @@ static int do_init (void)
 
 static int do_loop (void)
 {
-	struct timeval tv_now;
-	struct timeval tv_next;
-	struct timespec ts_wait;
+	cdtime_t wait_until;
+
+	wait_until = cdtime () + interval_g;
 
 	while (loop == 0)
 	{
-		if (gettimeofday (&tv_next, NULL) < 0)
-		{
-			char errbuf[1024];
-			ERROR ("gettimeofday failed: %s",
-					sstrerror (errno, errbuf,
-						sizeof (errbuf)));
-			return (-1);
-		}
-		tv_next.tv_sec += interval_g;
+		struct timespec ts_wait = { 0, 0 };
+		cdtime_t now;
 
 #if HAVE_LIBKSTAT
 		update_kstat ();
@@ -322,24 +339,20 @@ static int do_loop (void)
 		/* Issue all plugins */
 		plugin_read_all ();
 
-		if (gettimeofday (&tv_now, NULL) < 0)
+		now = cdtime ();
+		if (now >= wait_until)
 		{
-			char errbuf[1024];
-			ERROR ("gettimeofday failed: %s",
-					sstrerror (errno, errbuf,
-						sizeof (errbuf)));
-			return (-1);
-		}
-
-		if (timeval_sub_timespec (&tv_next, &tv_now, &ts_wait) != 0)
-		{
-			WARNING ("Not sleeping because "
-					"`timeval_sub_timespec' returned "
-					"non-zero!");
+			WARNING ("Not sleeping because the next interval is "
+					"%.3f seconds in the past!",
+					CDTIME_T_TO_DOUBLE (now - wait_until));
+			wait_until = now + interval_g;
 			continue;
 		}
 
-		while ((loop == 0) && (nanosleep (&ts_wait, &ts_wait) == -1))
+		CDTIME_T_TO_TIMESPEC (wait_until - now, &ts_wait);
+		wait_until = wait_until + interval_g;
+
+		while ((loop == 0) && (nanosleep (&ts_wait, &ts_wait) != 0))
 		{
 			if (errno != EINTR)
 			{
@@ -352,7 +365,6 @@ static int do_loop (void)
 		}
 	} /* while (loop == 0) */
 
-	DEBUG ("return (0);");
 	return (0);
 } /* int do_loop */