LineageOS/android_hardware_qcom_thermal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

thermal-hal: Add exception handling for stoi

Browse Source 
stoi can throw exception when an invalid value is passed in buffer.
Enable exception handling and add retry mechanism when a exception is
thrown.

Change-Id: I2c1e0ddbbb408cb6b9739b516296125ec1efd64a
This commit is contained in:
Ram Chandrasekar
2021-07-29 15:41:00 -07:00
parent 372b93479a
commit 9e1b3262bb
4 changed files with 68 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.bp
View File

@@ -32,6 +32,7 @@ cc_binary {
cflags: [
"-Wno-unused-parameter",
"-Wno-unused-variable",
"-fexceptions",
],
}
@@ -71,5 +72,6 @@ cc_binary {
"-Wno-unused-parameter",
"-Wno-unused-variable",
"-DENABLE_THERMAL_NETLINK",
"-fexceptions",
],
}

67
thermalCommon.cpp
View File

@@ -372,18 +372,30 @@ int ThermalCommon::read_cdev_state(struct therm_cdev& cdev)
{
char file_name[MAX_PATH];
std::string buf;
int ret = 0;
int ret = 0, ct = 0;
bool read_ok = false;
LOG(DEBUG) << "Entering " <<__func__;
snprintf(file_name, sizeof(file_name), CDEV_CUR_STATE_PATH,
cdev.cdevn);
ret = readLineFromFile(std::string(file_name), buf);
if (ret <= 0) {
LOG(ERROR) << "Cdev state read error:"<< ret <<
" for cdev: " << cdev.c.name;
return -1;
}
cdev.c.value = std::stoi(buf, nullptr, 0);
do {
ret = readLineFromFile(std::string(file_name), buf);
if (ret <= 0) {
LOG(ERROR) << "Cdev state read error:"<< ret <<
" for cdev: " << cdev.c.name;
return -1;
}
try {
cdev.c.value = std::stoi(buf, nullptr, 0);
read_ok = true;
}
catch (std::exception &err) {
LOG(ERROR) << "Cdev read stoi error:" << err.what()
<< " cdev:" << cdev.c.name << " ID:"
<< cdev.cdevn << " buf:" << buf <<
std::endl;
}
ct++;
} while (!read_ok && ct < RETRY_CT);
LOG(DEBUG) << "cdev Name:" << cdev.c.name << ". state:" <<
cdev.c.value << std::endl;
@@ -425,7 +437,8 @@ int ThermalCommon::estimateSeverity(struct therm_sensor& sensor)
}
if (idx >= 0)
severity = (ThrottlingSeverity)(idx);
LOG(DEBUG) << "Sensor Name:" << sensor.t.name << ". prev severity:" <<
LOG(INFO) << "Sensor Name:" << sensor.t.name << "temp: " <<
temp << ". prev severity:" <<
(int)sensor.lastThrottleStatus << ". cur severity:" <<
(int)sensor.t.throttlingStatus << " New severity:" <<
(int)severity << std::endl;
@@ -442,18 +455,32 @@ int ThermalCommon::read_temperature(struct therm_sensor& sensor)
char file_name[MAX_PATH];
float temp;
std::string buf;
int ret = 0;
int ret = 0, ct = 0;
bool read_ok = false;
LOG(DEBUG) << "Entering " <<__func__;
snprintf(file_name, sizeof(file_name), TEMPERATURE_FILE_FORMAT,
do {
snprintf(file_name, sizeof(file_name), TEMPERATURE_FILE_FORMAT,
sensor.tzn);
ret = readLineFromFile(std::string(file_name), buf);
if (ret <= 0) {
LOG(ERROR) << "Temperature read error:"<< ret <<
" for sensor " << sensor.t.name;
return -1;
}
sensor.t.value = (float)std::stoi(buf, nullptr, 0) / (float)sensor.mulFactor;
ret = readLineFromFile(std::string(file_name), buf);
if (ret <= 0) {
LOG(ERROR) << "Temperature read error:"<< ret <<
" for sensor " << sensor.t.name;
return -1;
}
try {
sensor.t.value = (float)std::stoi(buf, nullptr, 0) /
(float)sensor.mulFactor;
read_ok = true;
}
catch (std::exception &err) {
LOG(ERROR) << "Temperature buf stoi error: "
<< err.what()
<< " buf:" << buf << " sensor:"
<< sensor.t.name << " TZ:" <<
sensor.tzn << std::endl;
}
ct++;
} while (!read_ok && ct < RETRY_CT);
LOG(DEBUG) << "Sensor Name:" << sensor.t.name << ". Temperature:" <<
(float)sensor.t.value << std::endl;

2
thermalCommon.h
View File

@@ -39,6 +39,8 @@ namespace thermal {
namespace V2_0 {
namespace implementation {
#define RETRY_CT 3
class ThermalCommon {
public:
ThermalCommon();

22
thermalConfig.cpp
View File

@@ -867,12 +867,24 @@ namespace implementation {
std::vector<struct target_therm_cfg>::iterator it_vec;
bool bcl_defined = false;
std::string soc_val;
int ct = 0;
bool read_ok = false;
if (cmnInst.readFromFile(socIDPath, soc_val) <= 0) {
LOG(ERROR) <<"soc ID fetch error";
return;
}
soc_id = std::stoi(soc_val, nullptr, 0);
do {
if (cmnInst.readFromFile(socIDPath, soc_val) <= 0) {
LOG(ERROR) <<"soc ID fetch error";
return;
}
try {
soc_id = std::stoi(soc_val, nullptr, 0);
read_ok = true;
}
catch (std::exception &err) {
LOG(ERROR) <<"soc id stoi err:" << err.what()
<< " buf:" << soc_val;
}
ct++;
} while (!read_ok && ct < RETRY_CT);
if (soc_id <= 0) {
LOG(ERROR) << "Invalid soc ID: " << soc_id;
return;