Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69070272 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "llkd: switch to std::literals" am: 0e7dc308 am: 9357ff4a am: 951a04a0 

am: 54e05a35

Change-Id: I29e7f1775e7fbcd6b63dd3e7093bbe89f36fcb8f
parents d62d2a16 54e05a35

llkd/libllkd.cpp

+3 −3
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 


using namespace std::chrono_literals;

using namespace std::chrono;

using namespace std::literals;



namespace {
@@ -497,8 +498,7 @@ void llkPanicKernel(bool dump, pid_t tid, const char* state) { 
        }

        ::usleep(200000);  // let everything settle

    }

    llkWriteStringToFile(std::string("SysRq : Trigger a crash : 'livelock,") + state + "'\n",

                         "/dev/kmsg");

    llkWriteStringToFile("SysRq : Trigger a crash : 'livelock,"s + state + "'\n", "/dev/kmsg");

    android::base::WriteStringToFd("c", sysrqTriggerFd);

    // NOTREACHED

    // DYB
@@ -1070,7 +1070,7 @@ bool llkInit(const char* threadname) { 
        std::to_string(kthreaddPid) + "," + std::to_string(::getpid()) + "," +

        std::to_string(::gettid()) + "," LLK_BLACKLIST_PROCESS_DEFAULT);

    if (threadname) {

        defaultBlacklistProcess += std::string(",") + threadname;

        defaultBlacklistProcess += ","s + threadname;

    }

    for (int cpu = 1; cpu < get_nprocs_conf(); ++cpu) {

        defaultBlacklistProcess += ",[watchdog/" + std::to_string(cpu) + "]";