Add tracepoints to dumpstate_board sections am: 9df2606139

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/22553206

Change-Id: I50b32cc45e13fe6d10b03a796d88965a68d747da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kevin Jeon 2023-04-11 14:23:05 +00:00 committed by Automerger Merge Worker
commit cf3ca3fae5

View File

@ -15,6 +15,7 @@
*/ */
#define LOG_TAG "dumpstate_device" #define LOG_TAG "dumpstate_device"
#define ATRACE_TAG ATRACE_TAG_ALWAYS
#include <inttypes.h> #include <inttypes.h>
@ -22,6 +23,7 @@
#include <android-base/stringprintf.h> #include <android-base/stringprintf.h>
#include <android-base/properties.h> #include <android-base/properties.h>
#include <android-base/unique_fd.h> #include <android-base/unique_fd.h>
#include <cutils/trace.h>
#include <log/log.h> #include <log/log.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <dump/pixel_dump.h> #include <dump/pixel_dump.h>
@ -46,6 +48,7 @@ typedef std::chrono::time_point<std::chrono::steady_clock> timepoint_t;
const char kVerboseLoggingProperty[] = "persist.vendor.verbose_logging_enabled"; const char kVerboseLoggingProperty[] = "persist.vendor.verbose_logging_enabled";
timepoint_t startSection(int fd, const std::string &sectionName) { timepoint_t startSection(int fd, const std::string &sectionName) {
ATRACE_BEGIN(sectionName.c_str());
::android::base::WriteStringToFd( ::android::base::WriteStringToFd(
"\n" "\n"
"------ Section start: " + sectionName + " ------\n" "------ Section start: " + sectionName + " ------\n"
@ -54,6 +57,7 @@ timepoint_t startSection(int fd, const std::string &sectionName) {
} }
void endSection(int fd, const std::string &sectionName, timepoint_t startTime) { void endSection(int fd, const std::string &sectionName, timepoint_t startTime) {
ATRACE_END();
auto endTime = std::chrono::steady_clock::now(); auto endTime = std::chrono::steady_clock::now();
auto elapsedMsec = std::chrono::duration_cast<std::chrono::milliseconds> auto elapsedMsec = std::chrono::duration_cast<std::chrono::milliseconds>
(endTime - startTime).count(); (endTime - startTime).count();
@ -152,6 +156,7 @@ void Dumpstate::dumpLogSection(int fd, int fd_bin)
ndk::ScopedAStatus Dumpstate::dumpstateBoard(const std::vector<::ndk::ScopedFileDescriptor>& in_fds, ndk::ScopedAStatus Dumpstate::dumpstateBoard(const std::vector<::ndk::ScopedFileDescriptor>& in_fds,
IDumpstateDevice::DumpstateMode in_mode, IDumpstateDevice::DumpstateMode in_mode,
int64_t in_timeoutMillis) { int64_t in_timeoutMillis) {
ATRACE_BEGIN("dumpstateBoard");
// Unused arguments. // Unused arguments.
(void) in_timeoutMillis; (void) in_timeoutMillis;
@ -181,6 +186,7 @@ ndk::ScopedAStatus Dumpstate::dumpstateBoard(const std::vector<::ndk::ScopedFile
dumpLogSection(fd, fd_bin); dumpLogSection(fd, fd_bin);
} }
ATRACE_END();
return ndk::ScopedAStatus::ok(); return ndk::ScopedAStatus::ok();
} }