Fetch the current power consumption

Author: BenBE

BatteryMeter.c

@@ -28,6 +28,7 @@ static void BatteryMeter_updateValues(Meter* this) {
    BatteryInfo info = {
       .ac = AC_ERROR,
       .percent = NAN,
+      .powerCurr = NAN,
       .energyCurr = NAN,
       .energyFull = NAN,
    };

BatteryMeter.h

@@ -22,6 +22,7 @@ typedef struct BatteryInfo_ {
    ACPresence ac;
 
    double percent;          /* [0..100], NAN if unknown */
+   double powerCurr;        /* instantaneous power in W, NAN if unknown */
    double energyCurr;       /* Wh, NAN if unknown */
    double energyFull;       /* Wh, NAN if unknown */
 } BatteryInfo;

darwin/Platform.c

@@ -679,6 +679,7 @@ void Platform_getBattery(BatteryInfo* info) {
    *info = (BatteryInfo) {
       .ac = AC_ERROR,
       .percent = NAN,
+      .powerCurr = NAN,
       .energyCurr = NAN,
       .energyFull = NAN,
    };

dragonflybsd/Platform.c

@@ -12,9 +12,13 @@ in the source distribution for its full text.
 
 #include <devstat.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <ifaddrs.h>
 #include <math.h>
 #include <time.h>
+#include <unistd.h>
+#include <dev/acpica/acpiio.h>
+#include <sys/ioctl.h>
 #include <sys/resource.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
@@ -368,6 +372,7 @@ void Platform_getBattery(BatteryInfo* info) {
    *info = (BatteryInfo) {
       .ac = AC_ERROR,
       .percent = NAN,
+      .powerCurr = NAN,
       .energyCurr = NAN,
       .energyFull = NAN,
    };
@@ -381,4 +386,59 @@ void Platform_getBattery(BatteryInfo* info) {
    size_t acline_len = sizeof(acline);
    if (sysctlbyname("hw.acpi.acline", &acline, &acline_len, NULL, 0) != -1)
       info->ac = (acline == 0) ? AC_ABSENT : AC_PRESENT;
+
+   int units = 0;
+   int fd = open("/dev/acpi", O_RDONLY | O_CLOEXEC);
+   if (fd == -1)
+      return;
+
+   if (ioctl(fd, ACPIIO_BATT_GET_UNITS, &units) == -1 || units <= 0) {
+      close(fd);
+      return;
+   }
+
+   double totalPower = 0.0;
+   bool hasPower = false;
+
+   for (int u = 0; u < units; u++) {
+      union acpi_battery_ioctl_arg bifArg = { .unit = u };
+      if (ioctl(fd, ACPIIO_BATT_GET_BIF, &bifArg) == -1)
+         continue;
+
+      union acpi_battery_ioctl_arg bstArg = { .unit = u };
+      if (ioctl(fd, ACPIIO_BATT_GET_BST, &bstArg) == -1)
+         continue;
+
+      const struct acpi_bif* bif = &bifArg.bif;
+      const struct acpi_bst* bst = &bstArg.bst;
+
+      if (bst->rate == ACPI_BATT_UNKNOWN)
+         continue;
+
+      double rate = NAN;
+
+      if (bif->units == ACPI_BIF_UNITS_MW) {
+         rate = bst->rate / 1000.0;
+      } else {
+         uint32_t voltMV = (bst->volt != ACPI_BATT_UNKNOWN) ? bst->volt : bif->dvol;
+
+         if (voltMV != ACPI_BATT_UNKNOWN && voltMV != 0)
+            rate = bst->rate * (double)voltMV / 1e6;
+      }
+
+      if (!isNonnegative(rate))
+         continue;
+
+      if ((bst->state & ACPI_BATT_STAT_DISCHARG) == 0 &&
+         (bst->state & ACPI_BATT_STAT_CHARGING) != 0)
+         rate = -rate;
+
+      totalPower += rate;
+      hasPower = true;
+   }
+
+   close(fd);
+
+   if (hasPower)
+      info->powerCurr = totalPower;
 }

freebsd/Platform.c

@@ -405,6 +405,7 @@ void Platform_getBattery(BatteryInfo* info) {
    *info = (BatteryInfo) {
       .ac = AC_ERROR,
       .percent = NAN,
+      .powerCurr = NAN,
       .energyCurr = NAN,
       .energyFull = NAN,
    };
@@ -430,6 +431,7 @@ void Platform_getBattery(BatteryInfo* info) {
 
    double totalRemain = 0.0;
    double totalFull = 0.0;
+   double totalPower = 0.0;
 
    for (int u = 0; u < units; u++) {
       union acpi_battery_ioctl_arg bixArg = { .unit = u };
@@ -466,6 +468,17 @@ void Platform_getBattery(BatteryInfo* info) {
          totalRemain += remain;
          totalFull   += full;
       }
+
+      if (bst->rate != ACPI_BATT_UNKNOWN && bst->rate > 0) {
+         if (bix->units == ACPI_BIX_UNITS_MW) {
+            totalPower += bst->rate / 1000.0;
+         } else {
+            uint32_t rateVoltMV = (bst->volt != ACPI_BATT_UNKNOWN) ? bst->volt : bix->dvol;
+
+            if (rateVoltMV != ACPI_BATT_UNKNOWN && rateVoltMV != 0)
+               totalPower += bst->rate * (double)rateVoltMV / 1e6;
+         }
+      }
    }
 
    close(fd);
@@ -474,4 +487,6 @@ void Platform_getBattery(BatteryInfo* info) {
       info->energyCurr = totalRemain;
       info->energyFull = totalFull;
    }
+   if (totalPower > 0.0)
+      info->powerCurr = totalPower;
 }

linux/Platform.c

@@ -166,6 +166,7 @@ static time_t Platform_Battery_cacheTime;
 static BatteryInfo Platform_Battery_cache = {
    .ac = AC_ERROR,
    .percent = NAN,
+   .powerCurr = NAN,
    .energyCurr = NAN,
    .energyFull = NAN,
 };
@@ -850,6 +851,7 @@ static void Platform_Battery_getProcData(BatteryInfo* info) {
 static void Platform_Battery_getSysData(BatteryInfo* info) {
    info->percent = NAN;
    info->ac = AC_ERROR;
+   info->powerCurr = NAN;
    info->energyCurr = NAN;
    info->energyFull = NAN;
 
@@ -859,6 +861,8 @@ static void Platform_Battery_getSysData(BatteryInfo* info) {
 
    uint64_t totalFull = 0;
    uint64_t totalRemain = 0;
+   int64_t totalPower = 0;
+   bool hasPower = false;
 
    const struct dirent* dirEntry;
    while ((dirEntry = readdir(dir))) {
@@ -937,6 +941,12 @@ static void Platform_Battery_getSysData(BatteryInfo* info) {
                   break;
                continue;
             }
+
+            if (String_eq(field, "POWER_NOW")) {
+               totalPower += val;
+               hasPower = true;
+               continue;
+            }
          }
 
          if (!now && full && isNonnegative(capacityLevel))
@@ -970,6 +980,8 @@ static void Platform_Battery_getSysData(BatteryInfo* info) {
       info->energyCurr = (double) totalRemain;
       info->energyFull = (double) totalFull;
    }
+   if (hasPower)
+      info->powerCurr = (double) totalPower;
 }
 
 void Platform_getBattery(BatteryInfo* info) {
@@ -983,6 +995,7 @@ void Platform_getBattery(BatteryInfo* info) {
    Platform_Battery_cache = (BatteryInfo) {
       .ac = AC_ERROR,
       .percent = NAN,
+      .powerCurr = NAN,
       .energyCurr = NAN,
       .energyFull = NAN,
    };

netbsd/Platform.c

@@ -457,6 +457,7 @@ void Platform_getBattery(BatteryInfo* info) {
    *info = (BatteryInfo) {
       .ac = AC_ERROR,
       .percent = NAN,
+      .powerCurr = NAN,
       .energyCurr = NAN,
       .energyFull = NAN,
    };

openbsd/Platform.c

@@ -384,6 +384,7 @@ void Platform_getBattery(BatteryInfo* info) {
    *info = (BatteryInfo) {
       .ac = AC_ERROR,
       .percent = NAN,
+      .powerCurr = NAN,
       .energyCurr = NAN,
       .energyFull = NAN,
    };
@@ -410,6 +411,20 @@ void Platform_getBattery(BatteryInfo* info) {
             info->energyFull = last_full_capacity;
          }
       }
+
+      mib[3] = SENSOR_INTEGER;
+      mib[4] = 0; /* "battery state" */
+      int64_t batteryState = 0;
+      if (sysctl(mib, 5, &s, &slen, NULL, 0) != -1)
+         batteryState = s.value;
+
+      mib[3] = SENSOR_WATTS;
+      mib[4] = 0; /* "rate" */
+      if (sysctl(mib, 5, &s, &slen, NULL, 0) != -1) {
+         info->powerCurr = (double)s.value / 1000000.0;
+         if (batteryState & 0x02)
+            info->powerCurr = -info->powerCurr;
+      }
    }
 
    found = findDevice("acpiac0", mib, &snsrdev, &sdlen);

pcp/Platform.c

@@ -853,6 +853,7 @@ void Platform_getBattery(BatteryInfo* info) {
    *info = (BatteryInfo) {
       .ac = AC_ERROR,
       .percent = NAN,
+      .powerCurr = NAN,
       .energyCurr = NAN,
       .energyFull = NAN,
    };

solaris/Platform.c

@@ -347,6 +347,7 @@ void Platform_getBattery(BatteryInfo* info) {
    *info = (BatteryInfo) {
       .ac = AC_ERROR,
       .percent = NAN,
+      .powerCurr = NAN,
       .energyCurr = NAN,
       .energyFull = NAN,
    };