Changeset 4758

Timestamp:

09/05/07 10:17:22 (6 years ago)

Author:

khali

Message:

The compute mapping value is either SENSORS_NO_MAPPING or the same
feature number as the logical mapping. This means that the compute
mapping can be turned into a simple boolean flag. Doing so makes
struct sensors_feature_data smaller, which saves some memory (about
17 kB in my tests.)

Location:

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

Files:

• access.c (modified) (3 diffs)
• data.h (modified) (1 diff)
• libsensors.3 (modified) (2 diffs)
• sensors.h (modified) (3 diffs)
• sysfs.c (modified) (1 diff)

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

@@ -191 +191 @@
 /* Looks up whether a feature should be ignored. Returns
    1 if it should be ignored, 0 if not. This function takes
-   logical mappings into account. */
+   mappings into account. */
 static int sensors_get_ignored(const sensors_chip_name *name,
                                const sensors_chip_feature *feature)
@@ -233 +233 @@
                 return -SENSORS_ERR_NO_ENTRY;
 
-        if (main_feature->data.compute_mapping == SENSORS_NO_MAPPING)
+        if (main_feature->data.flags & SENSORS_COMPUTE_MAPPING)
+                alt_feature = sensors_lookup_feature_nr(name,
+                                        main_feature->data.mapping);
+        else
                 alt_feature = NULL;
-        else
-                alt_feature = sensors_lookup_feature_nr(name,
-                                        main_feature->data.compute_mapping);
 
         if (!(main_feature->data.flags & SENSORS_MODE_R))
@@ -280 +280 @@
                 return -SENSORS_ERR_NO_ENTRY;
 
-        if (main_feature->data.compute_mapping == SENSORS_NO_MAPPING)
+        if (main_feature->data.flags & SENSORS_COMPUTE_MAPPING)
+                alt_feature = sensors_lookup_feature_nr(name,
+                                        main_feature->data.mapping);
+        else
                 alt_feature = NULL;
-        else
-                alt_feature = sensors_lookup_feature_nr(name,
-                                        main_feature->data.compute_mapping);
 
         if (!(main_feature->data.flags & SENSORS_MODE_W))

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

@@ -126 +126 @@
    number is the internal feature number, used in many functions to refer
      to this feature
-   logical_mapping is either SENSORS_NO_MAPPING if this is feature is the
+   mapping is either SENSORS_NO_MAPPING if this is feature is the
      main element of category; or it is the number of a feature with which
      this feature is logically grouped (a group could be fan, fan_max and
      fan_div)
-   compute_mapping is like logical_mapping, only it refers to another
-     feature whose compute line will be inherited (a group could be fan and
-     fan_max, but not fan_div)
-   flags is a bitfield, its value is a combination of SENSORS_MODE_R (readable)
-     and SENSORS_MODE_W (writable).
+   flags is a bitfield, its value is a combination of SENSORS_MODE_R (readable),
+     SENSORS_MODE_W (writable) and SENSORS_COMPUTE_MAPPING (affected by the
+     computation rules of the main feature).
    scaling is the number of decimal points to scale by.
      Divide the read value by 10**scaling to get the real value. */

lm-sensors/branches/lm-sensors-3.0.0/lib/libsensors.3

@@ -114 +114 @@
   int mapping;
 .br
-  int compute_mapping;
-.br
   unsigned int flags;
 .br
@@ -121 +119 @@
 .br
 The flags field is a bitfield, its value is a combination of
-SENSORS_MODE_R (readable) and SENSORS_MODE_W (writable).
+SENSORS_MODE_R (readable), SENSORS_MODE_W (writable) and SENSORS_COMPUTE_MAPPING
+(affected by the computation rules of the main feature).
 
 \fBconst sensors_feature_data *sensors_get_all_features

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

@@ -114 +114 @@
 
 /* These defines are used in the flags field of sensors_feature_data */
-#define SENSORS_MODE_R 1
-#define SENSORS_MODE_W 2
+#define SENSORS_MODE_R                  1
+#define SENSORS_MODE_W                  2
+#define SENSORS_COMPUTE_MAPPING         4
 
 /* This define is used in the mapping field of sensors_feature_data if no
@@ -123 +124 @@
 /* This enum contains some "magic" used by sensors_read_dynamic_chip() from
    lib/sysfs.c. All the sensor types (in, fan, temp, vid) are a multiple of
-   0x100 apart, and sensor features which should not have a compute_mapping to
+   0x100 apart, and sensor features which should not have a compute mapping to
    the _input feature start at 0x?10. */
 typedef enum sensors_feature_type {
@@ -164 +165 @@
         sensors_feature_type type;
         int mapping;
-        int compute_mapping;
         unsigned int flags;
 } sensors_feature_data;

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

@@ -143 +143 @@
                         /* main feature */
                         feature.data.mapping = SENSORS_NO_MAPPING;
-                        feature.data.compute_mapping = SENSORS_NO_MAPPING;
-                } else if (type & 0x10) {
-                        /* sub feature without compute mapping */
+                } else {
+                        /* sub feature */
                         feature.data.mapping = i - i % MAX_SUB_FEATURES;
-                        feature.data.compute_mapping = SENSORS_NO_MAPPING;
-                } else {
-                        feature.data.mapping = i - i % MAX_SUB_FEATURES;
-                        feature.data.compute_mapping = feature.data.mapping;
+                        if (!(type & 0x10))
+                                feature.data.flags |= SENSORS_COMPUTE_MAPPING;
                 }