Use dumpstate from gs-common
Bug: 273380985 Test: adb bugreport Change-Id: I2ef2c029bf2d7c3982c3035ec8b8b6c8eddf641e
This commit is contained in:
Adam Shih
parent
e6a9d48932
commit
b4920665cc
7 changed files with 4 additions and 613 deletions
|
|
@ -26,6 +26,10 @@ include device/google/gs-common/pixel_metrics/pixel_metrics.mk
|
||||||
include device/google/gs-common/performance/perf.mk
|
include device/google/gs-common/performance/perf.mk
|
||||||
include device/google/gs-common/display/dump.mk
|
include device/google/gs-common/display/dump.mk
|
||||||
include device/google/gs101/dumpstate/item.mk
|
include device/google/gs101/dumpstate/item.mk
|
||||||
|
include device/google/gs-common/radio/dump.mk
|
||||||
|
include device/google/gs-common/gear/dumpstate/aidl.mk
|
||||||
|
include device/google/gs-common/camera/dump.mk
|
||||||
|
include device/google/gs-common/gps/dump/log.mk
|
||||||
|
|
||||||
TARGET_BOARD_PLATFORM := gs101
|
TARGET_BOARD_PLATFORM := gs101
|
||||||
DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)
|
DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)
|
||||||
|
|
@ -469,10 +473,6 @@ include hardware/google/pixel/rebalance_interrupts/rebalance_interrupts.mk
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
android.hardware.power.stats-service.pixel
|
android.hardware.power.stats-service.pixel
|
||||||
|
|
||||||
# dumpstate HAL
|
|
||||||
PRODUCT_PACKAGES += \
|
|
||||||
android.hardware.dumpstate-service.gs101
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Audio HALs
|
# Audio HALs
|
||||||
#
|
#
|
||||||
|
|
|
||||||
|
|
@ -9,27 +9,3 @@ sh_binary {
|
||||||
sub_dir: "dump",
|
sub_dir: "dump",
|
||||||
}
|
}
|
||||||
|
|
||||||
cc_binary {
|
|
||||||
name: "android.hardware.dumpstate-service.gs101",
|
|
||||||
srcs: [
|
|
||||||
"Dumpstate.cpp",
|
|
||||||
"service.cpp",
|
|
||||||
],
|
|
||||||
init_rc: ["android.hardware.dumpstate-service.gs101.rc"],
|
|
||||||
vintf_fragments: ["android.hardware.dumpstate-service.gs101.xml"],
|
|
||||||
cflags: [
|
|
||||||
"-Wall",
|
|
||||||
"-Werror",
|
|
||||||
],
|
|
||||||
shared_libs: [
|
|
||||||
"libbase",
|
|
||||||
"libbinder_ndk",
|
|
||||||
"libcutils",
|
|
||||||
"libdumpstateutil",
|
|
||||||
"liblog",
|
|
||||||
"libutils",
|
|
||||||
"android.hardware.dumpstate-V1-ndk",
|
|
||||||
],
|
|
||||||
vendor: true,
|
|
||||||
relative_install_path: "hw",
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -1,486 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright 2016 The Android Open Source Project
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define LOG_TAG "dumpstate_device"
|
|
||||||
#define ATRACE_TAG ATRACE_TAG_ALWAYS
|
|
||||||
|
|
||||||
#include <inttypes.h>
|
|
||||||
|
|
||||||
#include <android-base/file.h>
|
|
||||||
#include <android-base/stringprintf.h>
|
|
||||||
#include <android-base/properties.h>
|
|
||||||
#include <android-base/unique_fd.h>
|
|
||||||
#include <cutils/trace.h>
|
|
||||||
#include <log/log.h>
|
|
||||||
#include <pthread.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
|
|
||||||
#include "Dumpstate.h"
|
|
||||||
|
|
||||||
#include "DumpstateUtil.h"
|
|
||||||
|
|
||||||
#define MODEM_LOG_DIRECTORY "/data/vendor/radio/logs/always-on"
|
|
||||||
#define MODEM_EXTENDED_LOG_DIRECTORY "/data/vendor/radio/extended_logs"
|
|
||||||
#define MODEM_LOG_HISTORY_DIRECTORY "/data/vendor/radio/logs/history"
|
|
||||||
#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_PROPERTY "vendor.sys.modem.logging.enable"
|
|
||||||
#define MODEM_LOGGING_STATUS_PROPERTY "vendor.sys.modem.logging.status"
|
|
||||||
#define MODEM_LOGGING_NUMBER_BUGREPORT_PROPERTY "persist.vendor.sys.modem.logging.br_num"
|
|
||||||
#define MODEM_LOGGING_PATH_PROPERTY "vendor.sys.modem.logging.log_path"
|
|
||||||
#define GPS_LOG_DIRECTORY "/data/vendor/gps/logs"
|
|
||||||
#define GPS_LOG_NUMBER_PROPERTY "persist.vendor.gps.aol.log_num"
|
|
||||||
#define GPS_LOGGING_STATUS_PROPERTY "vendor.gps.aol.enabled"
|
|
||||||
|
|
||||||
#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"
|
|
||||||
|
|
||||||
#define HW_REVISION "ro.boot.hardware.revision"
|
|
||||||
|
|
||||||
using android::os::dumpstate::CommandOptions;
|
|
||||||
using android::os::dumpstate::DumpFileToFd;
|
|
||||||
using android::os::dumpstate::PropertiesHelper;
|
|
||||||
using android::os::dumpstate::RunCommandToFd;
|
|
||||||
|
|
||||||
namespace aidl {
|
|
||||||
namespace android {
|
|
||||||
namespace hardware {
|
|
||||||
namespace dumpstate {
|
|
||||||
|
|
||||||
#define GPS_LOG_PREFIX "gl-"
|
|
||||||
#define GPS_MCU_LOG_PREFIX "esw-"
|
|
||||||
#define MODEM_LOG_PREFIX "sbuff_"
|
|
||||||
#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 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 dumpLogs(int fd, std::string srcDir, std::string destDir, int maxFileNum,
|
|
||||||
const char *logPrefix) {
|
|
||||||
(void) fd;
|
|
||||||
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++;
|
|
||||||
|
|
||||||
std::string srcLogFile = srcDir + "/" + dirent_list[i]->d_name;
|
|
||||||
std::string destLogFile = destDir + "/" + dirent_list[i]->d_name;
|
|
||||||
copyFile(srcLogFile, destLogFile);
|
|
||||||
|
|
||||||
ALOGD("Copying %s to %s\n", srcLogFile.c_str(), destLogFile.c_str());
|
|
||||||
}
|
|
||||||
|
|
||||||
while (num_entries--) {
|
|
||||||
free(dirent_list[num_entries]);
|
|
||||||
}
|
|
||||||
|
|
||||||
free(dirent_list);
|
|
||||||
}
|
|
||||||
|
|
||||||
void 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 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()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Dumps last synced NV data into bugreports */
|
|
||||||
void dumpModemEFS(std::string destDir) {
|
|
||||||
const std::string EFS_DIRECTORY = "/mnt/vendor/efs/";
|
|
||||||
const std::vector <std::string> nv_files
|
|
||||||
{
|
|
||||||
EFS_DIRECTORY+"nv_normal.bin",
|
|
||||||
EFS_DIRECTORY+"nv_protected.bin",
|
|
||||||
};
|
|
||||||
for (const auto& logFile : nv_files) {
|
|
||||||
copyFile(logFile, destDir + "/" + basename(logFile.c_str()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void dumpGpsLogs(int fd, std::string destDir) {
|
|
||||||
const std::string gpsLogDir = GPS_LOG_DIRECTORY;
|
|
||||||
const std::string gpsTmpLogDir = gpsLogDir + "/.tmp";
|
|
||||||
const std::string gpsDestDir = destDir + "/gps";
|
|
||||||
int maxFileNum = ::android::base::GetIntProperty(GPS_LOG_NUMBER_PROPERTY, 20);
|
|
||||||
|
|
||||||
RunCommandToFd(fd, "MKDIR GPS LOG", {"/vendor/bin/mkdir", "-p", gpsDestDir.c_str()},
|
|
||||||
CommandOptions::WithTimeout(2).Build());
|
|
||||||
|
|
||||||
dumpLogs(fd, gpsTmpLogDir, gpsDestDir, 1, GPS_LOG_PREFIX);
|
|
||||||
dumpLogs(fd, gpsLogDir, gpsDestDir, 3, GPS_MCU_LOG_PREFIX);
|
|
||||||
dumpLogs(fd, gpsLogDir, gpsDestDir, maxFileNum, GPS_LOG_PREFIX);
|
|
||||||
}
|
|
||||||
|
|
||||||
void dumpCameraLogs(int fd, const std::string &destDir) {
|
|
||||||
static const std::string kCameraLogDir = "/data/vendor/camera/profiler";
|
|
||||||
const std::string cameraDestDir = destDir + "/camera";
|
|
||||||
RunCommandToFd(fd, "MKDIR CAMERA LOG", {"/vendor/bin/mkdir", "-p", cameraDestDir.c_str()},
|
|
||||||
CommandOptions::WithTimeout(2).Build());
|
|
||||||
// Attach multiple latest sessions (in case the user is running concurrent
|
|
||||||
// sessions or starts a new session after the one with performance issues).
|
|
||||||
dumpLogs(fd, kCameraLogDir, cameraDestDir, 10, "session-ended-");
|
|
||||||
dumpLogs(fd, kCameraLogDir, cameraDestDir, 5, "high-drop-rate-");
|
|
||||||
dumpLogs(fd, kCameraLogDir, cameraDestDir, 5, "watchdog-");
|
|
||||||
dumpLogs(fd, kCameraLogDir, cameraDestDir, 5, "camera-ended-");
|
|
||||||
}
|
|
||||||
|
|
||||||
timepoint_t startSection(int fd, const std::string §ionName) {
|
|
||||||
ATRACE_BEGIN(sectionName.c_str());
|
|
||||||
::android::base::WriteStringToFd(
|
|
||||||
"\n"
|
|
||||||
"------ Section start: " + sectionName + " ------\n"
|
|
||||||
"\n", fd);
|
|
||||||
return std::chrono::steady_clock::now();
|
|
||||||
}
|
|
||||||
|
|
||||||
void endSection(int fd, const std::string §ionName, timepoint_t startTime) {
|
|
||||||
ATRACE_END();
|
|
||||||
auto endTime = std::chrono::steady_clock::now();
|
|
||||||
auto elapsedMsec = std::chrono::duration_cast<std::chrono::milliseconds>
|
|
||||||
(endTime - startTime).count();
|
|
||||||
|
|
||||||
::android::base::WriteStringToFd(
|
|
||||||
"\n"
|
|
||||||
"------ Section end: " + sectionName + " ------\n"
|
|
||||||
"Elapsed msec: " + std::to_string(elapsedMsec) + "\n"
|
|
||||||
"\n", fd);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dump data requested by an argument to the "dump" interface, or help info
|
|
||||||
// if the specified section is not supported.
|
|
||||||
void Dumpstate::dumpTextSection(int fd, const std::string §ionName) {
|
|
||||||
bool dumpAll = (sectionName == kAllSections);
|
|
||||||
std::string dumpFiles;
|
|
||||||
|
|
||||||
// Execute all or designated programs under vendor/bin/dump/
|
|
||||||
std::unique_ptr<DIR, decltype(&closedir)> dir(opendir("/vendor/bin/dump"), closedir);
|
|
||||||
if (!dir) {
|
|
||||||
ALOGE("Fail To Open Dir vendor/bin/dump/");
|
|
||||||
::android::base::WriteStringToFd("Fail To Open Dir vendor/bin/dump/\n", fd);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
dirent *entry;
|
|
||||||
while ((entry = readdir(dir.get())) != nullptr) {
|
|
||||||
// Skip '.', '..'
|
|
||||||
if (entry->d_name[0] == '.') {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
std::string bin(entry->d_name);
|
|
||||||
dumpFiles = dumpFiles + " " + bin;
|
|
||||||
if (dumpAll || sectionName == bin) {
|
|
||||||
auto startTime = startSection(fd, bin);
|
|
||||||
RunCommandToFd(fd, "/vendor/bin/dump/"+bin, {"/vendor/bin/dump/"+bin}, CommandOptions::WithTimeout(15).Build());
|
|
||||||
endSection(fd, bin, startTime);
|
|
||||||
if (!dumpAll) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dumpAll) {
|
|
||||||
RunCommandToFd(fd, "VENDOR PROPERTIES", {"/vendor/bin/getprop"});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// An unsupported section was requested on the command line
|
|
||||||
::android::base::WriteStringToFd("Unrecognized text section: " + sectionName + "\n", fd);
|
|
||||||
::android::base::WriteStringToFd("Try \"" + kAllSections + "\" or one of the following:", fd);
|
|
||||||
::android::base::WriteStringToFd(dumpFiles, fd);
|
|
||||||
::android::base::WriteStringToFd("\nNote: sections with attachments (e.g. modem) are"
|
|
||||||
"not avalable from the command line.\n", fd);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void *dumpModemThread(void *data) {
|
|
||||||
ATRACE_ASYNC_BEGIN("dumpModemThread", 0);
|
|
||||||
std::string modemLogDir = MODEM_LOG_DIRECTORY;
|
|
||||||
std::string extendedLogDir = MODEM_EXTENDED_LOG_DIRECTORY;
|
|
||||||
std::string modemLogHistoryDir = MODEM_LOG_HISTORY_DIRECTORY;
|
|
||||||
std::string tcpdumpLogDir = TCPDUMP_LOG_DIRECTORY;
|
|
||||||
static const std::string sectionName = "modem";
|
|
||||||
|
|
||||||
const std::string modemLogCombined = modemLogDir + "/modem_log_all.tar";
|
|
||||||
const std::string modemLogAllDir = modemLogDir + "/modem_log";
|
|
||||||
|
|
||||||
long fdModem = (long)data;
|
|
||||||
|
|
||||||
ALOGD("dumpModemThread started\n");
|
|
||||||
|
|
||||||
RunCommandToFd(STDOUT_FILENO, "MKDIR MODEM LOG", {"/vendor/bin/mkdir", "-p", modemLogAllDir.c_str()}, CommandOptions::WithTimeout(2).Build());
|
|
||||||
|
|
||||||
bool modemLogEnabled = ::android::base::GetBoolProperty(MODEM_LOGGING_PERSIST_PROPERTY, false);
|
|
||||||
if (modemLogEnabled && ::android::base::GetProperty(MODEM_LOGGING_PATH_PROPERTY, "") == MODEM_LOG_DIRECTORY) {
|
|
||||||
bool modemLogStarted = ::android::base::GetBoolProperty(MODEM_LOGGING_STATUS_PROPERTY, false);
|
|
||||||
int maxFileNum = ::android::base::GetIntProperty(MODEM_LOGGING_NUMBER_BUGREPORT_PROPERTY, 100);
|
|
||||||
|
|
||||||
if (modemLogStarted) {
|
|
||||||
::android::base::SetProperty(MODEM_LOGGING_PROPERTY, "false");
|
|
||||||
ALOGD("Stopping modem logging...\n");
|
|
||||||
} else {
|
|
||||||
ALOGD("modem logging is not running\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int i = 0; i < 15; i++) {
|
|
||||||
if (!::android::base::GetBoolProperty(MODEM_LOGGING_STATUS_PROPERTY, false)) {
|
|
||||||
ALOGD("modem logging stopped\n");
|
|
||||||
sleep(1);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
sleep(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
dumpLogs(STDOUT_FILENO, modemLogDir, modemLogAllDir, maxFileNum, MODEM_LOG_PREFIX);
|
|
||||||
|
|
||||||
if (modemLogStarted) {
|
|
||||||
ALOGD("Restarting modem logging...\n");
|
|
||||||
::android::base::SetProperty(MODEM_LOGGING_PROPERTY, "true");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!PropertiesHelper::IsUserBuild()) {
|
|
||||||
bool gpsLogEnabled = ::android::base::GetBoolProperty(GPS_LOGGING_STATUS_PROPERTY, false);
|
|
||||||
bool tcpdumpEnabled = ::android::base::GetBoolProperty(TCPDUMP_PERSIST_PROPERTY, false);
|
|
||||||
bool cameraLogsEnabled = ::android::base::GetBoolProperty(
|
|
||||||
"vendor.camera.debug.camera_performance_analyzer.attach_to_bugreport", true);
|
|
||||||
|
|
||||||
if (tcpdumpEnabled) {
|
|
||||||
dumpLogs(STDOUT_FILENO, tcpdumpLogDir, modemLogAllDir, ::android::base::GetIntProperty(TCPDUMP_NUMBER_BUGREPORT, 5), TCPDUMP_LOG_PREFIX);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (gpsLogEnabled) {
|
|
||||||
dumpGpsLogs(STDOUT_FILENO, modemLogAllDir);
|
|
||||||
} else {
|
|
||||||
ALOGD("gps logging is not running\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cameraLogsEnabled) {
|
|
||||||
dumpCameraLogs(STDOUT_FILENO, modemLogAllDir);
|
|
||||||
}
|
|
||||||
|
|
||||||
dumpLogs(STDOUT_FILENO, extendedLogDir, modemLogAllDir, 50, EXTENDED_LOG_PREFIX);
|
|
||||||
dumpLogs(STDOUT_FILENO, modemLogHistoryDir, modemLogAllDir, 2, "Logging");
|
|
||||||
dumpRilLogs(STDOUT_FILENO, modemLogAllDir);
|
|
||||||
dumpNetmgrLogs(modemLogAllDir);
|
|
||||||
dumpModemEFS(modemLogAllDir);
|
|
||||||
}
|
|
||||||
|
|
||||||
ALOGD("Going to compress logs\n");
|
|
||||||
|
|
||||||
RunCommandToFd(STDOUT_FILENO, "TAR LOG", {"/vendor/bin/tar", "cvf", modemLogCombined.c_str(), "-C", modemLogAllDir.c_str(), "."}, CommandOptions::WithTimeout(25).Build());
|
|
||||||
RunCommandToFd(STDOUT_FILENO, "CHG PERM", {"/vendor/bin/chmod", "a+w", modemLogCombined.c_str()}, CommandOptions::WithTimeout(2).Build());
|
|
||||||
|
|
||||||
std::vector<uint8_t> buffer(65536);
|
|
||||||
::android::base::unique_fd fdLog(TEMP_FAILURE_RETRY(open(modemLogCombined.c_str(), O_RDONLY | O_CLOEXEC | O_NONBLOCK)));
|
|
||||||
|
|
||||||
ALOGD("Going to write to dumpstate board binary\n");
|
|
||||||
if (fdLog >= 0) {
|
|
||||||
while (1) {
|
|
||||||
ssize_t bytes_read = TEMP_FAILURE_RETRY(read(fdLog, buffer.data(), buffer.size()));
|
|
||||||
|
|
||||||
if (bytes_read == 0) {
|
|
||||||
break;
|
|
||||||
} else if (bytes_read < 0) {
|
|
||||||
ALOGD("read(%s): %s\n", modemLogCombined.c_str(), strerror(errno));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
ssize_t result = TEMP_FAILURE_RETRY(write(fdModem, buffer.data(), bytes_read));
|
|
||||||
|
|
||||||
if (result != bytes_read) {
|
|
||||||
ALOGD("Failed to write %ld bytes, actually written: %ld", bytes_read, result);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ALOGD("Going to remove logs\n");
|
|
||||||
|
|
||||||
RunCommandToFd(STDOUT_FILENO, "RM MODEM DIR", { "/vendor/bin/rm", "-r", modemLogAllDir.c_str()}, CommandOptions::WithTimeout(2).Build());
|
|
||||||
RunCommandToFd(STDOUT_FILENO, "RM LOG", { "/vendor/bin/rm", modemLogCombined.c_str()}, CommandOptions::WithTimeout(2).Build());
|
|
||||||
|
|
||||||
ALOGD("dumpModemThread finished\n");
|
|
||||||
|
|
||||||
ATRACE_ASYNC_END("dumpModemThread", 0);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
ndk::ScopedAStatus Dumpstate::dumpstateBoard(const std::vector<::ndk::ScopedFileDescriptor>& in_fds,
|
|
||||||
IDumpstateDevice::DumpstateMode in_mode,
|
|
||||||
int64_t in_timeoutMillis) {
|
|
||||||
ATRACE_BEGIN("dumpstateBoard");
|
|
||||||
// Unused arguments.
|
|
||||||
(void) in_timeoutMillis;
|
|
||||||
|
|
||||||
if (in_fds.size() < 1) {
|
|
||||||
ALOGE("no FDs\n");
|
|
||||||
return ndk::ScopedAStatus::fromExceptionCodeWithMessage(EX_ILLEGAL_ARGUMENT,
|
|
||||||
"No file descriptor");
|
|
||||||
}
|
|
||||||
|
|
||||||
int fd = in_fds[0].get();
|
|
||||||
if (fd < 0) {
|
|
||||||
ALOGE("invalid FD: %d\n", fd);
|
|
||||||
return ndk::ScopedAStatus::fromExceptionCodeWithMessage(EX_ILLEGAL_ARGUMENT,
|
|
||||||
"Invalid file descriptor");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (in_mode == IDumpstateDevice::DumpstateMode::WEAR) {
|
|
||||||
// We aren't a Wear device.
|
|
||||||
ALOGE("Unsupported mode: %d\n", in_mode);
|
|
||||||
return ndk::ScopedAStatus::fromServiceSpecificErrorWithMessage(ERROR_UNSUPPORTED_MODE,
|
|
||||||
"Unsupported mode");
|
|
||||||
} else if (in_mode < IDumpstateDevice::DumpstateMode::FULL || in_mode > IDumpstateDevice::DumpstateMode::PROTO) {
|
|
||||||
ALOGE("Invalid mode: %d\n", in_mode);
|
|
||||||
return ndk::ScopedAStatus::fromExceptionCodeWithMessage(EX_ILLEGAL_ARGUMENT,
|
|
||||||
"Invalid mode");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create thread to collect modem related logs
|
|
||||||
bool VerboseLogging;
|
|
||||||
getVerboseLoggingEnabled(&VerboseLogging);
|
|
||||||
pthread_t modemThreadHandle = 0;
|
|
||||||
if (VerboseLogging && in_fds.size() > 1) {
|
|
||||||
int fdModem = in_fds[1].get();
|
|
||||||
if (pthread_create(&modemThreadHandle, NULL, dumpModemThread, (void *)((long)fdModem)) != 0) {
|
|
||||||
ALOGE("could not create thread for dumpModem\n");
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
ALOGD("Verbose logging is not enabled or no fd for modem.\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
dumpTextSection(fd, kAllSections);
|
|
||||||
|
|
||||||
if (modemThreadHandle) {
|
|
||||||
pthread_join(modemThreadHandle, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
ATRACE_END();
|
|
||||||
return ndk::ScopedAStatus::ok();
|
|
||||||
}
|
|
||||||
|
|
||||||
ndk::ScopedAStatus Dumpstate::setVerboseLoggingEnabled(bool in_enable) {
|
|
||||||
::android::base::SetProperty(kVerboseLoggingProperty, in_enable ? "true" : "false");
|
|
||||||
return ndk::ScopedAStatus::ok();
|
|
||||||
}
|
|
||||||
|
|
||||||
ndk::ScopedAStatus Dumpstate::getVerboseLoggingEnabled(bool* _aidl_return) {
|
|
||||||
*_aidl_return = ::android::base::GetBoolProperty(kVerboseLoggingProperty, false);
|
|
||||||
return ndk::ScopedAStatus::ok();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Since AIDLs that support the dump() interface are automatically invoked during
|
|
||||||
// bugreport generation and we don't want to generate a second copy of the same
|
|
||||||
// data that will go into dumpstate_board.txt, this function will only do
|
|
||||||
// something if it is called with an option, e.g.
|
|
||||||
// dumpsys android.hardware.dumpstate.IDumpstateDevice/default all
|
|
||||||
//
|
|
||||||
// Also, note that sections which generate attachments and/or binary data when
|
|
||||||
// included in a bugreport are not available through the dump() interface.
|
|
||||||
binder_status_t Dumpstate::dump(int fd, const char** args, uint32_t numArgs) {
|
|
||||||
|
|
||||||
if (numArgs != 1) {
|
|
||||||
return STATUS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
dumpTextSection(fd, static_cast<std::string>(args[0]));
|
|
||||||
|
|
||||||
fsync(fd);
|
|
||||||
return STATUS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace dumpstate
|
|
||||||
} // namespace hardware
|
|
||||||
} // namespace android
|
|
||||||
} // namespace aidl
|
|
||||||
|
|
@ -1,48 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2016 The Android Open Source Project
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <aidl/android/hardware/dumpstate/BnDumpstateDevice.h>
|
|
||||||
#include <aidl/android/hardware/dumpstate/IDumpstateDevice.h>
|
|
||||||
#include <android/binder_status.h>
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
namespace aidl {
|
|
||||||
namespace android {
|
|
||||||
namespace hardware {
|
|
||||||
namespace dumpstate {
|
|
||||||
|
|
||||||
class Dumpstate : public BnDumpstateDevice {
|
|
||||||
public:
|
|
||||||
::ndk::ScopedAStatus dumpstateBoard(const std::vector<::ndk::ScopedFileDescriptor>& in_fds,
|
|
||||||
IDumpstateDevice::DumpstateMode in_mode,
|
|
||||||
int64_t in_timeoutMillis) override;
|
|
||||||
|
|
||||||
::ndk::ScopedAStatus getVerboseLoggingEnabled(bool* _aidl_return) override;
|
|
||||||
::ndk::ScopedAStatus setVerboseLoggingEnabled(bool in_enable) override;
|
|
||||||
binder_status_t dump(int fd, const char** args, uint32_t numArgs) override;
|
|
||||||
|
|
||||||
private:
|
|
||||||
const std::string kAllSections = "all";
|
|
||||||
|
|
||||||
void dumpTextSection(int fd, std::string const& sectionName);
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace dumpstate
|
|
||||||
} // namespace hardware
|
|
||||||
} // namespace android
|
|
||||||
} // namespace aidl
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
service vendor.dumpstate-default /vendor/bin/hw/android.hardware.dumpstate-service.gs101
|
|
||||||
class hal
|
|
||||||
user system
|
|
||||||
group system shell
|
|
||||||
interface aidl android.hardware.dumpstate.IDumpstateDevice/default
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
<manifest version="1.0" type="device">
|
|
||||||
<hal format="aidl">
|
|
||||||
<name>android.hardware.dumpstate</name>
|
|
||||||
<interface>
|
|
||||||
<name>IDumpstateDevice</name>
|
|
||||||
<instance>default</instance>
|
|
||||||
</interface>
|
|
||||||
</hal>
|
|
||||||
</manifest>
|
|
||||||
|
|
@ -1,37 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2022 The Android Open Source Project
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
#define LOG_TAG "android.hardware.dumpstate-service.gs101"
|
|
||||||
|
|
||||||
#include "Dumpstate.h"
|
|
||||||
|
|
||||||
#include <android-base/logging.h>
|
|
||||||
#include <android/binder_manager.h>
|
|
||||||
#include <android/binder_process.h>
|
|
||||||
|
|
||||||
using aidl::android::hardware::dumpstate::Dumpstate;
|
|
||||||
|
|
||||||
int main() {
|
|
||||||
ABinderProcess_setThreadPoolMaxThreadCount(0);
|
|
||||||
std::shared_ptr<Dumpstate> dumpstate = ndk::SharedRefBase::make<Dumpstate>();
|
|
||||||
|
|
||||||
const std::string instance = std::string() + Dumpstate::descriptor + "/default";
|
|
||||||
binder_status_t status =
|
|
||||||
AServiceManager_addService(dumpstate->asBinder().get(), instance.c_str());
|
|
||||||
CHECK_EQ(status, STATUS_OK);
|
|
||||||
|
|
||||||
ABinderProcess_joinThreadPool();
|
|
||||||
return EXIT_FAILURE; // Unreachable
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue