ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

charger: android_get_control_file on last_kmsg

Browse source 
Call android_get_control_file on last_kmsg files if the file
descriptor is provided by init.

Also, uses base::Read(File|Fd)ToString functions to read the
files (because load_file doesn't support fd arguments).

Test: charger mode
Test: manual kernel panic, then start charger; seen last kmsg.

Bug: 129138950
Change-Id: Idd3376e349f29586a1e66faab2c0f1bf73e0eda5
This commit is contained in:
Yifan Hong 2019-03-25 18:09:35 -07:00
parent f959fffc1c
commit dc9c08b900
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
healthd/healthd_mode_charger.cpp
View file

@ -36,6 +36,7 @@
#include <linux/netlink.h>
#include <sys/socket.h>
#include <cutils/android_get_control_file.h>
#include <cutils/klog.h>
#include <cutils/misc.h>
#include <cutils/properties.h>
@ -206,10 +207,9 @@ static int64_t curr_time_ms() {
#define MAX_KLOG_WRITE_BUF_SZ 256
static void dump_last_kmsg(void) {
char* buf;
std::string buf;
char* ptr;
unsigned sz = 0;
int len;
size_t len;
LOGW("\n");
LOGW("*************** LAST KMSG ***************\n");
@ -221,21 +221,25 @@ static void dump_last_kmsg(void) {
"/proc/last_kmsg",
// clang-format on
};
for (size_t i = 0; i < arraysize(kmsg); ++i) {
buf = (char*)load_file(kmsg[i], &sz);
if (buf && sz) break;
for (size_t i = 0; i < arraysize(kmsg) && buf.empty(); ++i) {
auto fd = android_get_control_file(kmsg[i]);
if (fd >= 0) {
android::base::ReadFdToString(fd, &buf);
} else {
android::base::ReadFileToString(kmsg[i], &buf);
}
}
if (!buf || !sz) {
if (buf.empty()) {
LOGW("last_kmsg not found. Cold reset?\n");
goto out;
}
len = min(sz, LAST_KMSG_MAX_SZ);
ptr = buf + (sz - len);
len = min(buf.size(), LAST_KMSG_MAX_SZ);
ptr = &buf[buf.size() - len];
while (len > 0) {
int cnt = min(len, MAX_KLOG_WRITE_BUF_SZ);
size_t cnt = min(len, MAX_KLOG_WRITE_BUF_SZ);
char yoink;
char* nl;
@ -251,8 +255,6 @@ static void dump_last_kmsg(void) {
ptr += cnt;
}
free(buf);
out:
LOGW("\n");
LOGW("************* END LAST KMSG *************\n");