openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Snap for 6441286 from 58f584cb6d to mainline-release 

Change-Id: Ic5f3169676ca666aba341c16e3be85bc068d8f2e
This commit is contained in:
android-build-team Robot 2020-04-29 07:12:54 +00:00
parent 2b995cef9d 58f584cb6d
commit 7bdcb68d81
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs_mgr/libsnapshot/Android.bp
View File

@ -159,23 +159,23 @@ cc_defaults {
"snapshot_test.cpp",
],
shared_libs: [
"android.hardware.boot@1.0",
"android.hardware.boot@1.1",
"libbinder",
"libcrypto",
"libhidlbase",
"libprotobuf-cpp-lite",
"libsparse",
"libutils",
"libz",
],
static_libs: [
"android.hardware.boot@1.0",
"android.hardware.boot@1.1",
"libfs_mgr",
"libgsi",
"libgmock",
"liblp",
"libsnapshot",
"libsnapshot_test_helpers",
"libsparse",
],
header_libs: [
"libstorage_literals_headers",

9
libprocessgroup/profiles/Android.bp
View File

@ -100,13 +100,12 @@ cc_test {
"libjsoncpp",
"libprotobuf-cpp-full",
],
target: {
android: {
test_config: "vts_processgroup_validate_test.xml",
},
},
test_suites: [
"vts",
],
}
vts_config {
name: "VtsProcessgroupValidateTest",
test_config: "vts_processgroup_validate_test.xml",
}

13
llkd/libllkd.cpp
View File

@ -41,6 +41,7 @@
#include <string>
#include <unordered_map>
#include <unordered_set>
#include <vector>
#include <android-base/file.h>
#include <android-base/logging.h>
@ -1204,9 +1205,19 @@ milliseconds llkCheck(bool checkRunning) {
}
}
// We are here because we have confirmed kernel live-lock
std::vector<std::string> threads;
auto taskdir = procdir + std::to_string(tid) + "/task/";
dir taskDirectory(taskdir);
for (auto tp = taskDirectory.read(); tp != nullptr; tp = taskDirectory.read()) {
std::string piddir;
if (getValidTidDir(tp, &piddir))
threads.push_back(android::base::Basename(piddir));
}
const auto message = state + " "s + llkFormat(procp->count) + " " +
std::to_string(ppid) + "->" + std::to_string(pid) + "->" +
std::to_string(tid) + " " + process_comm + " [panic]";
std::to_string(tid) + " " + process_comm + " [panic]\n" +
" thread group: {" + android::base::Join(threads, ",") +
"}";
llkPanicKernel(dump, tid,
(state == 'Z') ? "zombie" : (state == 'D') ? "driver" : "sleeping",
message);