Changeset 4510

Timestamp:

06/28/07 16:39:34 (6 years ago)

Author:

khali

Message:

With the new dynamic chip features enumeration code, the sensors_proc_chips
and sensors_chip_features_list arrays tend to track the same information.
So it's much more simple, and more efficient, to have a single array. I
decided to keep sensors_proc_chips, because it already has memory management
helpers. One nice side effect is that the arbitrary limit to the number of
supported chips is now gone. Another one is that some of the memory leaks
were fixed.

Location:

lm-sensors/branches/lm-sensors-3.0.0/lib

Files:

• access.c (modified) (4 diffs)
• data.c (modified) (2 diffs)
• data.h (modified) (3 diffs)
• init.c (modified) (3 diffs)
• sysfs.c (modified) (7 diffs)

lm-sensors/branches/lm-sensors-3.0.0/lib/access.c

@@ -106 +106 @@
         const sensors_chip_feature *features;
 
-        for (i = 0; sensors_chip_features_list[i].chip.prefix; i++)
-                if (sensors_match_chip(sensors_chip_features_list[i].chip, *chip)) {
-                        features = sensors_chip_features_list[i].feature;
+        for (i = 0; i < sensors_proc_chips_count; i++)
+                if (sensors_match_chip(sensors_proc_chips[i].chip, *chip)) {
+                        features = sensors_proc_chips[i].feature;
                         for (j = 0; features[j].data.name; j++)
                                 if (features[j].data.number == feature)
@@ -125 +125 @@
         const sensors_chip_feature *features;
 
-        for (i = 0; sensors_chip_features_list[i].chip.prefix; i++)
-                if (sensors_match_chip(sensors_chip_features_list[i].chip, *chip)) {
-                        features = sensors_chip_features_list[i].feature;
+        for (i = 0; i < sensors_proc_chips_count; i++)
+                if (sensors_match_chip(sensors_proc_chips[i].chip, *chip)) {
+                        features = sensors_proc_chips[i].feature;
                         for (j = 0; features[j].data.name; j++)
                                 if (!strcasecmp(features[j].data.name, feature))
@@ -305 +305 @@
         const sensors_chip_name *res;
         res = (*nr >= sensors_proc_chips_count ?
-                        NULL : &sensors_proc_chips[*nr]);
+                        NULL : &sensors_proc_chips[*nr].chip);
         (*nr)++;
         return res;
@@ -333 +333 @@
         int i;
 
-        for (i = 0; sensors_chip_features_list[i].chip.prefix; i++)
-                if (sensors_match_chip(sensors_chip_features_list[i].chip, name)) {
-                        feature_list = sensors_chip_features_list[i].feature;
+        for (i = 0; i < sensors_proc_chips_count; i++)
+                if (sensors_match_chip(sensors_proc_chips[i].chip, name)) {
+                        feature_list = sensors_proc_chips[i].feature;
                         if (!*nr1 && !*nr2) {   /* Return the first entry */
                                 if (!feature_list[0].data.name) /* The list may be empty */

lm-sensors/branches/lm-sensors-3.0.0/lib/data.c

@@ -37 +37 @@
 int sensors_config_busses_max = 0;
 
-sensors_chip_name *sensors_proc_chips = NULL;
+sensors_chip_features *sensors_proc_chips = NULL;
 int sensors_proc_chips_count = 0;
 int sensors_proc_chips_max = 0;
@@ -44 +44 @@
 int sensors_proc_bus_count = 0;
 int sensors_proc_bus_max = 0;
-
-#define PLACEHOLDER_ELEMENTS {{0}}, {{0}}, {{0}}, {{0}}, {{0}}, {{0}}, {{0}}, {{0}}, {{0}}, {{0}}
-
-sensors_chip_features sensors_chip_features_list[] = {
-  PLACEHOLDER_ELEMENTS,
-  { { 0 } }
-};
 
 static int sensors_substitute_chip(sensors_chip_name *name,int lineno);

lm-sensors/branches/lm-sensors-3.0.0/lib/data.h

@@ -160 +160 @@
 extern int sensors_config_busses_max;
 
-extern sensors_chip_name *sensors_proc_chips;
+extern sensors_chip_features *sensors_proc_chips;
 extern int sensors_proc_chips_count;
 extern int sensors_proc_chips_max;
@@ -166 +166 @@
 #define sensors_add_proc_chips(el) sensors_add_array_el( \
         (el), &sensors_proc_chips, &sensors_proc_chips_count,\
-        &sensors_proc_chips_max, sizeof(struct sensors_chip_name))
+        &sensors_proc_chips_max, sizeof(struct sensors_chip_features))
 
 extern sensors_bus *sensors_proc_bus;
@@ -176 +176 @@
         &sensors_proc_bus_max, sizeof(struct sensors_bus))
 
-extern sensors_chip_features sensors_chip_features_list[];
-
-/* this should match the total number of elements in PLACEHOLDER_ELEMENTS */
-#define N_PLACEHOLDER_ELEMENTS 10
-
 #endif /* def LIB_SENSORS_DATA_H */

lm-sensors/branches/lm-sensors-3.0.0/lib/init.c

@@ -29 +29 @@
 
 static void free_chip_name(sensors_chip_name name);
+static void free_chip_features(sensors_chip_feature *features);
 static void free_bus(sensors_bus bus);
 static void free_chip(sensors_chip chip);
@@ -60 +61 @@
   sensors_scanner_exit();
 
-  for (i = 0; i < sensors_proc_chips_count; i++)
-    free_chip_name(sensors_proc_chips[i]);
+  for (i = 0; i < sensors_proc_chips_count; i++) {
+    free_chip_name(sensors_proc_chips[i].chip);
+    free_chip_features(sensors_proc_chips[i].feature);
+  }
   free(sensors_proc_chips);
   sensors_proc_chips = NULL;
@@ -89 +92 @@
   free(name.prefix);
   free(name.busname);
+}
+
+void free_chip_features(sensors_chip_feature *features)
+{
+  int i;
+
+  for (i = 0; features[i].data.name; i++)
+    free(features[i].data.name);
+  free(features);
 }
 

lm-sensors/branches/lm-sensors-3.0.0/lib/sysfs.c

@@ -62 +62 @@
 }
 
-static 
-sensors_chip_features sensors_read_dynamic_chip(struct sysfs_device *sysdir)
+static int sensors_read_dynamic_chip(sensors_chip_features *chip,
+                                     struct sysfs_device *sysdir)
 {
         int i, type, fnum = 1;
         struct sysfs_attribute *attr;
         struct dlist *attrs;
-        sensors_chip_features ret = {{0}, 0};
         /* room for all 3  (in, fan, temp) types, with all their subfeatures
            + misc features. We use a large sparse table at first to store all
@@ -82 +81 @@
         
         if (attrs == NULL)
-                return ret;
+                return -ENOENT;
                 
         memset(features, 0, sizeof(features));
@@ -91 +90 @@
                 
                 if (!strcmp(name, "name")) {
-                        ret.chip.prefix = strndup(attr->value, strlen(attr->value) - 1);
+                        /* Already done */
                         continue;
                 } 
@@ -193 +192 @@
         }
         
