From e41debd8d2c26cecb05e9f97d0cadbc7738edf5e Mon Sep 17 00:00:00 2001 From: Wilson Sung Date: Thu, 23 Mar 2023 05:58:08 +0000 Subject: [PATCH] Revert "Move pixel dumpstate to gs-common" Revert submission 22188471-dumpstate aidl Reason for revert: Build break Reverted changes: /q/submissionid:22188471-dumpstate+aidl Bug: 274858145 Change-Id: I4fcd0ee39b9448e2b73bb0ab6891b2a5fcd6e566 --- device.mk | 5 +- dumpstate/Android.bp | 25 ++ dumpstate/Dumpstate.cpp | 215 ++++++++++++++++++ dumpstate/Dumpstate.h | 53 +++++ ...android.hardware.dumpstate-service.zuma.rc | 5 + ...ndroid.hardware.dumpstate-service.zuma.xml | 9 + dumpstate/service.cpp | 37 +++ 7 files changed, 348 insertions(+), 1 deletion(-) create mode 100644 dumpstate/Dumpstate.cpp create mode 100644 dumpstate/Dumpstate.h create mode 100644 dumpstate/android.hardware.dumpstate-service.zuma.rc create mode 100644 dumpstate/android.hardware.dumpstate-service.zuma.xml create mode 100644 dumpstate/service.cpp diff --git a/device.mk b/device.mk index 57b7e261..31506052 100644 --- a/device.mk +++ b/device.mk @@ -31,7 +31,6 @@ include device/google/gs-common/display/dump.mk include device/google/gs-common/gxp/dump.mk include device/google/gs-common/camera/dump.mk include device/google/gs-common/radio/dump.mk -include device/google/gs-common/gear/dumpstate/aidl.mk include device/google/zuma/dumpstate/item.mk @@ -456,6 +455,10 @@ include hardware/google/pixel/rebalance_interrupts/rebalance_interrupts.mk PRODUCT_PACKAGES += \ android.hardware.power.stats-service.pixel +# dumpstate HAL +PRODUCT_PACKAGES += \ + android.hardware.dumpstate-service.zuma + # # Audio HALs # diff --git a/dumpstate/Android.bp b/dumpstate/Android.bp index 7494e694..6d53152c 100644 --- a/dumpstate/Android.bp +++ b/dumpstate/Android.bp @@ -23,3 +23,28 @@ sh_binary { sub_dir: "dump", } +cc_binary { + name: "android.hardware.dumpstate-service.zuma", + srcs: [ + "Dumpstate.cpp", + "service.cpp", + ], + init_rc: ["android.hardware.dumpstate-service.zuma.rc"], + vintf_fragments: ["android.hardware.dumpstate-service.zuma.xml"], + cflags: [ + "-Wall", + "-Werror", + ], + shared_libs: [ + "libbase", + "libbinder_ndk", + "libcutils", + "libdumpstateutil", + "liblog", + "libutils", + "libdump", + "android.hardware.dumpstate-V1-ndk", + ], + vendor: true, + relative_install_path: "hw", +} diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp new file mode 100644 index 00000000..550d95ec --- /dev/null +++ b/dumpstate/Dumpstate.cpp @@ -0,0 +1,215 @@ +/* + * 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" + +#include + +#include +#include +#include +#include +#include +#include +#include +#include "Dumpstate.h" + +#include "DumpstateUtil.h" + +#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 { + +typedef std::chrono::time_point timepoint_t; + +const char kVerboseLoggingProperty[] = "persist.vendor.verbose_logging_enabled"; + +timepoint_t startSection(int fd, const std::string §ionName) { + ::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) { + auto endTime = std::chrono::steady_clock::now(); + auto elapsedMsec = std::chrono::duration_cast + (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(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. dump_soc) are" + "not avalable from the command line.\n", fd); +} + +void Dumpstate::dumpLogSection(int fd, int fd_bin) +{ + std::string logDir = MODEM_LOG_DIRECTORY; + const std::string logCombined = logDir + "/combined_logs.tar"; + const std::string logAllDir = logDir + "/all_logs"; + + RunCommandToFd(fd, "MKDIR LOG", {"/vendor/bin/mkdir", "-p", logAllDir.c_str()}, CommandOptions::WithTimeout(2).Build()); + + dumpTextSection(fd, kAllSections); + + 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()); + + std::vector buffer(65536); + ::android::base::unique_fd fdLog(TEMP_FAILURE_RETRY(open(logCombined.c_str(), O_RDONLY | O_CLOEXEC | O_NONBLOCK))); + + 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", logCombined.c_str(), strerror(errno)); + break; + } + + ssize_t result = TEMP_FAILURE_RETRY(write(fd_bin, buffer.data(), bytes_read)); + + if (result != bytes_read) { + ALOGD("Failed to write %ld bytes, actually written: %ld", bytes_read, result); + break; + } + } + } + + RunCommandToFd(fd, "RM LOG DIR", { "/vendor/bin/rm", "-r", logAllDir.c_str()}, CommandOptions::WithTimeout(2).Build()); + RunCommandToFd(fd, "RM LOG", { "/vendor/bin/rm", logCombined.c_str()}, CommandOptions::WithTimeout(2).Build()); +} + +ndk::ScopedAStatus Dumpstate::dumpstateBoard(const std::vector<::ndk::ScopedFileDescriptor>& in_fds, + IDumpstateDevice::DumpstateMode in_mode, + int64_t in_timeoutMillis) { + // Unused arguments. + (void) in_timeoutMillis; + (void) in_mode; + + 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_fds.size() < 2) { + ALOGE("no FD for dumpstate_board binary\n"); + } else { + int fd_bin = in_fds[1].get(); + dumpLogSection(fd, fd_bin); + } + + 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(args[0])); + + fsync(fd); + return STATUS_OK; +} + +} // namespace dumpstate +} // namespace hardware +} // namespace android +} // namespace aidl diff --git a/dumpstate/Dumpstate.h b/dumpstate/Dumpstate.h new file mode 100644 index 00000000..787b7747 --- /dev/null +++ b/dumpstate/Dumpstate.h @@ -0,0 +1,53 @@ +/* + * 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. + */ + +#pragma once + +#include +#include +#include + +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); + void dumpLogSection(int fd, int fdModem); + + //bool getVerboseLoggingEnabledImpl(); + //::ndk::ScopedAStatus dumpstateBoardImpl(const int fd, const bool full); +}; + +} // namespace dumpstate +} // namespace hardware +} // namespace android +} // namespace aidl diff --git a/dumpstate/android.hardware.dumpstate-service.zuma.rc b/dumpstate/android.hardware.dumpstate-service.zuma.rc new file mode 100644 index 00000000..e73602bb --- /dev/null +++ b/dumpstate/android.hardware.dumpstate-service.zuma.rc @@ -0,0 +1,5 @@ +service vendor.dumpstate-default /vendor/bin/hw/android.hardware.dumpstate-service.zuma + class hal + user system + group system shell + interface aidl android.hardware.dumpstate.IDumpstateDevice/default diff --git a/dumpstate/android.hardware.dumpstate-service.zuma.xml b/dumpstate/android.hardware.dumpstate-service.zuma.xml new file mode 100644 index 00000000..5e51b287 --- /dev/null +++ b/dumpstate/android.hardware.dumpstate-service.zuma.xml @@ -0,0 +1,9 @@ + + + android.hardware.dumpstate + + IDumpstateDevice + default + + + diff --git a/dumpstate/service.cpp b/dumpstate/service.cpp new file mode 100644 index 00000000..1953fd67 --- /dev/null +++ b/dumpstate/service.cpp @@ -0,0 +1,37 @@ +/* + * 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.zuma" + +#include "Dumpstate.h" + +#include +#include +#include + +using aidl::android::hardware::dumpstate::Dumpstate; + +int main() { + ABinderProcess_setThreadPoolMaxThreadCount(0); + std::shared_ptr dumpstate = ndk::SharedRefBase::make(); + + 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 +}