From ec5518919b1e7947d2fb9a8a573f90f0a4cd9c79 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 13 Jun 2025 16:45:04 +0300 Subject: [PATCH] zumapro: Remove pixelstats-vendor This does not build with the current hardware/google/pixel dependencies so make it prebuilt. Change-Id: Ifcbf49fb482164bd72ad0e1f05fa2d48ca2fbc98 --- pixelstats/Android.bp | 42 ------ pixelstats/pixelstats-vendor.zumapro.rc | 13 -- pixelstats/service.cpp | 177 ------------------------ 3 files changed, 232 deletions(-) delete mode 100644 pixelstats/Android.bp delete mode 100644 pixelstats/pixelstats-vendor.zumapro.rc delete mode 100644 pixelstats/service.cpp diff --git a/pixelstats/Android.bp b/pixelstats/Android.bp deleted file mode 100644 index 5389ac5..0000000 --- a/pixelstats/Android.bp +++ /dev/null @@ -1,42 +0,0 @@ -// -// Copyright (C) 2017 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. - -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "//device/google/zumapro:device_google_zumapro_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: [ - "//device/google/zumapro:device_google_zumapro_license", - ], -} - -cc_binary { - name: "pixelstats-vendor", - init_rc: ["pixelstats-vendor.zumapro.rc"], - srcs: [ - "service.cpp", - ], - shared_libs: [ - "libbase", - "liblog", - "libutils", - "libpixelstats", - ], - proprietary: true, - static_libs: ["chre_client"], - header_libs: ["chre_api"], -} diff --git a/pixelstats/pixelstats-vendor.zumapro.rc b/pixelstats/pixelstats-vendor.zumapro.rc deleted file mode 100644 index aca60f7..0000000 --- a/pixelstats/pixelstats-vendor.zumapro.rc +++ /dev/null @@ -1,13 +0,0 @@ -on property:sys.boot_completed=1 - chown system system /sys/class/power_supply/max77779fg/fg_learning_events - chown system system /sys/class/power_supply/max77779fg/fg_abnormal_events - chown system system /sys/class/power_supply/maxfg_base/fg_learning_events - chown system system /sys/devices/platform/maxim,max77779fwu/update_stats - start vendor.pixelstats_vendor -on post-fs-data - chown system system /sys/kernel/metrics/irq/stats_reset -service vendor.pixelstats_vendor /vendor/bin/pixelstats-vendor - class hal - user system - group system context_hub readproc - disabled diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp deleted file mode 100644 index cd35aeb..0000000 --- a/pixelstats/service.cpp +++ /dev/null @@ -1,177 +0,0 @@ -/* - * Copyright (C) 2018 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 "pixelstats" - -#include -#include -#include - -#include - -#include -#include - -using android::hardware::google::pixel::SysfsCollector; -using android::hardware::google::pixel::UeventListener; - -#define UFSHC_PATH(filename) "/dev/sys/block/bootdevice/" #filename -#define UFS_ERR_PATH(err_type) UFSHC_PATH(err_stats/) #err_type -const struct SysfsCollector::SysfsPaths sysfs_paths = { - .SlowioReadCntPath = UFSHC_PATH(slowio_read_cnt), - .SlowioWriteCntPath = UFSHC_PATH(slowio_write_cnt), - .SlowioUnmapCntPath = UFSHC_PATH(slowio_unmap_cnt), - .SlowioSyncCntPath = UFSHC_PATH(slowio_sync_cnt), - .CycleCountBinsPath = "/sys/class/power_supply/battery/cycle_counts", - .UFSLifetimeA = UFSHC_PATH(health_descriptor/life_time_estimation_a), - .UFSLifetimeB = UFSHC_PATH(health_descriptor/life_time_estimation_b), - .UFSLifetimeC = UFSHC_PATH(health_descriptor/life_time_estimation_c), - .F2fsStatsPath = "/sys/fs/f2fs/", - .ImpedancePath = "/sys/devices/platform/audiometrics/speaker_impedance", - .CodecPath = "/sys/devices/platform/audiometrics/codec_state", - .EEPROMPath = "/dev/battery_history", - .MitigationPath = "/sys/devices/virtual/pmic/mitigation", - .BrownoutReasonProp = "vendor.brownout_reason", - .BrownoutCsvPath = "/data/vendor/mitigation/lastmeal.csv", - .BrownoutLogPath = "/data/vendor/mitigation/lastmeal.txt", - .SpeakerTemperaturePath = "/sys/devices/platform/audiometrics/speaker_temp", - .SpeakerExcursionPath = "/sys/devices/platform/audiometrics/speaker_excursion", - .SpeakerHeartBeatPath = "/sys/devices/platform/audiometrics/speaker_heartbeat", - .UFSErrStatsPath = { - UFS_ERR_PATH(pa_err_count), - UFS_ERR_PATH(dl_err_count), - UFS_ERR_PATH(nl_err_count), - UFS_ERR_PATH(tl_err_count), - UFS_ERR_PATH(dme_err_count), - UFS_ERR_PATH(fatal_err_count), - UFS_ERR_PATH(auto_hibern8_err_count) - }, - .AmsRatePath = "/sys/devices/platform/audiometrics/ams_rate_read_once", - .ResumeLatencyMetricsPath = "/sys/kernel/metrics/resume_latency/resume_latency_metrics", - .LongIRQMetricsPath = "/sys/kernel/metrics/irq/long_irq_metrics", - .StormIRQMetricsPath = "/sys/kernel/metrics/irq/storm_irq_metrics", - .IRQStatsResetPath = "/sys/kernel/metrics/irq/stats_reset", - .ThermalStatsPaths = { - "/sys/devices/platform/100a0000.BIG/trip_counter", - "/sys/devices/platform/100a0000.MID/trip_counter", - "/sys/devices/platform/100a0000.LITTLE/trip_counter", - "/sys/devices/platform/100b0000.G3D/trip_counter", - "/sys/devices/platform/100b0000.TPU/trip_counter", - "/sys/devices/platform/100b0000.AUR/trip_counter", - }, - .TempResidencyAndResetPaths = { - { - "/sys/kernel/metrics/thermal/tr_by_group/tmu/stats", - "/sys/kernel/metrics/thermal/tr_by_group/tmu/stats_reset" - }, - { - "/sys/kernel/metrics/thermal/tr_by_group/spmic/stats", - "/sys/kernel/metrics/thermal/tr_by_group/spmic/stats_reset" - } - }, - .ModemPcieLinkStatsPath = "/sys/devices/platform/12100000.pcie/link_stats", - .WifiPcieLinkStatsPath = "/sys/devices/platform/13120000.pcie/link_stats", - .GMSRPath = { - "/sys/class/power_supply/max77779fg/gmsr", - "/sys/class/power_supply/maxfg_base/gmsr", - }, - .FGModelLoadingPath = { - "/sys/class/power_supply/max77779fg/model_state", - "/sys/class/power_supply/maxfg_base/model_state" - }, - .FGLogBufferPath = { - "/dev/logbuffer_maxfg_monitor", - "/dev/logbuffer_max77779fg_monitor", - "/dev/logbuffer_maxfg_base_monitor", - "/dev/logbuffer_maxfg_secondary_monitor" - }, - .PDMStatePath = "/sys/devices/platform/audiometrics/pdm_state", - .WavesPath = "/sys/devices/platform/audiometrics/waves", - .AdaptedInfoCountPath = "/sys/devices/platform/audiometrics/adapted_info_active_count", - .AdaptedInfoDurationPath = "/sys/devices/platform/audiometrics/adapted_info_active_duration", - .CCARatePath = "/sys/devices/platform/audiometrics/cca_count_read_once", - .PcmLatencyPath = "/sys/devices/platform/audiometrics/pcm_latency", - .PcmCountPath = "/sys/devices/platform/audiometrics/pcm_count", - .TotalCallCountPath = "/sys/devices/platform/audiometrics/call_count", - .OffloadEffectsIdPath = "/sys/devices/platform/audiometrics/offload_effects_id", - .OffloadEffectsDurationPath = "/sys/devices/platform/audiometrics/offload_effects_duration", - .BluetoothAudioUsagePath = "/sys/devices/platform/audiometrics/bt_usage", - .DisplayPortStatsPaths = { - "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/link_negotiation_failures", - "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/edid_read_failures", - "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/dpcd_read_failures", - "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/edid_invalid_failures", - "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/sink_count_invalid_failures", - "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/link_unstable_failures", - }, - .DisplayPortDSCStatsPaths = { - "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/fec_dsc_supported", - "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/fec_dsc_not_supported", - }, - .DisplayPortMaxResolutionStatsPaths = { - "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_other", - "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_1366_768", - "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_1440_900", - "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_1600_900", - "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_1920_1080", - "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_2560_1080", - "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_2560_1440", - "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_3440_1440", - "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_3840_2160", - "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_5120_2880", - "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_7680_4320", - }, - .HDCPStatsPaths = { - "/sys/devices/platform/hdcp/hdcp2_success_count", - "/sys/devices/platform/hdcp/hdcp2_fallback_count", - "/sys/devices/platform/hdcp/hdcp2_fail_count", - "/sys/devices/platform/hdcp/hdcp1_success_count", - "/sys/devices/platform/hdcp/hdcp1_fail_count", - "/sys/devices/platform/hdcp/hdcp0_count", - }, - .DisplayStatsPaths = { - "/sys/devices/platform/exynos-drm/primary-panel/error_count_te", - "/sys/devices/platform/exynos-drm/primary-panel/error_count_unknown", - "/sys/devices/platform/exynos-drm/secondary-panel/error_count_te", - "/sys/devices/platform/exynos-drm/secondary-panel/error_count_unknown", - }, - .SpeakerVersionPath = "/sys/devices/platform/audiometrics/speaker_version" -}; - -const struct UeventListener::UeventPaths ueventPaths = { - .AudioUevent = "/devices/virtual/amcs/amcs", - .TypeCPartnerUevent = "PRODUCT_TYPE=", - .FwUpdatePath = { - "/dev/logbuffer_max77779_fwupdate", - }, - .FGAbnlPath = { - "/dev/logbuffer_max77779fg_monitor", - "/dev/logbuffer_maxfg_base_monitor", - } - }; - -int main() { - LOG(INFO) << "starting PixelStats"; - - UeventListener ueventListener(ueventPaths); - std::thread listenThread(&UeventListener::ListenForever, &ueventListener); - listenThread.detach(); - - SysfsCollector collector(sysfs_paths); - collector.collect(); // This blocks forever. - - return 0; -}