diff --git a/ksysguardd/Linux/acpi.c b/ksysguardd/Linux/acpi.c index 69f5c2e0..996b730a 100644 --- a/ksysguardd/Linux/acpi.c +++ b/ksysguardd/Linux/acpi.c @@ -1,515 +1,618 @@ /* KSysGuard, the KDE System Guard Copyright (c) 2003 Stephan Uhlmann Copyright (c) 2005 Sirtaj Singh Kang -- Battery fixes and Thermal + Copyright (c) 2020 Jose Jorge -- Add energy sensor This program is free software; you can redistribute it and/or modify it under the terms of version 2 of the GNU General Public License as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include #include #include #include #include #include #include #include #include #include "Command.h" #include "ksysguardd.h" #include "acpi.h" #define ACPIFILENAMELENGTHMAX 64 /* ================================ public part ================================= */ void initAcpi(struct SensorModul* sm) { initAcpiBattery(sm); initAcpiThermal(sm); } void exitAcpi( void ) { } /************ ACPI Battery **********/ -void registerBatteryCharge(int number, struct SensorModul *sm) +void registerBatteryCharge(const char *name, int number, struct SensorModul *sm) { - char name[ ACPIFILENAMELENGTHMAX ]; - readTypeFile("/sys/class/power_supply/BAT%d/type", number, name, sizeof(name)); - char sensorName [ ACPIFILENAMELENGTHMAX ]; snprintf(sensorName, sizeof(sensorName), "acpi/Battery/%d-%s/Charge", number, name); - registerMonitor(sensorName, "integer", printSysBatteryCharge, + registerMonitor(sensorName, "float", printSysBatteryCharge, printSysBatteryChargeInfo, sm); } -void registerBatteryChargeDesign(int number, struct SensorModul *sm) +void registerBatteryChargeDesign(const char *name, int number, struct SensorModul *sm) { - char name[ ACPIFILENAMELENGTHMAX ]; - readTypeFile("/sys/class/power_supply/BAT%d/type", number, name, sizeof(name)); - char sensorName [ ACPIFILENAMELENGTHMAX ]; snprintf(sensorName, sizeof(sensorName), "acpi/Battery/%d-%s/ChargeDesign", number, name); - registerMonitor(sensorName, "integer", printSysBatteryChargeDesign, + registerMonitor(sensorName, "float", printSysBatteryChargeDesign, printSysBatteryChargeDesignInfo, sm); } -void registerBatteryRate(int number, struct SensorModul *sm) +void registerBatteryEnergy(const char *name, int number, struct SensorModul *sm) { - char name[ ACPIFILENAMELENGTHMAX ]; - readTypeFile("/sys/class/power_supply/BAT%d/type", number, name, sizeof(name)); + char sensorName [ ACPIFILENAMELENGTHMAX ]; + snprintf(sensorName, sizeof(sensorName), "acpi/Battery/%d-%s/Energy", number, name); + registerMonitor(sensorName, "float", printSysBatteryEnergy, + printSysBatteryEnergyInfo, sm); +} + +void registerBatteryEnergyDesign(const char *name, int number, struct SensorModul *sm) +{ + char sensorName [ ACPIFILENAMELENGTHMAX ]; + snprintf(sensorName, sizeof(sensorName), "acpi/Battery/%d-%s/EnergyDesign", number, name); + + registerMonitor(sensorName, "float", printSysBatteryEnergyDesign, + printSysBatteryEnergyDesignInfo, sm); +} + +void registerBatteryRate(const char *name, int number, struct SensorModul *sm) +{ char sensorName [ ACPIFILENAMELENGTHMAX ]; snprintf(sensorName, sizeof(sensorName), "acpi/Battery/%d-%s/Rate", number, name); registerMonitor(sensorName, "integer", printSysBatteryRate, printSysBatteryRateInfo, sm); } +void registerBatteryRatePower(const char *name, int number, struct SensorModul *sm) +{ + char sensorName [ ACPIFILENAMELENGTHMAX ]; + snprintf(sensorName, sizeof(sensorName), "acpi/Battery/%d-%s/RatePower", number, name); + + registerMonitor(sensorName, "integer", printSysBatteryRatePower, + printSysBatteryRatePowerInfo, sm); +} + void initAcpiBattery( struct SensorModul* sm ) { DIR *d; struct dirent *de; - char s[ ACPIFILENAMELENGTHMAX ]; + char name[ ACPIFILENAMELENGTHMAX ]; d = opendir("/sys/class/power_supply/"); if (d != NULL) { while ( (de = readdir(d)) != NULL ) { if (!de->d_name || de->d_name[0] == '.') continue; if (strncmp( de->d_name, "BAT", sizeof("BAT")-1) == 0) { int number = atoi(de->d_name + (sizeof("BAT")-1)); - registerBatteryCharge(number, sm); - registerBatteryChargeDesign(number, sm); - registerBatteryRate(number, sm); + readTypeFile("/sys/class/power_supply/BAT%d/type", number, name, sizeof(name)); + registerBatteryCharge(name, number, sm); + registerBatteryChargeDesign(name, number, sm); + registerBatteryEnergy(name, number, sm); + registerBatteryEnergyDesign(name, number, sm); + registerBatteryRate(name, number, sm); + registerBatteryRatePower(name, number, sm); } } closedir( d ); } } void printSysBatteryCharge(const char *cmd) { int zone = 0; if (sscanf(cmd, "acpi/Battery/%d", &zone) <= 0) { output("-1\n"); return; } int charge = getSysFileValue("power_supply", "BAT", zone, "charge_now"); int maximum = getSysFileValue("power_supply", "BAT", zone, "charge_full"); - int state = 0; + float state = 0; if ( maximum > 0) { - state = charge * 100 / maximum; + state = charge/((float)maximum/100);/* to get 0.1% changes */ } if (state > 100) { state = 100; /* prevent insane numbers with bad hardware */ } else if (state < 0) { state = 0; /* prevent insane numbers with bad hardware */ } - output( "%d\n", state); + output( "%f\n", state); } void printSysBatteryChargeInfo(const char *cmd) { char name [ 200 ]; if (sscanf(cmd, "acpi/Battery/%199[^/]", name) > 0) { output( "%s charge\t0\t100\t%%\n", name); } else { output( "Current charge\t0\t100\t%%\n"); } } void printSysBatteryChargeDesign(const char *cmd) { int zone = 0; if (sscanf(cmd, "acpi/Battery/%d", &zone) <= 0) { output("-1\n"); return; } int charge = getSysFileValue("power_supply", "BAT", zone, "charge_now"); int maximum = getSysFileValue("power_supply", "BAT", zone, "charge_full_design"); - int state = 0; + float state = 0; if (maximum > 0) { - state = charge * 100 / maximum; + state = charge/((float)maximum/100);/* to get 0.1% changes */ } if (state > 100) { state = 100; /* prevent insane numbers with bad hardware */ } else if (state < 0) { state = 0; /* prevent insane numbers with bad hardware */ } - output( "%d\n", state); + output( "%f\n", state); } void printSysBatteryChargeDesignInfo(const char *cmd) { char name [ 200 ]; if (sscanf(cmd, "acpi/Battery/%199[^/]", name) > 0) { output( "%s charge (by design)\t0\t100\t%%\n", name); } else { output( "Current charge (by design)\t0\t100\t%%\n"); } } +void printSysBatteryEnergy(const char *cmd) +{ + int zone = 0; + if (sscanf(cmd, "acpi/Battery/%d", &zone) <= 0) { + output("-1\n"); + return; + } + + int charge = getSysFileValue("power_supply", "BAT", zone, "energy_now"); + int maximum = getSysFileValue("power_supply", "BAT", zone, "energy_full"); + float state = 0; + if ( maximum > 0) { + state = charge/((float)maximum/100);/* to get 0.1% changes */ + } + if (state > 100) { + state = 100; /* prevent insane numbers with bad hardware */ + } else if (state < 0) { + state = 0; /* prevent insane numbers with bad hardware */ + } + output( "%f\n", state); +} + +void printSysBatteryEnergyInfo(const char *cmd) +{ + char name [ 200 ]; + if (sscanf(cmd, "acpi/Battery/%199[^/]", name) > 0) { + output( "%s energy\t0\t100\t%%\n", name); + } else { + output( "Current energy\t0\t100\t%%\n"); + } +} + +void printSysBatteryEnergyDesign(const char *cmd) +{ + int zone = 0; + if (sscanf(cmd, "acpi/Battery/%d", &zone) <= 0) { + output("-1\n"); + return; + } + + int charge = getSysFileValue("power_supply", "BAT", zone, "energy_now"); + int maximum = getSysFileValue("power_supply", "BAT", zone, "energy_full_design"); + float state = 0; + if (maximum > 0) { + state = charge/((float)maximum/100);/* to get 0.1% changes */ + } + if (state > 100) { + state = 100; /* prevent insane numbers with bad hardware */ + } else if (state < 0) { + state = 0; /* prevent insane numbers with bad hardware */ + } + output( "%f\n", state); +} + +void printSysBatteryEnergyDesignInfo(const char *cmd) +{ + char name [ 200 ]; + if (sscanf(cmd, "acpi/Battery/%199[^/]", name) > 0) { + output( "%s energy (by design)\t0\t100\t%%\n", name); + } else { + output( "Current energy (by design)\t0\t100\t%%\n"); + } +} + void printSysBatteryRate(const char *cmd) { int zone = 0; if (sscanf(cmd, "acpi/Battery/%d", &zone) <= 0) { output("-1\n"); return; } output( "%d\n", getSysFileValue("power_supply", "BAT", zone, "current_now") / 1000); } void printSysBatteryRateInfo(const char *cmd) { char name [ 200 ]; if (sscanf(cmd, "acpi/Battery/%199[^/]", name) > 0) { output( "%s rate\t0\t0\tmA\n", name); } else { output( "Current rate\t0\t0\tmA\n"); } } +void printSysBatteryRatePower(const char *cmd) +{ + int zone = 0; + if (sscanf(cmd, "acpi/Battery/%d", &zone) <= 0) { + output("-1\n"); + return; + } + + output( "%d\n", getSysFileValue("power_supply", "BAT", zone, "power_now") / 1000); +} + +void printSysBatteryRatePowerInfo(const char *cmd) +{ + char name [ 200 ]; + if (sscanf(cmd, "acpi/Battery/%199[^/]", name) > 0) { + output( "%s rate\t0\t0\tmA\n", name); + } else { + output( "Current power rate\t0\t0\tmA\n"); + } +} + /************** ACPI Thermal *****************/ #define OLD_THERMAL_ZONE_DIR "/proc/acpi/thermal_zone" #define OLD_TEMPERATURE_FILE "temperature" #define OLD_TEMPERATURE_FILE_MAXLEN 255 #define OLD_FAN_DIR "/proc/acpi/fan" #define OLD_FAN_STATE_FILE "state" #define OLD_FAN_STATE_FILE_MAXLEN 255 /*static char **zone_names = NULL;*/ /** Find the thermal zone name from the command. * Assumes the command is of the form acpi/thermal_zone//... * @p startidx is set to the start of the zone name. May be set to an * undefined value if zone name is not found. * @return length of found name, or 0 if nothing found. */ static int extract_zone_name(char **startidx, const char *cmd) { char *idx = NULL; idx = strchr(cmd, '/'); if (idx == NULL) return 0; idx = strchr(idx+1, '/'); if (idx == NULL) return 0; *startidx = idx+1; idx = strchr(*startidx, '/'); if (idx == NULL) return 0; return idx - *startidx; } void readTypeFile(const char *fileFormat, int number, char *buffer, int bufferSize) { char filename[ ACPIFILENAMELENGTHMAX ]; snprintf(filename, sizeof(filename), fileFormat, number); int typeFile = open(filename, O_RDONLY); if (typeFile < 0) { print_error( "Cannot open file \'%s\'!\n" "Unable to fetch ACPI type", filename); snprintf(buffer, bufferSize, "unknown-%d", number); return; } int readBytes = read( typeFile, buffer, bufferSize - 1 ); assert(readBytes > 1); assert(readBytes < bufferSize); buffer[readBytes-1] = '\0'; /* strip newline */ } void registerThermalZone(int number, struct SensorModul *sm) { char name[ ACPIFILENAMELENGTHMAX ]; readTypeFile("/sys/class/thermal/thermal_zone%d/type", number, name, sizeof(name)); char sensorName [ ACPIFILENAMELENGTHMAX ]; snprintf(sensorName, sizeof(sensorName), "acpi/Thermal_Zone/%d-%s/Temperature", number, name); registerMonitor(sensorName, "integer", printSysThermalZoneTemperature, printSysThermalZoneTemperatureInfo, sm); } void registerCoolingDevice(int number, struct SensorModul *sm) { char name[ ACPIFILENAMELENGTHMAX ]; readTypeFile("/sys/class/thermal/cooling_device%d/type", number, name, sizeof(name)); char sensorName [ ACPIFILENAMELENGTHMAX ]; snprintf(sensorName, sizeof(sensorName), "acpi/Cooling_Device/%d-%s/Activity", number, name); registerMonitor(sensorName, "integer", printCoolingDeviceState, printCoolingDeviceStateInfo, sm); } void initAcpiThermal(struct SensorModul *sm) { char th_ref[ ACPIFILENAMELENGTHMAX ]; DIR *d = NULL; struct dirent *de; d = opendir("/sys/class/thermal/"); if (d != NULL) { while ( (de = readdir(d)) != NULL ) { if (!de->d_name || de->d_name[0] == '.') continue; if (strncmp( de->d_name, "thermal_zone", sizeof("thermal_zone")-1) == 0) { int number = atoi(de->d_name + (sizeof("thermal_zone")-1)); registerThermalZone(number, sm); /*For compatibility, register a legacy sensor*/ int zone_number; if (sscanf(de->d_name, "thermal_zone%d", &zone_number) > 0) { snprintf(th_ref, sizeof(th_ref), "acpi/thermal_zone/TZ%02d/temperature", zone_number); registerLegacyMonitor(th_ref, "integer", printSysCompatibilityThermalZoneTemperature, printThermalZoneTemperatureInfo, sm); } } else if (strncmp( de->d_name, "cooling_device", sizeof("cooling_device")-1) == 0) { int number = atoi(de->d_name+( sizeof("cooling_device")-1)); registerCoolingDevice(number, sm); } } closedir( d ); } else { d = opendir(OLD_THERMAL_ZONE_DIR); if (d != NULL) { while ( (de = readdir(d)) != NULL ) { if (!de->d_name || de->d_name[0] == '.') continue; snprintf(th_ref, sizeof(th_ref), "acpi/thermal_zone/%s/temperature", de->d_name); registerMonitor(th_ref, "integer", printThermalZoneTemperature, printThermalZoneTemperatureInfo, sm); } closedir( d ); } d = opendir(OLD_FAN_DIR); if (d != NULL) { while ( (de = readdir(d)) != NULL ) { if (!de->d_name || de->d_name[0] == '.') continue; snprintf(th_ref, sizeof(th_ref), "acpi/fan/%s/state", de->d_name); registerMonitor(th_ref, "integer", printFanState, printFanStateInfo, sm); } closedir( d ); } } return; } static int getSysFileValue(const char *className, const char *group, int value, const char *file) { static int shownError = 0; char th_file[ ACPIFILENAMELENGTHMAX ]; char input_buf[ 100 ]; snprintf(th_file, sizeof(th_file), "/sys/class/%s/%s%d/%s", className, group, value, file); int fd = open(th_file, O_RDONLY); if (fd < 0) { - if (!shownError) - print_error( "Cannot open file \'%s\'!\n" - "Load the thermal ACPI kernel module or\n" - "compile it into your kernel.\n", th_file ); - shownError = 1; - return -1; + return -1;/* ignore failures, as sys files disappear when battery is removed */ } int read_bytes = read( fd, input_buf, sizeof(input_buf) - 1 ); if ( read_bytes == sizeof(input_buf) - 1 ) { if (!shownError) log_error( "Internal buffer too small to read \'%s\'", th_file ); shownError = 1; close( fd ); return -1; } close(fd); int result=0; sscanf(input_buf, "%d", &result); return result; } void printSysThermalZoneTemperature(const char *cmd) { int zone = 0; if (sscanf(cmd, "acpi/Thermal_Zone/%d", &zone) <= 0) { output("-1\n"); return; } output( "%d\n", getSysFileValue("thermal", "thermal_zone", zone, "temp") / 1000); } void printSysCompatibilityThermalZoneTemperature(const char *cmd) { int zone = 0; if (sscanf(cmd, "acpi/thermal_zone/TZ%d", &zone) <= 0) { output( "-1\n"); return; } output( "%d\n", getSysFileValue("thermal", "thermal_zone", zone, "temp")/1000); } void printCoolingDeviceStateInfo(const char *cmd) { (void)cmd; char name [ 200 ]; if (sscanf(cmd, "acpi/Cooling_Device/%199[^/]", name) > 0) { output( "%s Cooling Activity\t0\t100\t%%\n", name); } else { output( "Cooling Device Activity\t0\t100\t%%\n"); } } void printCoolingDeviceState(const char *cmd) { int fan = 0; if (sscanf(cmd, "acpi/Cooling_Device/%d", &fan) <= 0) { output( "-1\n"); return; } int current = getSysFileValue("thermal", "cooling_device", fan, "cur_state"); int maximum = getSysFileValue("thermal", "cooling_device", fan, "max_state"); int state = 0; if (current > 0 && maximum > 0) { state = (current * 100) / maximum; /* state is a percentage */ } output( "%d\n", state); } static int getCurrentTemperature(const char *cmd) { char th_file[ ACPIFILENAMELENGTHMAX ]; char input_buf[ OLD_TEMPERATURE_FILE_MAXLEN ]; char *zone_name = NULL; int read_bytes = 0, fd = 0, len_zone_name = 0; int temperature=0; len_zone_name = extract_zone_name(&zone_name, cmd); if (len_zone_name <= 0) return -1; snprintf(th_file, sizeof(th_file), OLD_THERMAL_ZONE_DIR "/%.*s/" OLD_TEMPERATURE_FILE, len_zone_name, zone_name); fd = open(th_file, O_RDONLY); if (fd < 0) { print_error( "Cannot open file \'%s\'!\n" "Load the thermal ACPI kernel module or\n" "compile it into your kernel.\n", th_file ); return -1; } read_bytes = read( fd, input_buf, sizeof(input_buf) - 1 ); if ( read_bytes == sizeof(input_buf) - 1 ) { log_error( "Internal buffer too small to read \'%s\'", th_file ); close( fd ); return -1; } close(fd); sscanf(input_buf, "temperature: %d C", &temperature); return temperature; } void printThermalZoneTemperature(const char *cmd) { int temperature = getCurrentTemperature(cmd); output( "%d\n", temperature); } void printSysThermalZoneTemperatureInfo(const char *cmd) { char name [ 200 ]; if (sscanf(cmd, "acpi/Thermal_Zone/%199[^/]", name) > 0) { output( "%s temperature\t0\t0\tC\n", name); } else { output( "Current temperature\t0\t0\tC\n"); } } void printThermalZoneTemperatureInfo(const char *cmd) { (void)cmd; output( "Current temperature\t0\t0\tC\n"); } /********** ACPI Fan State***************/ static int getFanState(const char *cmd) { char fan_state_file[ ACPIFILENAMELENGTHMAX ]; char input_buf[ OLD_FAN_STATE_FILE_MAXLEN ]; char *fan_name = NULL; int read_bytes = 0, fd = 0, len_fan_name = 0; char fan_state[4]; len_fan_name = extract_zone_name(&fan_name, cmd); if (len_fan_name <= 0) { return -1; } snprintf(fan_state_file, sizeof(fan_state_file), OLD_FAN_DIR "/%.*s/" OLD_FAN_STATE_FILE, len_fan_name, fan_name); fd = open(fan_state_file, O_RDONLY); if (fd < 0) { print_error( "Cannot open file \'%s\'!\n" "Load the fan ACPI kernel module or\n" "compile it into your kernel.\n", fan_state_file ); return -1; } read_bytes = read( fd, input_buf, sizeof(input_buf) - 1 ); if ( read_bytes == sizeof(input_buf) - 1 ) { log_error( "Internal buffer too small to read \'%s\'", fan_state_file ); close( fd ); return -1; } close(fd); sscanf(input_buf, "status: %2s", fan_state); return (fan_state[1] == 'n') ? 1 : 0; } void printFanState(const char *cmd) { int fan_state = getFanState(cmd); output( "%d\n", fan_state); } void printFanStateInfo(const char *cmd) { (void)cmd; output( "Fan status\t0\t1\tboolean\n"); } diff --git a/ksysguardd/Linux/acpi.h b/ksysguardd/Linux/acpi.h index 856173cf..b4a5a365 100644 --- a/ksysguardd/Linux/acpi.h +++ b/ksysguardd/Linux/acpi.h @@ -1,50 +1,56 @@ /* KSysGuard, the KDE System Guard Copyright (c) 2003 Stephan Uhlmann This program is free software; you can redistribute it and/or modify it under the terms of version 2 of the GNU General Public License as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef KSG_ACPI_H #define KSG_ACPI_H void initAcpi( struct SensorModul* ); void exitAcpi( void ); void initAcpiBattery( struct SensorModul* ); void printSysBatteryCharge(const char *cmd); void printSysBatteryChargeInfo(const char *cmd); void printSysBatteryChargeDesign(const char *cmd); void printSysBatteryChargeDesignInfo(const char *cmd); +void printSysBatteryEnergy(const char *cmd); +void printSysBatteryEnergyInfo(const char *cmd); +void printSysBatteryEnergyDesign(const char *cmd); +void printSysBatteryEnergyDesignInfo(const char *cmd); void printSysBatteryRate(const char *cmd); void printSysBatteryRateInfo(const char *cmd); +void printSysBatteryRatePower(const char *cmd); +void printSysBatteryRatePowerInfo(const char *cmd); void readTypeFile(const char *fileFormat, int number, char *buffer, int bufferSize); static int getSysFileValue(const char *class, const char *group, int value, const char *file); void initAcpiThermal( struct SensorModul * ); void printThermalZoneTemperature(const char *cmd); void printSysThermalZoneTemperature(const char *cmd); void printSysCompatibilityThermalZoneTemperature(const char *cmd); void printSysThermalZoneTemperatureInfo(const char *cmd); void printThermalZoneTemperatureInfo(const char *cmd); void printCoolingDeviceStateInfo(const char *cmd); void printCoolingDeviceState(const char *cmd); void initAcpiFan( struct SensorModul * ); void printFanState(const char *cmd); void printSysFanState(const char *cmd); void printFanStateInfo(const char *cmd); #endif