Evolution-x-devices/device_google_redfin
2
0
Fork 0
mirror of https://github.com/Evolution-X-Devices/device_google_redfin synced 2026-02-01 05:34:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pause modem logging earlier to avoid timeout

Browse Source 
Bug: 148300450
Change-Id: I76eb29a80d8f6b0e3f424c046fb4620e9a4434ab
This commit is contained in:
Jie Song
2020-01-28 17:11:07 -08:00
committed by Cyan_Hsieh
parent c6331ae847
commit 2eb6949659
1 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
dumpstate/DumpstateDevice.cpp
View File

@@ -63,6 +63,32 @@ namespace implementation {
#define TCPDUMP_LOG_PREFIX "tcpdump"
#define EXTENDED_LOG_PREFIX "extended_log_"
static bool isModemLoggingEnabled() {
return android::base::GetBoolProperty(DIAG_MDLOG_PERSIST_PROPERTY, false);
}
static bool isModemLoggingRunning() {
return android::base::GetBoolProperty(DIAG_MDLOG_STATUS_PROPERTY, false);
}
static void stopModemLogging() {
if (PropertiesHelper::IsUserBuild()) {
return;
}
android::base::SetProperty(DIAG_MDLOG_PROPERTY, "false");
ALOGD("Stopping diag_mdlog...\n");
}
static void startModemLogging() {
if (PropertiesHelper::IsUserBuild()) {
return;
}
ALOGD("Starting diag_mdlog...\n");
android::base::SetProperty(DIAG_MDLOG_PROPERTY, "true");
}
void DumpstateDevice::dumpLogs(int fd, std::string srcDir, std::string destDir,
int maxFileNum, const char *logPrefix) {
struct dirent **dirent_list = NULL;
@@ -163,35 +189,18 @@ void DumpstateDevice::dumpModem(int fd, int fdModem)
"/sys/kernel/debug/ipa/ipa_statistics_msg"
};
bool smlogEnabled = android::base::GetBoolProperty(MODEM_LOGGING_SWITCH, false) && !access("/vendor/bin/smlog_dump", X_OK);
bool diagLogEnabled = android::base::GetBoolProperty(DIAG_MDLOG_PERSIST_PROPERTY, false);
bool tcpdumpEnabled = android::base::GetBoolProperty(TCPDUMP_PERSIST_PROPERTY, false);
if (smlogEnabled) {
RunCommandToFd(fd, "SMLOG DUMP", {"smlog_dump", "-d", "-o", modemLogAllDir.c_str()}, CommandOptions::WithTimeout(10).Build());
} else if (diagLogEnabled) {
bool diagLogStarted = android::base::GetBoolProperty( DIAG_MDLOG_STATUS_PROPERTY, false);
if (diagLogStarted) {
android::base::SetProperty(DIAG_MDLOG_PROPERTY, "false");
ALOGD("Stopping diag_mdlog...\n");
if (android::base::WaitForProperty(DIAG_MDLOG_STATUS_PROPERTY, "false", std::chrono::seconds(20))) {
ALOGD("diag_mdlog exited");
} else {
ALOGE("Waited mdlog timeout after 20 second");
}
if (isModemLoggingEnabled()) {
if (isModemLoggingRunning()) {
ALOGD("diag_mdlog is running");
} else {
ALOGD("diag_mdlog is not running");
}
dumpLogs(fd, diagLogDir, modemLogAllDir, android::base::GetIntProperty(DIAG_MDLOG_NUMBER_BUGREPORT, 100), DIAG_LOG_PREFIX);
if (diagLogStarted) {
ALOGD("Restarting diag_mdlog...");
android::base::SetProperty(DIAG_MDLOG_PROPERTY, "true");
}
}
bool tcpdumpEnabled = android::base::GetBoolProperty(TCPDUMP_PERSIST_PROPERTY, false);
if (tcpdumpEnabled) {
dumpLogs(fd, tcpdumpLogDir, modemLogAllDir, android::base::GetIntProperty(TCPDUMP_NUMBER_BUGREPORT, 5), TCPDUMP_LOG_PREFIX);
}
@@ -466,6 +475,12 @@ Return<void> DumpstateDevice::dumpstateBoard(const hidl_handle& handle) {
return Void();
}
bool modemLogging = isModemLoggingRunning();
if (isModemLoggingEnabled() && modemLogging) {
stopModemLogging();
}
RunCommandToFd(fd, "Notify modem", {"/vendor/bin/modem_svc", "-s"}, CommandOptions::WithTimeout(1).Build());
RunCommandToFd(fd, "VENDOR PROPERTIES", {"/vendor/bin/getprop"});
DumpFileToFd(fd, "SoC serial number", "/sys/devices/soc0/serial_number");
@@ -542,6 +557,10 @@ Return<void> DumpstateDevice::dumpstateBoard(const hidl_handle& handle) {
dumpModem(fd, fdModem);
}
if (isModemLoggingEnabled() && modemLogging) {
startModemLogging();
}
// Citadel info
RunCommandToFd(fd, "Citadel VERSION", {"/vendor/bin/hw/citadel_updater", "-lv"});
RunCommandToFd(fd, "Citadel STATS", {"/vendor/bin/hw/citadel_updater", "--stats"});