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

Merge "move ril dump to gs-common" into udc-dev

Browse source
This commit is contained in:
Adam Shih 2023-03-09 05:10:39 +00:00 • committed by Android (Google) Code Review
commit 3d0464984f
2 changed files with 1 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
device.mk
View file

@ -30,6 +30,7 @@ include device/google/gs-common/gps/dump/log.mk
include device/google/gs-common/display/dump.mk include device/google/gs-common/display/dump.mk
include device/google/gs-common/gxp/dump.mk include device/google/gs-common/gxp/dump.mk
include device/google/gs-common/camera/dump.mk include device/google/gs-common/camera/dump.mk
include device/google/gs-common/radio/dump.mk
include device/google/zuma/dumpstate/item.mk include device/google/zuma/dumpstate/item.mk

25
dumpstate/Dumpstate.cpp
View file

@ -29,9 +29,6 @@
#include "DumpstateUtil.h" #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 MODEM_LOGGING_PERSIST_PROPERTY "persist.vendor.sys.modem.logging.enable" #define MODEM_LOGGING_PERSIST_PROPERTY "persist.vendor.sys.modem.logging.enable"
#define MODEM_LOGGING_PROPERTY "vendor.sys.modem.logging.enable" #define MODEM_LOGGING_PROPERTY "vendor.sys.modem.logging.enable"
#define MODEM_LOGGING_STATUS_PROPERTY "vendor.sys.modem.logging.status" #define MODEM_LOGGING_STATUS_PROPERTY "vendor.sys.modem.logging.status"
@ -55,7 +52,6 @@ namespace hardware {
namespace dumpstate { namespace dumpstate {
#define MODEM_LOG_PREFIX "sbuff_" #define MODEM_LOG_PREFIX "sbuff_"
#define RIL_LOG_PREFIX "rild.log."
#define BUFSIZE 65536 #define BUFSIZE 65536
#define TCPDUMP_LOG_PREFIX "tcpdump" #define TCPDUMP_LOG_PREFIX "tcpdump"
@ -109,26 +105,6 @@ void Dumpstate::dumpLogs(int fd, std::string srcDir, std::string destDir, int ma
free(dirent_list); 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) { void copyFile(std::string srcFile, std::string destFile) {
uint8_t buffer[BUFSIZE]; uint8_t buffer[BUFSIZE];
ssize_t size; ssize_t size;
@ -244,7 +220,6 @@ void Dumpstate::dumpRadioLogs(int fd, const std::string &destDir) {
if (tcpdumpEnabled) { if (tcpdumpEnabled) {
dumpLogs(fd, tcpdumpLogDir, destDir, ::android::base::GetIntProperty(TCPDUMP_NUMBER_BUGREPORT, 5), TCPDUMP_LOG_PREFIX); dumpLogs(fd, tcpdumpLogDir, destDir, ::android::base::GetIntProperty(TCPDUMP_NUMBER_BUGREPORT, 5), TCPDUMP_LOG_PREFIX);
} }
dumpRilLogs(fd, destDir);
dumpNetmgrLogs(destDir); dumpNetmgrLogs(destDir);
} }