Changeset 4828 for lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sense.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/sense.c (modified) (1 diff)

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

@@ -169 +169 @@
     ret = setChip (chip);
   } else {
-    ChipDescriptor *descriptor;
-    descriptor = generateChipDescriptor (chip);
-    if (descriptor) {
-      ret = doKnownChip (chip, descriptor, action);
-      free (descriptor->features);
-      free (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)
+      ret = doKnownChip (chip, &knownChips[chipindex], action);
   }
   return ret;