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

Merge "llkd: switch to std::literals" am: 0e7dc30874

Browse source 
am: 9357ff4a13

Change-Id: Ibe5242d69187dd42fb2c98fcb6be2f3b3c8d123e
This commit is contained in:
Mark Salyzyn 2018-08-10 08:55:51 -07:00 • committed by android-build-merger
commit 951a04a09b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
llkd/libllkd.cpp
View file

@ -55,6 +55,7 @@
using namespace std::chrono_literals; using namespace std::chrono_literals;
using namespace std::chrono; using namespace std::chrono;
using namespace std::literals;
namespace { namespace {
@ -497,8 +498,7 @@ void llkPanicKernel(bool dump, pid_t tid, const char* state) {
} }
::usleep(200000); // let everything settle ::usleep(200000); // let everything settle
} }
llkWriteStringToFile(std::string("SysRq : Trigger a crash : 'livelock,") + state + "'\n", llkWriteStringToFile("SysRq : Trigger a crash : 'livelock,"s + state + "'\n", "/dev/kmsg");
"/dev/kmsg");
android::base::WriteStringToFd("c", sysrqTriggerFd); android::base::WriteStringToFd("c", sysrqTriggerFd);
// NOTREACHED // NOTREACHED
// DYB // DYB
@ -1070,7 +1070,7 @@ bool llkInit(const char* threadname) {
std::to_string(kthreaddPid) + "," + std::to_string(::getpid()) + "," + std::to_string(kthreaddPid) + "," + std::to_string(::getpid()) + "," +
std::to_string(::gettid()) + "," LLK_BLACKLIST_PROCESS_DEFAULT); std::to_string(::gettid()) + "," LLK_BLACKLIST_PROCESS_DEFAULT);
if (threadname) { if (threadname) {
defaultBlacklistProcess += std::string(",") + threadname; defaultBlacklistProcess += ","s + threadname;
} }
for (int cpu = 1; cpu < get_nprocs_conf(); ++cpu) { for (int cpu = 1; cpu < get_nprocs_conf(); ++cpu) {
defaultBlacklistProcess += ",[watchdog/" + std::to_string(cpu) + "]"; defaultBlacklistProcess += ",[watchdog/" + std::to_string(cpu) + "]";