summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--device.mk1
-rw-r--r--dumpstate/Dumpstate.cpp143
-rw-r--r--dumpstate/Dumpstate.h10
3 files changed, 2 insertions, 152 deletions
diff --git a/device.mk b/device.mk
index bcbe617..79d586e 100644
--- a/device.mk
+++ b/device.mk
@@ -28,6 +28,7 @@ include device/google/gs-common/display/dump.mk
include device/google/gs-common/camera/dump.mk
include device/google/gs-common/gxp/dump.mk
include device/google/gs-common/gps/dump/log.mk
+include device/google/gs-common/radio/dump.mk
include device/google/gs-common/umfw_stat/umfw_stat.mk
TARGET_BOARD_PLATFORM := gs201
diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp
index b151a87..e3928ea 100644
--- a/dumpstate/Dumpstate.cpp
+++ b/dumpstate/Dumpstate.cpp
@@ -32,14 +32,6 @@
#include "DumpstateUtil.h"
-#define RIL_LOG_DIRECTORY "/data/vendor/radio"
-#define RIL_LOG_DIRECTORY_PROPERTY "persist.vendor.ril.log.base_dir"
-#define RIL_LOG_NUMBER_PROPERTY "persist.vendor.ril.log.num_file"
-
-#define TCPDUMP_LOG_DIRECTORY "/data/vendor/tcpdump_logger/logs"
-#define TCPDUMP_NUMBER_BUGREPORT "persist.vendor.tcpdump.log.br_num"
-#define TCPDUMP_PERSIST_PROPERTY "persist.vendor.tcpdump.log.alwayson"
-
using android::os::dumpstate::CommandOptions;
using android::os::dumpstate::DumpFileToFd;
using android::os::dumpstate::PropertiesHelper;
@@ -50,119 +42,10 @@ namespace android {
namespace hardware {
namespace dumpstate {
-#define EXTENDED_LOG_PREFIX "extended_log_"
-#define RIL_LOG_PREFIX "rild.log."
-#define BUFSIZE 65536
-#define TCPDUMP_LOG_PREFIX "tcpdump"
-
typedef std::chrono::time_point<std::chrono::steady_clock> timepoint_t;
const char kVerboseLoggingProperty[] = "persist.vendor.verbose_logging_enabled";
-void Dumpstate::dumpLogs(int fd, std::string srcDir, std::string destDir, int maxFileNum,
- const char *logPrefix) {
- struct dirent **dirent_list = NULL;
- int num_entries = scandir(srcDir.c_str(),
- &dirent_list,
- 0,
- (int (*)(const struct dirent **, const struct dirent **)) alphasort);
- if (!dirent_list) {
- return;
- } else if (num_entries <= 0) {
- return;
- }
-
- int copiedFiles = 0;
-
- for (int i = num_entries - 1; i >= 0; i--) {
- ALOGD("Found %s\n", dirent_list[i]->d_name);
-
- if (0 != strncmp(dirent_list[i]->d_name, logPrefix, strlen(logPrefix))) {
- continue;
- }
-
- if ((copiedFiles >= maxFileNum) && (maxFileNum != -1)) {
- ALOGD("Skipped %s\n", dirent_list[i]->d_name);
- continue;
- }
-
- copiedFiles++;
-
- CommandOptions options = CommandOptions::WithTimeout(120).Build();
- std::string srcLogFile = srcDir + "/" + dirent_list[i]->d_name;
- std::string destLogFile = destDir + "/" + dirent_list[i]->d_name;
-
- std::string copyCmd = "/vendor/bin/cp " + srcLogFile + " " + destLogFile;
-
- ALOGD("Copying %s to %s\n", srcLogFile.c_str(), destLogFile.c_str());
- RunCommandToFd(fd, "CP LOGS", { "/vendor/bin/sh", "-c", copyCmd.c_str() }, options);
- }
-
- while (num_entries--) {
- free(dirent_list[num_entries]);
- }
-
- free(dirent_list);
-}
-
-void Dumpstate::dumpRilLogs(int fd, std::string destDir) {
- std::string rilLogDir =
- ::android::base::GetProperty(RIL_LOG_DIRECTORY_PROPERTY, RIL_LOG_DIRECTORY);
-
- int maxFileNum = ::android::base::GetIntProperty(RIL_LOG_NUMBER_PROPERTY, 50);
-
- const std::string currentLogDir = rilLogDir + "/cur";
- const std::string previousLogDir = rilLogDir + "/prev";
- const std::string currentDestDir = destDir + "/cur";
- const std::string previousDestDir = destDir + "/prev";
-
- RunCommandToFd(fd, "MKDIR RIL CUR LOG", {"/vendor/bin/mkdir", "-p", currentDestDir.c_str()},
- CommandOptions::WithTimeout(2).Build());
- RunCommandToFd(fd, "MKDIR RIL PREV LOG", {"/vendor/bin/mkdir", "-p", previousDestDir.c_str()},
- CommandOptions::WithTimeout(2).Build());
-
- dumpLogs(fd, currentLogDir, currentDestDir, maxFileNum, RIL_LOG_PREFIX);
- dumpLogs(fd, previousLogDir, previousDestDir, maxFileNum, RIL_LOG_PREFIX);
-}
-
-void copyFile(std::string srcFile, std::string destFile) {
- uint8_t buffer[BUFSIZE];
- ssize_t size;
-
- int fdSrc = open(srcFile.c_str(), O_RDONLY);
- if (fdSrc < 0) {
- ALOGD("Failed to open source file %s\n", srcFile.c_str());
- return;
- }
-
- int fdDest = open(destFile.c_str(), O_WRONLY | O_CREAT, 0666);
- if (fdDest < 0) {
- ALOGD("Failed to open destination file %s\n", destFile.c_str());
- close(fdSrc);
- return;
- }
-
- ALOGD("Copying %s to %s\n", srcFile.c_str(), destFile.c_str());
- while ((size = TEMP_FAILURE_RETRY(read(fdSrc, buffer, BUFSIZE))) > 0) {
- TEMP_FAILURE_RETRY(write(fdDest, buffer, size));
- }
-
- close(fdDest);
- close(fdSrc);
-}
-
-void dumpNetmgrLogs(std::string destDir) {
- const std::vector <std::string> netmgrLogs
- {
- "/data/vendor/radio/metrics_data",
- "/data/vendor/radio/omadm_logs.txt",
- "/data/vendor/radio/power_anomaly_data.txt",
- };
- for (const auto& logFile : netmgrLogs) {
- copyFile(logFile, destDir + "/" + basename(logFile.c_str()));
- }
-}
-
timepoint_t startSection(int fd, const std::string &sectionName) {
ATRACE_BEGIN(sectionName.c_str());
::android::base::WriteStringToFd(
@@ -190,11 +73,7 @@ Dumpstate::Dumpstate()
{ "wlan", [this](int fd) { dumpWlanSection(fd); } },
{ "power", [this](int fd) { dumpPowerSection(fd); } },
{ "pixel-trace", [this](int fd) { dumpPixelTraceSection(fd); } },
- },
- mLogSections{
- { "radio", [this](int fd, const std::string &destDir) { dumpRadioLogs(fd, destDir); } },
- } {
-}
+ } {}
// Dump data requested by an argument to the "dump" interface, or help info
// if the specified section is not supported.
@@ -464,17 +343,6 @@ void Dumpstate::dumpPowerSection(int fd) {
}
-void Dumpstate::dumpRadioLogs(int fd, const std::string &destDir) {
- std::string tcpdumpLogDir = TCPDUMP_LOG_DIRECTORY;
- bool tcpdumpEnabled = ::android::base::GetBoolProperty(TCPDUMP_PERSIST_PROPERTY, false);
-
- if (tcpdumpEnabled) {
- dumpLogs(fd, tcpdumpLogDir, destDir, ::android::base::GetIntProperty(TCPDUMP_NUMBER_BUGREPORT, 5), TCPDUMP_LOG_PREFIX);
- }
- dumpRilLogs(fd, destDir);
- dumpNetmgrLogs(destDir);
-}
-
void Dumpstate::dumpLogSection(int fd, int fd_bin)
{
std::string logDir = MODEM_LOG_DIRECTORY;
@@ -485,15 +353,6 @@ void Dumpstate::dumpLogSection(int fd, int fd_bin)
dumpTextSection(fd, kAllSections);
- // Dump all module logs
- if (!PropertiesHelper::IsUserBuild()) {
- for (const auto &section : mLogSections) {
- auto startTime = startSection(fd, section.first);
- section.second(fd, logAllDir);
- endSection(fd, section.first, startTime);
- }
- }
-
RunCommandToFd(fd, "TAR LOG", {"/vendor/bin/tar", "cvf", logCombined.c_str(), "-C", logAllDir.c_str(), "."}, CommandOptions::WithTimeout(20).Build());
RunCommandToFd(fd, "CHG PERM", {"/vendor/bin/chmod", "a+w", logCombined.c_str()}, CommandOptions::WithTimeout(2).Build());
diff --git a/dumpstate/Dumpstate.h b/dumpstate/Dumpstate.h
index 3065dda..a6d6bcf 100644
--- a/dumpstate/Dumpstate.h
+++ b/dumpstate/Dumpstate.h
@@ -43,10 +43,6 @@ class Dumpstate : public BnDumpstateDevice {
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;
-
- void dumpLogs(int fd, std::string srcDir, std::string destDir, int maxFileNum,
- const char *logPrefix);
void dumpTextSection(int fd, std::string const& sectionName);
@@ -58,12 +54,6 @@ class Dumpstate : public BnDumpstateDevice {
void dumpLogSection(int fd, int fdModem);
- // Log sections to be dumped individually into dumpstate_board.bin
- void dumpRadioLogs(int fd, const std::string &destDir);
-
- // Hybrid and binary sections that require an additional file descriptor
- void dumpRilLogs(int fd, std::string destDir);
-
//bool getVerboseLoggingEnabledImpl();
//::ndk::ScopedAStatus dumpstateBoardImpl(const int fd, const bool full);
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 17:45:37 +0000