-        ret.feature = dyn_features;
-        
-        return ret;
+        chip->feature = dyn_features;
+        
+        return 0;
 }
 
@@ -216 +215 @@
 static int sensors_read_one_sysfs_chip(struct sysfs_device *dev)
 {
-        static int total_dynamic = 0;
-        int domain, bus, slot, fn, i;
+        int domain, bus, slot, fn;
         struct sysfs_attribute *attr, *bus_attr;
         char bus_path[SYSFS_PATH_MAX];
-        sensors_chip_name name;
+        sensors_chip_features entry;
 
         /* ignore any device without name attribute */
@@ -232 +230 @@
 
         /* NB: attr->value[attr->len-1] == '\n'; chop that off */
-        name.prefix = strndup(attr->value, attr->len - 1);
-        if (!name.prefix)
+        entry.chip.prefix = strndup(attr->value, attr->len - 1);
+        if (!entry.chip.prefix)
                 sensors_fatal_error(__FUNCTION__, "out of memory");
 
-        name.busname = strdup(dev->path);
-        if (!name.busname)
+        entry.chip.busname = strdup(dev->path);
+        if (!entry.chip.busname)
                 sensors_fatal_error(__FUNCTION__, "out of memory");
 
-        if (sscanf(dev->name, "%d-%x", &name.bus, &name.addr) == 2) {
+        if (sscanf(dev->name, "%d-%x", &entry.chip.bus, &entry.chip.addr) == 2) {
                 /* find out if legacy ISA or not */
-                if (name.bus == 9191)
-                        name.bus = SENSORS_CHIP_NAME_BUS_ISA;
+                if (entry.chip.bus == 9191)
+                        entry.chip.bus = SENSORS_CHIP_NAME_BUS_ISA;
                 else {
                         snprintf(bus_path, sizeof(bus_path),
                                 "%s/class/i2c-adapter/i2c-%d/device/name",
-                                sensors_sysfs_mount, name.bus);
+                                sensors_sysfs_mount, entry.chip.bus);
 
                         if ((bus_attr = sysfs_open_attribute(bus_path))) {
@@ -255 +253 @@
                                 if (bus_attr->value
                                  && !strncmp(bus_attr->value, "ISA ", 4))
-                                        name.bus = SENSORS_CHIP_NAME_BUS_ISA;
+                                        entry.chip.bus = SENSORS_CHIP_NAME_BUS_ISA;
 
                                 sysfs_close_attribute(bus_attr);
                         }
                 }
-        } else if (sscanf(dev->name, "%*[a-z0-9_].%d", &name.addr) == 1) {
+        } else if (sscanf(dev->name, "%*[a-z0-9_].%d", &entry.chip.addr) == 1) {
                 /* must be new ISA (platform driver) */
-                name.bus = SENSORS_CHIP_NAME_BUS_ISA;
+                entry.chip.bus = SENSORS_CHIP_NAME_BUS_ISA;
         } else if (sscanf(dev->name, "%x:%x:%x.%x", &domain, &bus, &slot, &fn) == 4) {
                 /* PCI */
-                name.addr = (domain << 16) + (bus << 8) + (slot << 3) + fn;
-                name.bus = SENSORS_CHIP_NAME_BUS_PCI;
+                entry.chip.addr = (domain << 16) + (bus << 8) + (slot << 3) + fn;
+                entry.chip.bus = SENSORS_CHIP_NAME_BUS_PCI;
         } else
                 return -SENSORS_ERR_PARSE;
         
-        if (total_dynamic < N_PLACEHOLDER_ELEMENTS) {
-                sensors_chip_features n_entry = sensors_read_dynamic_chip(dev);
-                n_entry.chip.addr = name.addr;
-                n_entry.chip.bus = name.bus;
-
-                /* skip to end of list */
-                for(i = 0; sensors_chip_features_list[i].chip.prefix; i++);
-
-                sensors_chip_features_list[i] = n_entry;        
-
-                total_dynamic++;
-        }
-                
-        sensors_add_proc_chips(&name);
+        if (sensors_read_dynamic_chip(&entry, dev) < 0)
+                return -SENSORS_ERR_PARSE;
+        sensors_add_proc_chips(&entry);
 
         return 0;