Evolution-X-Tensor/device_google_zuma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "remove dump text section" into udc-dev am: b90aaae77b

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21806765

Change-Id: I5db57f6557f340e4fd0ae837f8ec267d2af779e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Adam Shih 2023-03-09 05:29:16 +00:00 • committed by Automerger Merge Worker
commit ea136aebf3
2 changed files with 2 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

30
dumpstate/Dumpstate.cpp
View file

@ -188,10 +188,7 @@ void endSection(int fd, const std::string &sectionName, timepoint_t startTime) {
} }
Dumpstate::Dumpstate() Dumpstate::Dumpstate()
: mTextSections{ : mLogSections{
{ "display", [this](int fd) { dumpDisplaySection(fd); } },
},
mLogSections{
{ "radio", [this](int fd, const std::string &destDir) { dumpRadioLogs(fd, destDir); } }, { "radio", [this](int fd, const std::string &destDir) { dumpRadioLogs(fd, destDir); } },
} { } {
} }
@ -202,18 +199,6 @@ void Dumpstate::dumpTextSection(int fd, const std::string &sectionName) {
bool dumpAll = (sectionName == kAllSections); bool dumpAll = (sectionName == kAllSections);
std::string dumpFiles; std::string dumpFiles;
for (const auto &section : mTextSections) {
if (dumpAll || sectionName == section.first) {
auto startTime = startSection(fd, section.first);
section.second(fd);
endSection(fd, section.first, startTime);
if (!dumpAll) {
return;
}
}
}
// Execute all or designated programs under vendor/bin/dump/ // Execute all or designated programs under vendor/bin/dump/
std::unique_ptr<DIR, decltype(&closedir)> dir(opendir("/vendor/bin/dump"), closedir); std::unique_ptr<DIR, decltype(&closedir)> dir(opendir("/vendor/bin/dump"), closedir);
if (!dir) { if (!dir) {
@ -247,22 +232,11 @@ void Dumpstate::dumpTextSection(int fd, const std::string &sectionName) {
// An unsupported section was requested on the command line // An unsupported section was requested on the command line
::android::base::WriteStringToFd("Unrecognized text section: " + sectionName + "\n", fd); ::android::base::WriteStringToFd("Unrecognized text section: " + sectionName + "\n", fd);
::android::base::WriteStringToFd("Try \"" + kAllSections + "\" or one of the following:", fd); ::android::base::WriteStringToFd("Try \"" + kAllSections + "\" or one of the following:", fd);
for (const auto &section : mTextSections) {
::android::base::WriteStringToFd(" " + section.first, fd);
}
::android::base::WriteStringToFd(dumpFiles, fd); ::android::base::WriteStringToFd(dumpFiles, fd);
::android::base::WriteStringToFd("\nNote: sections with attachments (e.g. modem) are" ::android::base::WriteStringToFd("\nNote: sections with attachments (e.g. dump_soc) are"
"not avalable from the command line.\n", fd); "not avalable from the command line.\n", fd);
} }
// Dump items related to display
void Dumpstate::dumpDisplaySection(int fd) {
DumpFileToFd(fd, "DECON-1 counters /sys/class/drm/card0/device/decon1/counters", "/sys/class/drm/card0/device/decon1/counters");
DumpFileToFd(fd, "CRTC-1 event log", "/sys/kernel/debug/dri/0/crtc-1/event");
DumpFileToFd(fd, "Secondary panel name", "/sys/devices/platform/exynos-drm/secondary-panel/panel_name");
DumpFileToFd(fd, "Secondary panel extra info", "/sys/devices/platform/exynos-drm/secondary-panel/panel_extinfo");
}
void Dumpstate::dumpRadioLogs(int fd, const std::string &destDir) { void Dumpstate::dumpRadioLogs(int fd, const std::string &destDir) {
std::string tcpdumpLogDir = TCPDUMP_LOG_DIRECTORY; std::string tcpdumpLogDir = TCPDUMP_LOG_DIRECTORY;
bool tcpdumpEnabled = ::android::base::GetBoolProperty(TCPDUMP_PERSIST_PROPERTY, false); bool tcpdumpEnabled = ::android::base::GetBoolProperty(TCPDUMP_PERSIST_PROPERTY, false);

6
dumpstate/Dumpstate.h
View file

@ -42,18 +42,12 @@ class Dumpstate : public BnDumpstateDevice {
private: private:
const std::string kAllSections = "all"; const std::string kAllSections = "all";
std::vector<std::pair<std::string, std::function<void(int)>>> mTextSections;
std::vector<std::pair<std::string, std::function<void(int, const std::string &)>>> mLogSections; std::vector<std::pair<std::string, std::function<void(int, const std::string &)>>> mLogSections;
void dumpLogs(int fd, std::string srcDir, std::string destDir, int maxFileNum, void dumpLogs(int fd, std::string srcDir, std::string destDir, int maxFileNum,
const char *logPrefix); const char *logPrefix);
void dumpTextSection(int fd, std::string const& sectionName); void dumpTextSection(int fd, std::string const& sectionName);
// Text sections that can be dumped individually on the command line in
// addition to being included in full dumps
void dumpDisplaySection(int fd);
void dumpLogSection(int fd, int fdModem); void dumpLogSection(int fd, int fdModem);
// Log sections to be dumped individually into dumpstate_board.bin // Log sections to be dumped individually into dumpstate_board.bin