[PATCH v6 0/5] MR8460: ntdll: Add support for multi-battery systems and energy-reporting batteries on Linux
Current implementation of system.fill_battery_state only reads "charge\__" and "current\__" attributes. Some batteries expose different attributes, namely "power\__" and "energy\__". Added the required logic to support both types. Further, when rewriting the function I also added support for systems with multiple batteries. Windows documentation was not clear but from what I gathered struct SYSTEM_BATTERY_STATE sets Charging and Discharging if ANY battery is charging/discharging. So, to check if the overall system is charging/discharging only Rate can be used. Also cleaned the code related to "AC". There was a "fixme" there which I didn't fully undertand as SYSTEM_BATTERY_STATE.AcOnLine == True if any AC is present, so the proper logic was already implemented -- v6: ntdll: improve readibility of linux_battery capacity units https://gitlab.winehq.org/wine/wine/-/merge_requests/8460
From: Tomas Mendes <rtdiasmendes(a)gmail.com> --- dlls/ntdll/tests/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index ee48a330400..21c7ec1f18d 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1654,7 +1654,7 @@ static void test_query_battery(void) if (!bs.BatteryPresent) time_left = 0; - else if (!bs.Charging && (LONG)bs.Rate < 0) + else if ((LONG)bs.Rate < 0) time_left = 3600 * bs.RemainingCapacity / -(LONG)bs.Rate; else time_left = ~0u; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8460
From: Tomas Mendes <rtdiasmendes(a)gmail.com> --- dlls/ntdll/tests/info.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 21c7ec1f18d..b9a8c534f80 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1652,9 +1652,7 @@ static void test_query_battery(void) "expected MaxCapacity %lu to be greater than or equal to RemainingCapacity %lu\n", bs.MaxCapacity, bs.RemainingCapacity); - if (!bs.BatteryPresent) - time_left = 0; - else if ((LONG)bs.Rate < 0) + if ((LONG)bs.Rate < 0) time_left = 3600 * bs.RemainingCapacity / -(LONG)bs.Rate; else time_left = ~0u; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8460
From: Tomas Mendes <rtdiasmendes(a)gmail.com> --- dlls/ntdll/unix/system.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 950a9655dc7..c0f90d4df1a 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -223,6 +223,34 @@ struct smbios_wine_core_id_regs_arm64 } regs[]; }; +enum battery_status { + BATTERY_UNKNOWN, + BATTERY_CHARGING, + BATTERY_DISCHARGING, + BATTERY_NOT_CHARGING, + BATTERY_FULL +}; + +enum battery_power_unit { + BATTERY_UNIT_UNKNOWN, + BATTERY_UNIT_ENERGY, + BATTERY_UNIT_CHARGE +}; + +struct linux_battery +{ + enum battery_status status; + unsigned int present; + enum battery_power_unit power_unit; + int full_charge_capacity; + int capacity_now; + int rate_now; + int voltage_now; + int alarm; + int capacity_alert_min; + int capacity_alert_max; +}; + #pragma pack(pop) enum smbios_type -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8460
From: Tomas Mendes <rtdiasmendes(a)gmail.com> --- dlls/kernel32/powermgnt.c | 4 +- dlls/ntdll/unix/system.c | 143 ++++++++++++++++++++++++++++++-------- 2 files changed, 117 insertions(+), 30 deletions(-) diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index c4bd97553fe..23c55b1cd83 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -65,11 +65,11 @@ BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS ps) { ps->BatteryLifePercent = bs.MaxCapacity ? 100 * bs.RemainingCapacity / bs.MaxCapacity : 100; ps->BatteryLifeTime = bs.EstimatedTime; - if (!bs.Charging && (LONG)bs.Rate < 0) + if ((LONG)bs.Rate < 0) ps->BatteryFullLifeTime = 3600 * bs.MaxCapacity / -(LONG)bs.Rate; ps->BatteryFlag = 0; - if (bs.Charging) + if (bs.Rate > 0) ps->BatteryFlag |= BATTERY_FLAG_CHARGING; if (ps->BatteryLifePercent > 66) ps->BatteryFlag |= BATTERY_FLAG_HIGH; diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index c0f90d4df1a..be128c06cf9 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -4030,17 +4030,68 @@ static int get_sys_int(const char *dirname, const char *basename) return get_sys_str(dirname, basename, s) ? atoi(s) : 0; } +static enum battery_status parse_battery_status(const char *s) +{ + if (strcmp(s, "Charging\n") == 0) return BATTERY_CHARGING; + if (strcmp(s, "Discharging\n") == 0) return BATTERY_DISCHARGING; + if (strcmp(s, "Not charging\n") == 0) return BATTERY_NOT_CHARGING; + if (strcmp(s, "Full\n") == 0) return BATTERY_FULL; + return BATTERY_UNKNOWN; +} + +static void get_sys_bat(const char *path, struct linux_battery *bat) +{ + char s[16]; + + bat->present = get_sys_int(path, "present"); + if (!bat->present) return; + + get_sys_str(path, "status", s); + bat->status = parse_battery_status(s); + + bat->full_charge_capacity = get_sys_int(path, "energy_full"); + bat->capacity_now = get_sys_int(path, "energy_now"); + bat->rate_now = get_sys_int(path, "power_now"); + bat->power_unit = BATTERY_UNIT_ENERGY; + + if (!bat->full_charge_capacity || !bat->capacity_now) + { + bat->full_charge_capacity = get_sys_int(path, "charge_full"); + bat->capacity_now = get_sys_int(path, "charge_now"); + bat->voltage_now = get_sys_int(path, "voltage_now"); + bat->rate_now = get_sys_int(path, "current_now"); + bat->power_unit = BATTERY_UNIT_CHARGE; + if (!bat->full_charge_capacity || !bat->capacity_now || !bat->voltage_now) + bat->power_unit = BATTERY_UNIT_UNKNOWN; + } + + bat->alarm = get_sys_int(path, "alarm"); + if(bat->alarm) return; + + bat->capacity_alert_min = get_sys_int(path, "capacity_alert_min"); + bat->capacity_alert_max = get_sys_int(path, "capacity_alert_max"); +} + static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) { DIR *d = opendir("/sys/class/power_supply"); struct dirent *de; char s[16], path[64]; - BOOL found_ac = FALSE; - LONG64 voltage; /* microvolts */ + struct linux_battery bat = {0}; - bs->AcOnLine = TRUE; if (!d) return STATUS_SUCCESS; + bs->BatteryPresent = FALSE; + bs->AcOnLine = FALSE; + bs->Charging = FALSE; + bs->Discharging = FALSE; + bs->MaxCapacity = 0u; + bs->RemainingCapacity = 0u; + bs->Rate = 0u; + bs->EstimatedTime = ~0u; + bs->DefaultAlert1 = 0u; + bs->DefaultAlert2 = 0u; + while ((de = readdir(d))) { if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0) continue; @@ -4048,44 +4099,80 @@ static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) if (get_sys_str(path, "scope", s) && strcmp(s, "Device\n") == 0) continue; if (!get_sys_str(path, "type", s)) continue; - if (strcmp(s, "Mains\n") == 0) + if (!strcmp(s, "Mains\n") && + !bs->AcOnLine && + get_sys_int(path, "online")) { - if (!get_sys_str(path, "online", s)) continue; - if (found_ac) + bs->AcOnLine = TRUE; + } + else if (!strcmp(s, "Battery\n")) + { + get_sys_bat(path, &bat); + + if (!bat.present) continue; + + if (!bs->BatteryPresent) bs->BatteryPresent = TRUE; + + if (bat.status == BATTERY_CHARGING && !bs->Charging) bs->Charging = TRUE; + if (bat.status == BATTERY_DISCHARGING && !bs->Discharging) bs->Discharging = TRUE; + + /* Windows's SYSTEM_BATTERY_STATE expects MaxCapacity, RemainingCapacity + and DefaultAlert* in mWh; and Rate in mW + Linux provides either energy_* (µWh) and power_* (µW) -> Simple convertion + Or charge_* (µAh) and current_* (µA) -> Needs voltage (µV) to calculate values + + Formulas used: + µWh / 1e3 = mWh + µW / 1e3 = mW + µAh * µV / 1e9 = pWh / 1e9 = mWh + µA * µV / 1e9 = pW / 1e9 = mW */ + switch (bat.power_unit) { - FIXME("Multiple mains found, only reporting on the first\n"); + case BATTERY_UNIT_UNKNOWN: + continue; + case BATTERY_UNIT_ENERGY: + bs->MaxCapacity += (ULONG)(bat.full_charge_capacity / 1e3); + bs->RemainingCapacity += (ULONG)(bat.capacity_now / 1e3); + if (bat.status == BATTERY_CHARGING) bs->Rate += (ULONG)(bat.rate_now / 1e3); + if (bat.status == BATTERY_DISCHARGING) bs->Rate -= (ULONG)(bat.rate_now / 1e3); + break; + case BATTERY_UNIT_CHARGE: + bs->MaxCapacity += (ULONG)(bat.full_charge_capacity * bat.voltage_now / 1e9); + bs->RemainingCapacity += (ULONG)(bat.capacity_now * bat.voltage_now / 1e9); + if (bat.status == BATTERY_UNKNOWN || !bat.rate_now) continue; + if (bat.status == BATTERY_DISCHARGING && bat.rate_now > 0) + bs->Rate -= (ULONG)(bat.rate_now * bat.voltage_now / 1e9); + else + bs->Rate += (ULONG)(bat.rate_now * bat.voltage_now / 1e9); + break; } - else + + /* Linux batteries expose either: + alarm (µWh) for low battery warning and no values for critical warning; + capacity_alert_min and capacity_alert_max (integer percenteges) for low and critical warnings, respectively; + If none provided, use windows defaults -> critical 5%, low 33% */ + if(bat.alarm) { - bs->AcOnLine = atoi(s); - found_ac = TRUE; + bs->DefaultAlert1 = bs->MaxCapacity / 20; + bs->DefaultAlert2 = (ULONG)(bat.alarm); } - } - else if (strcmp(s, "Battery\n") == 0) - { - if (!get_sys_str(path, "status", s)) continue; - if (bs->BatteryPresent) + else if(bat.capacity_alert_min && bat.capacity_alert_max) { - FIXME("Multiple batteries found, only reporting on the first\n"); + bs->DefaultAlert1 = bs->MaxCapacity * bat.capacity_alert_min / 100; + bs->DefaultAlert2 = bs->MaxCapacity * bat.capacity_alert_max / 100; } else { - bs->Charging = (strcmp(s, "Charging\n") == 0); - bs->Discharging = (strcmp(s, "Discharging\n") == 0); - bs->BatteryPresent = TRUE; - voltage = get_sys_int(path, "voltage_now"); - bs->MaxCapacity = get_sys_int(path, "charge_full") * voltage / 1e9; - bs->RemainingCapacity = get_sys_int(path, "charge_now") * voltage / 1e9; - bs->Rate = -get_sys_int(path, "current_now") * voltage / 1e9; - if (!bs->Charging && (LONG)bs->Rate < 0) - bs->EstimatedTime = 3600 * bs->RemainingCapacity / -(LONG)bs->Rate; - else - bs->EstimatedTime = ~0u; + bs->DefaultAlert1 = bs->MaxCapacity / 20; + bs->DefaultAlert2 = bs->MaxCapacity / 3; } } } - closedir(d); + + if (bs->BatteryPresent && (LONG)bs->Rate < 0) + bs->EstimatedTime = 3600 * bs->RemainingCapacity / -bs->Rate; + return STATUS_SUCCESS; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8460
From: Tomas Mendes <rtdiasmendes(a)gmail.com> --- dlls/ntdll/unix/system.c | 55 ++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index be128c06cf9..3f4cc6f7445 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -242,9 +242,19 @@ struct linux_battery enum battery_status status; unsigned int present; enum battery_power_unit power_unit; - int full_charge_capacity; - int capacity_now; - int rate_now; + union { + struct { + int energy_full_uwh; + int energy_now_uwh; + int power_now_uw; + } energy; + struct { + int charge_full_uah; + int charge_now_uah; + int current_now_ua; + } charge; + } capacity; + int voltage_now; int alarm; int capacity_alert_min; @@ -4049,19 +4059,20 @@ static void get_sys_bat(const char *path, struct linux_battery *bat) get_sys_str(path, "status", s); bat->status = parse_battery_status(s); - bat->full_charge_capacity = get_sys_int(path, "energy_full"); - bat->capacity_now = get_sys_int(path, "energy_now"); - bat->rate_now = get_sys_int(path, "power_now"); + bat->capacity.energy.energy_full_uwh = get_sys_int(path, "energy_full"); + bat->capacity.energy.energy_now_uwh = get_sys_int(path, "energy_now"); + bat->capacity.energy.power_now_uw = get_sys_int(path, "power_now"); bat->power_unit = BATTERY_UNIT_ENERGY; - if (!bat->full_charge_capacity || !bat->capacity_now) + bat->voltage_now = get_sys_int(path, "voltage_now"); + + if (!bat->capacity.energy.energy_full_uwh || !bat->capacity.energy.energy_now_uwh) { - bat->full_charge_capacity = get_sys_int(path, "charge_full"); - bat->capacity_now = get_sys_int(path, "charge_now"); - bat->voltage_now = get_sys_int(path, "voltage_now"); - bat->rate_now = get_sys_int(path, "current_now"); + bat->capacity.charge.charge_full_uah = get_sys_int(path, "charge_full"); + bat->capacity.charge.charge_now_uah = get_sys_int(path, "charge_now"); + bat->capacity.charge.current_now_ua = get_sys_int(path, "current_now"); bat->power_unit = BATTERY_UNIT_CHARGE; - if (!bat->full_charge_capacity || !bat->capacity_now || !bat->voltage_now) + if (!bat->capacity.charge.charge_full_uah || !bat->capacity.charge.charge_now_uah || !bat->voltage_now) bat->power_unit = BATTERY_UNIT_UNKNOWN; } @@ -4131,19 +4142,19 @@ static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) case BATTERY_UNIT_UNKNOWN: continue; case BATTERY_UNIT_ENERGY: - bs->MaxCapacity += (ULONG)(bat.full_charge_capacity / 1e3); - bs->RemainingCapacity += (ULONG)(bat.capacity_now / 1e3); - if (bat.status == BATTERY_CHARGING) bs->Rate += (ULONG)(bat.rate_now / 1e3); - if (bat.status == BATTERY_DISCHARGING) bs->Rate -= (ULONG)(bat.rate_now / 1e3); + bs->MaxCapacity += (ULONG)(bat.capacity.energy.energy_full_uwh / 1e3); + bs->RemainingCapacity += (ULONG)(bat.capacity.energy.energy_now_uwh / 1e3); + if (bat.status == BATTERY_CHARGING) bs->Rate += (ULONG)(bat.capacity.energy.power_now_uw/ 1e3); + if (bat.status == BATTERY_DISCHARGING) bs->Rate -= (ULONG)(bat.capacity.energy.power_now_uw / 1e3); break; case BATTERY_UNIT_CHARGE: - bs->MaxCapacity += (ULONG)(bat.full_charge_capacity * bat.voltage_now / 1e9); - bs->RemainingCapacity += (ULONG)(bat.capacity_now * bat.voltage_now / 1e9); - if (bat.status == BATTERY_UNKNOWN || !bat.rate_now) continue; - if (bat.status == BATTERY_DISCHARGING && bat.rate_now > 0) - bs->Rate -= (ULONG)(bat.rate_now * bat.voltage_now / 1e9); + bs->MaxCapacity += (ULONG)(bat.capacity.charge.charge_full_uah * bat.voltage_now / 1e9); + bs->RemainingCapacity += (ULONG)(bat.capacity.charge.charge_now_uah * bat.voltage_now / 1e9); + if (bat.status == BATTERY_UNKNOWN || !bat.capacity.charge.current_now_ua) continue; + if (bat.status == BATTERY_DISCHARGING && bat.capacity.charge.current_now_ua > 0) + bs->Rate -= (ULONG)(bat.capacity.charge.current_now_ua * bat.voltage_now / 1e9); else - bs->Rate += (ULONG)(bat.rate_now * bat.voltage_now / 1e9); + bs->Rate += (ULONG)(bat.capacity.charge.current_now_ua * bat.voltage_now / 1e9); break; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8460
Tomas-Mendes-ai (@Tomas-Mendes-ai) commented about dlls/ntdll/unix/system.c:
+ int energy_full_uwh; + int energy_now_uwh; + int power_now_uw; + } energy; + struct { + int charge_full_uah; + int charge_now_uah; + int current_now_ua; + } charge; + } capacity; + + int voltage_now; + int alarm; + int capacity_alert_min; + int capacity_alert_max; +}; Should this be defined inside the #ifdef linux block where it's implemented?
As it stands, that would avoid leaking Linux-specific code to other platforms. But I’m not sure if it would make sense, now or later, to abstract this for reuse on other platforms and avoid duplicating logic. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8460#note_108379
participants (2)
-
Tomas Mendes -
Tomas-Mendes-ai (＠Tomas-Mendes-ai)