Changeset 4828 for lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/rrd.c

Timestamp:

09/21/07 14:15:18 (6 years ago)

Author:

khali

Message:

Scan chip features only once at initialization time, rather than on
each update. The chip list and chip features do not change until
sensors_cleanup() is called, so there's no point in doing the
same work over and over again.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/rrd.c (modified) (2 diffs)

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/rrd.c

@@ -142 +142 @@
   for (j = 0; (ret == 0) && (j < numChipNames); ++ j) {
     while ((ret == 0) && ((chip = sensors_get_detected_chips (&chipNames[j], &i)) != NULL)) {
-      ChipDescriptor *descriptor;
-      descriptor = generateChipDescriptor (chip);
-      if (descriptor) {
+      int index0, chipindex = -1;
+      for (index0 = 0; knownChips[index0].features; ++ index0)
+        /* Trick: we compare addresses here. We know it works because both
+           pointers were returned by sensors_get_detected_chips(), so they
+           refer to libsensors internal structures, which do not move. */
+        if (knownChips[index0].name == chip) {
+          chipindex = index0;
+          break;
+        }
+      if (chipindex >= 0) {
+        const ChipDescriptor *descriptor = &knownChips[chipindex];
         const FeatureDescriptor *features = descriptor->features;
-        int index0;
 
         for (index0 = 0; (ret == 0) && (num < MAX_RRD_SENSORS) && features[index0].format; ++ index0) {
@@ -168 +175 @@
             free (label);
         }
-        free (descriptor->features);
-        free (descriptor);
       }
     }