Changeset 2503 for lm-sensors/trunk/prog/sensord/sensord.c

Timestamp:

05/01/04 21:18:53 (9 years ago)

Author:

khali

Message:

New --rrd-no-average parameter.

Syncronize time slots with rrd.

Files:

• lm-sensors/trunk/prog/sensord/sensord.c (modified) (3 diffs)

lm-sensors/trunk/prog/sensord/sensord.c

@@ -29 +29 @@
 #include <syslog.h>
 #include <unistd.h>
+#include <time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -76 +77 @@
 (void) {
   int ret = 0;
-  int scanValue = 0, logValue = 0, rrdValue = 0;
+  int scanValue = 0, logValue = 0;
+  /*
+   * First RRD update at next RRD timeslot to prevent failures due
+   * one timeslot updated twice on restart for example.
+   */
+  int rrdValue = rrdTime - time(NULL) % rrdTime;
 
   sensorLog (LOG_INFO, "sensord started");
@@ -94 +100 @@
     if ((ret == 0) && rrdTime && rrdFile && (rrdValue <= 0)) {
       ret = rrdUpdate ();
-      rrdValue += rrdTime;
+      /*
+       * The amount of time to wait is computed using the same method as
+       * in RRD instead of simply adding the interval.
+       */
+      rrdValue = rrdTime - time(NULL) % rrdTime;
     }
     if (!done && (ret == 0)) {