summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZiyi Cui <ziyic@google.com>2022-10-06 06:16:49 +0000
committerZiyi Cui <ziyic@google.com>2022-11-29 21:29:45 +0000
commit6fcf739e42f283f7a0d36a7a5ac82da417c36a30 (patch)
treec4a32e77c2ab17cfd49a1d19dfae7df01b2275e6
parentce1c10a14c999c40bc77fad1c6f20fced3223333 (diff)
pixelatom: implement atom log function for long irq atom
Implement log function for long irq metrics atom Bug: 227809911 Bug: 232541623 Test: Verified the existence of atom and correctness of atom stats adb shell cmd stats print-logs && logcat -b all | grep -i 105043 Signed-off-by: Ziyi Cui <ziyic@google.com> Merged-In: I2fffd36772dda1e590a09f8d8fcaf3164f74aafb Change-Id: I2fffd36772dda1e590a09f8d8fcaf3164f74aafb (cherry picked from commit 10613eb0db34072c38078d4fb73a3f1e979d24af)
-rw-r--r--pixelstats/SysfsCollector.cpp130
-rw-r--r--pixelstats/include/pixelstats/SysfsCollector.h8
2 files changed, 137 insertions, 1 deletions
diff --git a/pixelstats/SysfsCollector.cpp b/pixelstats/SysfsCollector.cpp
index 3223f64..698644f 100644
--- a/pixelstats/SysfsCollector.cpp
+++ b/pixelstats/SysfsCollector.cpp
@@ -55,6 +55,7 @@ using android::hardware::google::pixel::PixelAtoms::ThermalDfsStats;
using android::hardware::google::pixel::PixelAtoms::VendorAudioHardwareStatsReported;
using android::hardware::google::pixel::PixelAtoms::VendorChargeCycles;
using android::hardware::google::pixel::PixelAtoms::VendorHardwareFailed;
+using android::hardware::google::pixel::PixelAtoms::VendorLongIRQStatsReported;
using android::hardware::google::pixel::PixelAtoms::VendorSlowIo;
using android::hardware::google::pixel::PixelAtoms::VendorSpeakerImpedance;
using android::hardware::google::pixel::PixelAtoms::VendorSpeakerStatsReported;
@@ -91,7 +92,8 @@ SysfsCollector::SysfsCollector(const struct SysfsPaths &sysfs_paths)
kAmsRatePath(sysfs_paths.AmsRatePath),
kThermalStatsPaths(sysfs_paths.ThermalStatsPaths),
kCCARatePath(sysfs_paths.CCARatePath),
- kTempResidencyPath(sysfs_paths.TempResidencyPath) {}
+ kTempResidencyPath(sysfs_paths.TempResidencyPath),
+ kLongIRQMetricsPath(sysfs_paths.LongIRQMetricsPath) {}
bool SysfsCollector::ReadFileToInt(const std::string &path, int *val) {
return ReadFileToInt(path.c_str(), val);
@@ -1050,6 +1052,131 @@ void SysfsCollector::logVendorAudioHardwareStats(const std::shared_ptr<IStats> &
ALOGE("Unable to report VendorAudioHardwareStatsReported to Stats service");
}
+bool cmp(const std::pair<int, int64_t> &a, const std::pair<int, int64_t> &b) {
+ return a.second > b.second;
+}
+
+/**
+ * Sort irq stats by irq latency, and load top 5 irq stats.
+ */
+void process_irqatom_values(std::vector<std::pair<int, int64_t>> sorted_pair,
+ std::vector<VendorAtomValue> *values) {
+ VendorAtomValue tmp;
+ sort(sorted_pair.begin(), sorted_pair.end(), cmp);
+ int irq_stats_size = sorted_pair.size();
+ for (int i = 0; i < 5; i++) {
+ if (irq_stats_size < 5 && i >= irq_stats_size) {
+ tmp.set<VendorAtomValue::longValue>(-1);
+ values->push_back(tmp);
+ tmp.set<VendorAtomValue::longValue>(0);
+ values->push_back(tmp);
+ } else {
+ tmp.set<VendorAtomValue::longValue>(sorted_pair[i].first);
+ values->push_back(tmp);
+ tmp.set<VendorAtomValue::longValue>(sorted_pair[i].second);
+ values->push_back(tmp);
+ }
+ }
+}
+
+/**
+ * Logs the Long irq stats.
+ */
+void SysfsCollector::logVendorLongIRQStatsReported(const std::shared_ptr<IStats> &stats_client) {
+ std::string file_contents;
+ if (!kLongIRQMetricsPath) {
+ ALOGV("LongIRQ path not specified");
+ return;
+ }
+ if (!ReadFileToString(kLongIRQMetricsPath, &file_contents)) {
+ ALOGE("Unable to LongIRQ %s - %s", kLongIRQMetricsPath, strerror(errno));
+ return;
+ }
+ int offset = 0;
+ int bytes_read;
+ const char *data = file_contents.c_str();
+ int data_len = file_contents.length();
+ // Get, process, store softirq stats
+ std::vector<std::pair<int, int64_t>> sorted_softirq_pair;
+ int64_t softirq_count;
+ if (sscanf(data + offset, "long SOFTIRQ count: %ld\n%n", &softirq_count, &bytes_read) != 1)
+ return;
+ offset += bytes_read;
+ if (offset >= data_len)
+ return;
+ std::vector<VendorAtomValue> values;
+ VendorAtomValue tmp;
+ if (softirq_count - prev_data.softirq_count < 0) {
+ tmp.set<VendorAtomValue::intValue>(-1);
+ ALOGI("long softirq count get overflow");
+ } else {
+ tmp.set<VendorAtomValue::longValue>(softirq_count - prev_data.softirq_count);
+ }
+ values.push_back(tmp);
+
+ if (sscanf(data + offset, "long SOFTIRQ detail (num, latency):\n%n", &bytes_read) != 0)
+ return;
+ offset += bytes_read;
+ if (offset >= data_len)
+ return;
+
+ // Iterate over softirq stats and record top 5 long softirq
+ int64_t softirq_latency;
+ int softirq_num;
+ while (sscanf(data + offset, "%d %ld\n%n", &softirq_num, &softirq_latency, &bytes_read) == 2) {
+ sorted_softirq_pair.push_back(std::make_pair(softirq_num, softirq_latency));
+ offset += bytes_read;
+ if (offset >= data_len)
+ return;
+ }
+ process_irqatom_values(sorted_softirq_pair, &values);
+
+ // Get, process, store irq stats
+ std::vector<std::pair<int, int64_t>> sorted_irq_pair;
+ int64_t irq_count;
+ if (sscanf(data + offset, "long IRQ count: %ld\n%n", &irq_count, &bytes_read) != 1)
+ return;
+ offset += bytes_read;
+ if (offset >= data_len)
+ return;
+ if (irq_count - prev_data.irq_count < 0) {
+ tmp.set<VendorAtomValue::intValue>(-1);
+ ALOGI("long irq count get overflow");
+ } else {
+ tmp.set<VendorAtomValue::longValue>(irq_count - prev_data.irq_count);
+ }
+ values.push_back(tmp);
+
+ if (sscanf(data + offset, "long IRQ detail (num, latency):\n%n", &bytes_read) != 0)
+ return;
+ offset += bytes_read;
+ if (offset >= data_len)
+ return;
+
+ int64_t irq_latency;
+ int irq_num;
+ int index = 0;
+ // Iterate over softirq stats and record top 5 long irq
+ while (sscanf(data + offset, "%d %ld\n%n", &irq_num, &irq_latency, &bytes_read) == 2) {
+ sorted_irq_pair.push_back(std::make_pair(irq_num, irq_latency));
+ offset += bytes_read;
+ if (offset >= data_len && index < 5)
+ return;
+ index += 1;
+ }
+ process_irqatom_values(sorted_irq_pair, &values);
+
+ prev_data.softirq_count = softirq_count;
+ prev_data.irq_count = irq_count;
+ // Send vendor atom to IStats HAL
+ VendorAtom event = {.reverseDomainName = "",
+ .atomId = PixelAtoms::Atom::kVendorLongIrqStatsReported,
+ .values = std::move(values)};
+ const ndk::ScopedAStatus ret = stats_client->reportVendorAtom(event);
+ if (!ret.isOk())
+ ALOGE("Unable to report kVendorLongIRQStatsReported to Stats service");
+}
+
void SysfsCollector::logPerDay() {
const std::shared_ptr<IStats> stats_client = getStatsService();
if (!stats_client) {
@@ -1082,6 +1209,7 @@ void SysfsCollector::logPerDay() {
logVendorAudioHardwareStats(stats_client);
logThermalStats(stats_client);
logTempResidencyStats(stats_client);
+ logVendorLongIRQStatsReported(stats_client);
}
void SysfsCollector::aggregatePer5Min() {
diff --git a/pixelstats/include/pixelstats/SysfsCollector.h b/pixelstats/include/pixelstats/SysfsCollector.h
index 8ee1ec6..e0aef81 100644
--- a/pixelstats/include/pixelstats/SysfsCollector.h
+++ b/pixelstats/include/pixelstats/SysfsCollector.h
@@ -67,6 +67,7 @@ class SysfsCollector {
const std::vector<std::string> ThermalStatsPaths;
const char *const CCARatePath;
const char *const TempResidencyPath;
+ const char *const LongIRQMetricsPath;
};
SysfsCollector(const struct SysfsPaths &paths);
@@ -107,6 +108,7 @@ class SysfsCollector {
void reportZramBdStat(const std::shared_ptr<IStats> &stats_client);
int getReclaimedSegments(const std::string &mode);
void logVendorAudioHardwareStats(const std::shared_ptr<IStats> &stats_client);
+ void logVendorLongIRQStatsReported(const std::shared_ptr<IStats> &stats_client);
const char *const kSlowioReadCntPath;
const char *const kSlowioWriteCntPath;
@@ -136,6 +138,7 @@ class SysfsCollector {
const std::vector<std::string> kThermalStatsPaths;
const char *const kCCARatePath;
const char *const kTempResidencyPath;
+ const char *const kLongIRQMetricsPath;
BatteryEEPROMReporter battery_EEPROM_reporter_;
MmMetricsReporter mm_metrics_reporter_;
@@ -150,6 +153,11 @@ class SysfsCollector {
bool log_once_reported = false;
int64_t prev_huge_pages_since_boot_ = -1;
+ struct perf_metrics_data {
+ int64_t softirq_count;
+ int64_t irq_count;
+ };
+ struct perf_metrics_data prev_data;
};
} // namespace pixel