Changeset 5184

Timestamp:

04/17/08 03:28:51 (7 months ago)

Author:

djwong

Message:

Subject: [PATCH 3/4 v2] sensors: Print energy and power meters

Display power and energy meters in sensors.

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/prog/sensors/chips.c (modified) (2 diffs)

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

@@ -3 +3 @@
-
-SVN-HEAD
+  sensors: Print energy and power sensors
-  libsensors: Use __func__ instead of __FUNCTION__
-              Parse the configuration file in C locale

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/chips.c

@@ -402 +402 @@
-}
-
+static void print_chip_power(const sensors_chip_name *name,
+                             const sensors_feature *feature,
+                             int label_size)
+{
+        int need_space = 0;
+        const sensors_subfeature *sf, *sfmin, *sfmax, *sfint;
+        char *label;
+
+        if (!(label = sensors_get_label(name, feature))) {
+                fprintf(stderr, "ERROR: Can't get label of feature %s!\n",
+                        feature->name);
+                return;
+        }
+        print_label(label, label_size);
+        free(label);
+
+        sf = sensors_get_subfeature(name, feature,
+                                    SENSORS_SUBFEATURE_POWER_AVERAGE);
+        if (sf)
+                printf("%6.2f W", get_value(name, sf));
+        else
+                printf("     N/A");
+
+        sfmin = sensors_get_subfeature(name, feature,
+                                      SENSORS_SUBFEATURE_POWER_AVERAGE_HIGHEST);
+        sfmax = sensors_get_subfeature(name, feature,
+                                       SENSORS_SUBFEATURE_POWER_AVERAGE_LOWEST);
+        sfint = sensors_get_subfeature(name, feature,
+                                     SENSORS_SUBFEATURE_POWER_AVERAGE_INTERVAL);
+        if (sfmin || sfmax || sfint) {
+                printf("  (");
+
+                if (sfmin) {
+                        printf("min = %6.2f W", get_value(name, sfmin));
+                        need_space = 1;
+                }
+
+                if (sfmax) {
+                        printf("%smax = %6.2f W", (need_space ? ", " : ""),
+                               get_value(name, sfmax));
+                        need_space = 1;
+                }
+
+                if (sfint) {
+                        printf("%sinterval = %6.2f s", (need_space ? ", " : ""),
+                               get_value(name, sfint));
+                        need_space = 1;
+                }
+                printf(")");
+        }
+
+        printf("\n");
+}
+
+static void print_chip_energy(const sensors_chip_name *name,
+                              const sensors_feature *feature,
+                              int label_size)
+{
+        const sensors_subfeature *sf;
+        char *label;
+
+        if (!(label = sensors_get_label(name, feature))) {
+                fprintf(stderr, "ERROR: Can't get label of feature %s!\n",
+                        feature->name);
+                return;
+        }
+        print_label(label, label_size);
+        free(label);
+
+        sf = sensors_get_subfeature(name, feature,
+                                    SENSORS_SUBFEATURE_ENERGY_INPUT);
+        if (sf)
+                printf("%6.2f J", get_value(name, sf));
+        else
+                printf("     N/A");
+
+        printf("\n");
+}
+
-static void print_chip_vid(const sensors_chip_name *name,
-                           const sensors_feature *feature,
@@ -469 +548 @@
-                        print_chip_beep_enable(name, feature, label_size);
-                        break;
+                case SENSORS_FEATURE_POWER:
+                        print_chip_power(name, feature, label_size);
+                        break;
+                case SENSORS_FEATURE_ENERGY:
+                        print_chip_energy(name, feature, label_size);
+                        break;
-                default:
-                        continue;