Changeset 5835

Timestamp:

05/07/10 11:01:58 (21 months ago)

Author:

khali

Message:

Fix support of multiple chips. Regression in 3.1.2, faulty commit is
r5792. Fixes ticket #2377.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/sensord/rrd.c (modified) (5 diffs)

lm-sensors/trunk/CHANGES

@@ -4 +4 @@
 SVN HEAD
   libsensors: Increase MAX_SENSORS_PER_TYPE to 24
+  sensord: Fix support of multiple chips (#2377)
   sensors-detect: Give udev time to settle before accessing i2c nodes
                   Add support for Intel PCH (SMBus)

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

@@ -138 +138 @@
 }
 
+/* Returns the number of features processed, or -1 on error */
 static int _applyToFeatures(FeatureFN fn, void *data,
                             const sensors_chip_name *chip,
-                            const ChipDescriptor *desc)
+                            const ChipDescriptor *desc,
+                            int labelOffset)
 {
         int i;
@@ -148 +150 @@
         char *label;
 
-        for (i = 0; i < MAX_RRD_SENSORS && features[i].format; ++i) {
+        for (i = 0; labelOffset + i < MAX_RRD_SENSORS && features[i].format; ++i) {
                 feature = features + i;
                 rawLabel = feature->feature->name;
@@ -159 +161 @@
                 }
 
-                rrdCheckLabel(rawLabel, i);
-                fn(data, rrdLabels[i], label, feature);
+                rrdCheckLabel(rawLabel, labelOffset + i);
+                fn(data, rrdLabels[labelOffset + i], label, feature);
                 free(label);
         }
-        return 0;
+        return i;
 }
 
@@ -185 +187 @@
 static int applyToFeatures(FeatureFN fn, void *data)
 {
-        int i, i_detected, ret;
+        int i, i_detected, ret, labelOffset = 0;
         const sensors_chip_name *chip, *chip_arg;
         ChipDescriptor *desc;
@@ -198 +200 @@
                                 continue;
 
-                        ret = _applyToFeatures(fn, data, chip, desc);
-                        if (ret)
+                        ret = _applyToFeatures(fn, data, chip, desc, labelOffset);
+                        if (ret < 0)
                                 return ret;
+                        labelOffset += ret;
                 }
         }