tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "bootstat: 3.18 kernel does not report "SysRq : Trigger a crash"" am: 5e2b2681ef

Browse source 
am: a2b4750771

Change-Id: Id6dc67787ae80e7ca043258cc7dd8e498f8fe0c5
This commit is contained in:
Mark Salyzyn 2018-03-16 21:28:23 +00:00 committed by android-build-merger
commit 057ba5845c
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bootstat/bootstat.cpp
View file

@ -30,6 +30,7 @@
#include <map>
#include <memory>
#include <string>
#include <utility>
#include <vector>
#include <android-base/chrono_utils.h>
@ -192,7 +193,9 @@ const std::map<std::string, int32_t> kBootReasonMap = {
{"s3_wakeup", 51},
{"kernel_panic,sysrq", 52},
{"kernel_panic,NULL", 53},
{"kernel_panic,null", 53},
{"kernel_panic,BUG", 54},
{"kernel_panic,bug", 54},
{"bootloader", 55},
{"cold", 56},
{"hard", 57},
@ -486,18 +489,19 @@ bool correctForBer(std::string& reason, const std::string& needle) {
bool addKernelPanicSubReason(const pstoreConsole& console, std::string& ret) {
// Check for kernel panic types to refine information
if (console.rfind("SysRq : Trigger a crash") != std::string::npos) {
if ((console.rfind("SysRq : Trigger a crash") != std::string::npos) ||
(console.rfind("PC is at sysrq_handle_crash+") != std::string::npos)) {
// Can not happen, except on userdebug, during testing/debugging.
ret = "kernel_panic,sysrq";
return true;
}
if (console.rfind("Unable to handle kernel NULL pointer dereference at virtual address") !=
std::string::npos) {
ret = "kernel_panic,NULL";
ret = "kernel_panic,null";
return true;
}
if (console.rfind("Kernel BUG at ") != std::string::npos) {
ret = "kernel_panic,BUG";
ret = "kernel_panic,bug";
return true;
}
return false;