Changeset 5719 for lm-sensors/trunk/prog/sensord/rrd.c

Timestamp:

05/13/09 18:04:51 (4 years ago)

Author:

andy

Message:

sensord: Introduce struct sensord_args.

This structure encapsulate all the variables holding the commandline
arguments. So we get rid of plenty of extern variables. This reduces
namespace collisions and unifies access.

Files:

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

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

@@ -44 +44 @@
 #include <rrd.h>
 
+#include "args.h"
 #include "sensord.h"
 
@@ -142 +143 @@
         int i, j, ret = 0, num = 0;
 
-        for (j = 0; (ret == 0) && (j < numChipNames); ++ j) {
+        for (j = 0; (ret == 0) && (j < sensord_args.numChipNames); ++ j) {
                 i = 0;
-                while ((ret == 0) && ((chip = sensors_get_detected_chips(&chipNames[j], &i)) != NULL)) {
+                while ((ret == 0) && ((chip = sensors_get_detected_chips(&sensord_args.chipNames[j], &i)) != NULL)) {
                         int index0, chipindex = -1;
 
@@ -224 +225 @@
                  * instead of unknown
                  */
-                sprintf(ptr, "DS:%s:GAUGE:%d:%s:%s", rawLabel, 5 * rrdTime,
-                        min, max);
+                sprintf(ptr, "DS:%s:GAUGE:%d:%s:%s", rawLabel, 5 *
+                        sensord_args.rrdTime, min, max);
         }
         return 0;
@@ -235 +236 @@
         struct ds data = { 0, argv};
         ret = applyToFeatures(rrdGetSensors_DS, &data);
-        if (!ret && doLoad)
+        if (!ret && sensord_args.doLoad)
                 ret = rrdGetSensors_DS(&data, LOADAVG, LOAD_AVERAGE, NULL);
         return ret ? -1 : data.num;
@@ -246 +247 @@
 
         sensorLog(LOG_DEBUG, "sensor RRD init");
-        if (stat(rrdFile, &tmp)) {
+        if (stat(sensord_args.rrdFile, &tmp)) {
                 if (errno == ENOENT) {
                         char stepBuff[STEP_BUFF], rraBuff[RRA_BUFF];
                         int argc = 4, num;
                         const char *argv[6 + MAX_RRD_SENSORS] = {
-                                "sensord", rrdFile, "-s", stepBuff
+                                "sensord", sensord_args.rrdFile, "-s", stepBuff
                         };
 
@@ -259 +260 @@
                                 sensorLog(LOG_ERR,
                                           "Error creating RRD: %s: %s",
-                                          rrdFile, "No sensors detected");
+                                          sensord_args.rrdFile,
+                                          "No sensors detected");
                                 ret = 2;
                         } else if (num < 0) {
                                 ret = -num;
                         } else {
-                                sprintf(stepBuff, "%d", rrdTime);
+                                sprintf(stepBuff, "%d", sensord_args.rrdTime);
                                 sprintf(rraBuff, "RRA:%s:%f:%d:%d",
-                                        rrdNoAverage?"LAST":"AVERAGE",
+                                        sensord_args.rrdNoAverage ? "LAST" :
+                                        "AVERAGE",
                                         0.5 /* fraction of non-unknown samples needed per entry */,
                                         1 /* samples per entry */,
-                                        7 * 24 * 60 * 60 / rrdTime /* 1 week */);
+                                        7 * 24 * 60 * 60 /
+                                        sensord_args.rrdTime /* 1 week */);
+
                                 argc += num;
                                 argv[argc ++] = rraBuff;
@@ -277 +282 @@
                                         sensorLog(LOG_ERR,
                                                   "Error creating RRD file: %s: %s",
-                                                  rrdFile, rrd_get_error());
+                                                  sensord_args.rrdFile,
+                                                  rrd_get_error());
                                 }
                         }
                 } else {
                         sensorLog(LOG_ERR, "Error stat()ing RRD: %s: %s",
-                                  rrdFile, strerror(errno));
+                                  sensord_args.rrdFile, strerror(errno));
                         ret = 1;
                 }
@@ -311 +317 @@
         (void) label; /* no warning */
         if (!feature || (feature->rrd && (feature->type == data->type)))
-                printf("\n\tDEF:%s=%s:%s:AVERAGE", rawLabel, rrdFile,
-                       rawLabel);
+                printf("\n\tDEF:%s=%s:%s:AVERAGE", rawLabel,
+                       sensord_args.rrdFile, rawLabel);
         return 0;
 }
@@ -421 +427 @@
 {
         int ret = rrdChips ();
-        if (!ret && doLoad) {
+
+        if (!ret && sensord_args.doLoad) {
                 FILE *loadavg;
                 if (!(loadavg = fopen("/proc/loadavg", "r"))) {
@@ -443 +450 @@
         if (!ret) {
                 const char *argv[] = {
-                        "sensord", rrdFile, rrdBuff, NULL
+                        "sensord", sensord_args.rrdFile, rrdBuff, NULL
                 };
                 if ((ret = rrd_update(3, (char **) /* WEAK */ argv))) {
                         sensorLog(LOG_ERR, "Error updating RRD file: %s: %s",
-                                  rrdFile, rrd_get_error());
+                                  sensord_args.rrdFile, rrd_get_error());
                 }
         }
@@ -464 +471 @@
                 printf("<H2>%s</H2>\n", graph->h2);
                 printf("<P>\n<RRD::GRAPH %s/%s.png\n\t--imginfo '<IMG SRC=" WWWDIR "/%%s WIDTH=%%lu HEIGHT=%%lu>'\n\t-a PNG\n\t-h 200 -w 800\n",
-                       cgiDir, graph->image);
+                       sensord_args.cgiDir, graph->image);
                 printf("\t--lazy\n\t-v '%s'\n\t-t '%s'\n\t-x '%s'\n\t%s",
                        graph->axisTitle, graph->title, graph->axisDefn,
@@ -470 +477 @@
                 if (!ret)
                         ret = applyToFeatures(rrdCGI_DEF, graph);
-                if (!ret && doLoad && graph->loadAvg)
+                if (!ret && sensord_args.doLoad && graph->loadAvg)
                         ret = rrdCGI_DEF(graph, LOADAVG, LOAD_AVERAGE, NULL);
                 if (!ret)
                         ret = applyToFeatures(rrdCGI_LINE, graph);
-                if (!ret && doLoad && graph->loadAvg)
+                if (!ret && sensord_args.doLoad && graph->loadAvg)
                         ret = rrdCGI_LINE(graph, LOADAVG, LOAD_AVERAGE, NULL);
                 printf (">\n</P>\n");