zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2025-07-12 12:14:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update battery API to use NAN on error

Browse Source
This commit is contained in:
Benny Baumann
2020-09-07 11:52:42 +02:00
committed by cgzones
parent f805093589
commit 47e2cefe02
8 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
linux/Battery.c
View File

@ -17,6 +17,7 @@ Linux battery readings written by Ian P. Hands (iphands@gmail.com, ihands@redhat
#include <string.h>
#include <fcntl.h>
#include <time.h>
#include <math.h>
#include "BatteryMeter.h"
#include "StringUtils.h"
@ -140,18 +141,18 @@ static ACPresence procAcpiCheck(void) {
static double Battery_getProcBatData(void) {
const unsigned long int totalFull = parseBatInfo("info", 3, 4);
if (totalFull == 0)
return 0;
return NAN;
const unsigned long int totalRemain = parseBatInfo("state", 5, 3);
if (totalRemain == 0)
return 0;
return NAN;
return totalRemain * 100.0 / (double) totalFull;
}
static void Battery_getProcData(double* level, ACPresence* isOnAC) {
*level = Battery_getProcBatData();
*isOnAC = procAcpiCheck();
*level = AC_ERROR != *isOnAC ? Battery_getProcBatData() : NAN;
}
// ----------------------------------------
@ -176,7 +177,7 @@ static inline ssize_t xread(int fd, void *buf, size_t count) {
static void Battery_getSysData(double* level, ACPresence* isOnAC) {
*level = 0;
*level = NAN;
*isOnAC = AC_ERROR;
DIR *dir = opendir(SYS_POWERSUPPLY_DIR);
@ -279,13 +280,14 @@ static void Battery_getSysData(double* level, ACPresence* isOnAC) {
}
}
closedir(dir);
*level = totalFull > 0 ? ((double) totalRemain * 100) / (double) totalFull : 0;
*level = totalFull > 0 ? ((double) totalRemain * 100.0) / (double) totalFull : NAN;
}
static enum { BAT_PROC, BAT_SYS, BAT_ERR } Battery_method = BAT_PROC;
static time_t Battery_cacheTime = 0;
static double Battery_cacheLevel = 0;
static double Battery_cacheLevel = NAN;
static ACPresence Battery_cacheIsOnAC = 0;
void Battery_getData(double* level, ACPresence* isOnAC) {
@ -299,22 +301,21 @@ void Battery_getData(double* level, ACPresence* isOnAC) {
if (Battery_method == BAT_PROC) {
Battery_getProcData(level, isOnAC);
if (*level == 0) {
if (isnan(*level)) {
Battery_method = BAT_SYS;
}
}
if (Battery_method == BAT_SYS) {
Battery_getSysData(level, isOnAC);
if (*level == 0) {
if (isnan(*level)) {
Battery_method = BAT_ERR;
}
}
if (Battery_method == BAT_ERR) {
*level = -1;
*level = NAN;
*isOnAC = AC_ERROR;
}
if (*level > 100.0) {
*level = 100.0;
} else {
CLAMP(*level, 0.0, 100.0);
}
Battery_cacheLevel = *level;
Battery_cacheIsOnAC = *isOnAC;