Changeset 5183

Timestamp:

04/17/08 03:27:22 (7 months ago)

Author:

djwong

Message:

Subject: [PATCH 1/3 v3] libsensors: Support energy and power meters

Add power and sensor meters to libsensors, with minor tweaks and
documentation updates as suggested by Jean Delvare.

Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>

Files:

• lm-sensors/branches/lm-sensors-3.0.0/CHANGES (modified) (1 diff)
• lm-sensors/branches/lm-sensors-3.0.0/doc/libsensors-API.txt (modified) (1 diff)
• lm-sensors/branches/lm-sensors-3.0.0/lib/sensors.h (modified) (2 diffs)
• lm-sensors/branches/lm-sensors-3.0.0/lib/sysfs.c (modified) (9 diffs)

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -7 +7 @@
-              Late compute statements override early ones
-              Support virtual hwmon devices (#2309)
+              Support power and energy sensors
-  pwmconfig: Don't create the configuration file before it's needed
-             Don't preserve configuration file customizations

lm-sensors/branches/lm-sensors-3.0.0/doc/libsensors-API.txt

@@ -7 +7 @@
-given new feature.
-
+0x402   lm-sensors SVN
+* Added support for power and energy sensors
+SENSORS_FEATURE_POWER = 3
+SENSORS_FEATURE_ENERGY = 4
+SENSORS_SUBFEATURE_POWER_AVERAGE
+SENSORS_SUBFEATURE_POWER_AVERAGE_HIGHEST
+SENSORS_SUBFEATURE_POWER_AVERAGE_LOWEST
+SENSORS_SUBFEATURE_POWER_AVERAGE_INTERVAL
+SENSORS_SUBFEATURE_ENERGY_INPUT
+
-0x401   lm-sensors SVN
-* Added bus type "virtual":

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

@@ -133 +133 @@
-        SENSORS_FEATURE_FAN             = 0x01,
-        SENSORS_FEATURE_TEMP            = 0x02,
+        SENSORS_FEATURE_POWER           = 0x03,
+        SENSORS_FEATURE_ENERGY          = 0x04,
-        SENSORS_FEATURE_VID             = 0x10,
-        SENSORS_FEATURE_BEEP_ENABLE     = 0x18,
@@ -170 +172 @@
-        SENSORS_SUBFEATURE_TEMP_OFFSET,
-        SENSORS_SUBFEATURE_TEMP_BEEP,
+
+        SENSORS_SUBFEATURE_POWER_AVERAGE = SENSORS_FEATURE_POWER << 8,
+        SENSORS_SUBFEATURE_POWER_AVERAGE_HIGHEST,
+        SENSORS_SUBFEATURE_POWER_AVERAGE_LOWEST,
+
+        SENSORS_SUBFEATURE_POWER_AVERAGE_INTERVAL = (SENSORS_FEATURE_POWER << 8) | 0x80,
+
+        SENSORS_SUBFEATURE_ENERGY_INPUT = SENSORS_FEATURE_ENERGY << 8,
-
-        SENSORS_SUBFEATURE_VID = SENSORS_FEATURE_VID << 8,

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

@@ -139 +139 @@
-#define MAX_SENSORS_PER_TYPE    20
-#define MAX_SUBFEATURES         8
-
-
+
+
+
-#define ALL_POSSIBLE_SUBFEATURES \
-
-
+
+
+
-
-static
-int get_type_scaling(sensors_subfeature_type type)
-{
+        /* Multipliers for subfeatures */
-        switch (type & 0xFF80) {
-        case SENSORS_SUBFEATURE_IN_INPUT:
@@ -154 +157 @@
-        case SENSORS_SUBFEATURE_FAN_INPUT:
-                return 1;
-
-
+
+
+
+
+
+
+
-        switch (type) {
+        case SENSORS_SUBFEATURE_POWER_AVERAGE_INTERVAL:
-        case SENSORS_SUBFEATURE_VID:
-        case SENSORS_SUBFEATURE_TEMP_OFFSET:
@@ -174 +183 @@
-        case SENSORS_FEATURE_FAN:
-        case SENSORS_FEATURE_TEMP:
+        case SENSORS_FEATURE_POWER:
+        case SENSORS_FEATURE_ENERGY:
-                underscore = strchr(sfname, '_');
-                name = strndup(sfname, underscore - sfname);
@@ -233 +244 @@
-};
-
+static const struct subfeature_type_match power_matches[] = {
+        { "average", SENSORS_SUBFEATURE_POWER_AVERAGE },
+        { "average_highest", SENSORS_SUBFEATURE_POWER_AVERAGE_HIGHEST },
+        { "average_lowest", SENSORS_SUBFEATURE_POWER_AVERAGE_LOWEST },
+        { "average_interval", SENSORS_SUBFEATURE_POWER_AVERAGE_INTERVAL },
+        { NULL, 0 }
+};
+
+static const struct subfeature_type_match energy_matches[] = {
+        { "input", SENSORS_SUBFEATURE_ENERGY_INPUT },
+        { NULL, 0 }
+};
+
-static const struct subfeature_type_match cpu_matches[] = {
-        { "vid", SENSORS_SUBFEATURE_VID },
@@ -243 +267 @@
-        { "fan%d%c", fan_matches },
-        { "cpu%d%c", cpu_matches },
+        { "power%d%c", power_matches },
+        { "energy%d%c", energy_matches },
-};
-
@@ -328 +354 @@
-                /* Adjust the channel number */
-                switch (sftype & 0xFF00) {
-
-
-
-
+
+
+
+
+
+
-                }
-
@@ -348 +376 @@
-                switch (sftype) {
-                case SENSORS_SUBFEATURE_VID:
-
+
+
-                        break;
-                case SENSORS_SUBFEATURE_BEEP_ENABLE:
- 6 +
-
+
+_TYPES * 2 + MAX_SENSOR
-                        break;
-                default:
@@ -390 +419 @@
-                        continue;
-
-
+
+
-                    i / (MAX_SUBFEATURES * 2) != prev_slot) {
-                        fnum++;
@@ -411 +441 @@
-
-                /* New main feature? */
-
+
+
-                    i / (MAX_SUBFEATURES * 2) != prev_slot) {
-                        ftype = all_subfeatures[i].type >> 8;