Merge "perfetto: switch sys stats counter to use proto lite not pzero"
diff --git a/Android.bp b/Android.bp
index 83d55df..8e6341e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4366,7 +4366,6 @@
name: "trace_to_text",
srcs: [
":perfetto_protos_perfetto_common_lite_gen",
- ":perfetto_protos_perfetto_common_zero_gen",
":perfetto_protos_perfetto_config_lite_gen",
":perfetto_protos_perfetto_trace_chrome_lite_gen",
":perfetto_protos_perfetto_trace_filesystem_lite_gen",
@@ -4375,24 +4374,6 @@
":perfetto_protos_perfetto_trace_minimal_lite_gen",
":perfetto_protos_perfetto_trace_ps_lite_gen",
":perfetto_protos_perfetto_trace_sys_stats_lite_gen",
- "src/base/event.cc",
- "src/base/file_utils.cc",
- "src/base/metatrace.cc",
- "src/base/page_allocator.cc",
- "src/base/string_splitter.cc",
- "src/base/string_utils.cc",
- "src/base/temp_file.cc",
- "src/base/thread_checker.cc",
- "src/base/time.cc",
- "src/base/unix_task_runner.cc",
- "src/base/virtual_destructors.cc",
- "src/base/watchdog_posix.cc",
- "src/protozero/message.cc",
- "src/protozero/message_handle.cc",
- "src/protozero/proto_decoder.cc",
- "src/protozero/proto_field_descriptor.cc",
- "src/protozero/scattered_stream_null_delegate.cc",
- "src/protozero/scattered_stream_writer.cc",
"tools/trace_to_text/ftrace_event_formatter.cc",
"tools/trace_to_text/ftrace_inode_handler.cc",
"tools/trace_to_text/main.cc",
@@ -4402,12 +4383,8 @@
"libprotobuf-cpp-full",
"libprotobuf-cpp-lite",
],
- static_libs: [
- "libgtest_prod",
- ],
generated_headers: [
"perfetto_protos_perfetto_common_lite_gen_headers",
- "perfetto_protos_perfetto_common_zero_gen_headers",
"perfetto_protos_perfetto_config_lite_gen_headers",
"perfetto_protos_perfetto_trace_chrome_lite_gen_headers",
"perfetto_protos_perfetto_trace_filesystem_lite_gen_headers",
diff --git a/include/perfetto/traced/BUILD.gn b/include/perfetto/traced/BUILD.gn
index f7dc66f..2c2760b 100644
--- a/include/perfetto/traced/BUILD.gn
+++ b/include/perfetto/traced/BUILD.gn
@@ -24,7 +24,7 @@
"../../../gn:default_deps",
]
public_deps = [
- "../../../protos/perfetto/common:zero",
+ "../../../protos/perfetto/common:lite",
"../base",
]
sources = [
diff --git a/include/perfetto/traced/sys_stats_counters.h b/include/perfetto/traced/sys_stats_counters.h
index 98d25af..f52651a 100644
--- a/include/perfetto/traced/sys_stats_counters.h
+++ b/include/perfetto/traced/sys_stats_counters.h
@@ -18,7 +18,7 @@
#define INCLUDE_PERFETTO_TRACED_SYS_STATS_COUNTERS_H_
#include "perfetto/base/utils.h"
-#include "perfetto/common/sys_stats_counters.pbzero.h"
+#include "perfetto/common/sys_stats_counters.pb.h"
#include <vector>
@@ -30,181 +30,161 @@
};
constexpr KeyAndId kMeminfoKeys[] = {
- {"MemUnspecified", protos::pbzero::MeminfoCounters::MEMINFO_UNSPECIFIED},
- {"MemTotal", protos::pbzero::MeminfoCounters::MEMINFO_MEM_TOTAL},
- {"MemFree", protos::pbzero::MeminfoCounters::MEMINFO_MEM_FREE},
- {"MemAvailable", protos::pbzero::MeminfoCounters::MEMINFO_MEM_AVAILABLE},
- {"Buffers", protos::pbzero::MeminfoCounters::MEMINFO_BUFFERS},
- {"Cached", protos::pbzero::MeminfoCounters::MEMINFO_CACHED},
- {"SwapCached", protos::pbzero::MeminfoCounters::MEMINFO_SWAP_CACHED},
- {"Active", protos::pbzero::MeminfoCounters::MEMINFO_ACTIVE},
- {"Inactive", protos::pbzero::MeminfoCounters::MEMINFO_INACTIVE},
- {"Active(anon)", protos::pbzero::MeminfoCounters::MEMINFO_ACTIVE_ANON},
- {"Inactive(anon)", protos::pbzero::MeminfoCounters::MEMINFO_INACTIVE_ANON},
- {"Active(file)", protos::pbzero::MeminfoCounters::MEMINFO_ACTIVE_FILE},
- {"Inactive(file)", protos::pbzero::MeminfoCounters::MEMINFO_INACTIVE_FILE},
- {"Unevictable", protos::pbzero::MeminfoCounters::MEMINFO_UNEVICTABLE},
- {"Mlocked", protos::pbzero::MeminfoCounters::MEMINFO_MLOCKED},
- {"SwapTotal", protos::pbzero::MeminfoCounters::MEMINFO_SWAP_TOTAL},
- {"SwapFree", protos::pbzero::MeminfoCounters::MEMINFO_SWAP_FREE},
- {"Dirty", protos::pbzero::MeminfoCounters::MEMINFO_DIRTY},
- {"Writeback", protos::pbzero::MeminfoCounters::MEMINFO_WRITEBACK},
- {"AnonPages", protos::pbzero::MeminfoCounters::MEMINFO_ANON_PAGES},
- {"Mapped", protos::pbzero::MeminfoCounters::MEMINFO_MAPPED},
- {"Shmem", protos::pbzero::MeminfoCounters::MEMINFO_SHMEM},
- {"Slab", protos::pbzero::MeminfoCounters::MEMINFO_SLAB},
- {"SReclaimable", protos::pbzero::MeminfoCounters::MEMINFO_SLAB_RECLAIMABLE},
- {"SUnreclaim", protos::pbzero::MeminfoCounters::MEMINFO_SLAB_UNRECLAIMABLE},
- {"KernelStack", protos::pbzero::MeminfoCounters::MEMINFO_KERNEL_STACK},
- {"PageTables", protos::pbzero::MeminfoCounters::MEMINFO_PAGE_TABLES},
- {"CommitLimit", protos::pbzero::MeminfoCounters::MEMINFO_COMMIT_LIMIT},
- {"Committed_AS", protos::pbzero::MeminfoCounters::MEMINFO_COMMITED_AS},
- {"VmallocTotal", protos::pbzero::MeminfoCounters::MEMINFO_VMALLOC_TOTAL},
- {"VmallocUsed", protos::pbzero::MeminfoCounters::MEMINFO_VMALLOC_USED},
- {"VmallocChunk", protos::pbzero::MeminfoCounters::MEMINFO_VMALLOC_CHUNK},
- {"CmaTotal", protos::pbzero::MeminfoCounters::MEMINFO_CMA_TOTAL},
- {"CmaFree", protos::pbzero::MeminfoCounters::MEMINFO_CMA_FREE},
+ {"MemUnspecified", protos::MeminfoCounters::MEMINFO_UNSPECIFIED},
+ {"MemTotal", protos::MeminfoCounters::MEMINFO_MEM_TOTAL},
+ {"MemFree", protos::MeminfoCounters::MEMINFO_MEM_FREE},
+ {"MemAvailable", protos::MeminfoCounters::MEMINFO_MEM_AVAILABLE},
+ {"Buffers", protos::MeminfoCounters::MEMINFO_BUFFERS},
+ {"Cached", protos::MeminfoCounters::MEMINFO_CACHED},
+ {"SwapCached", protos::MeminfoCounters::MEMINFO_SWAP_CACHED},
+ {"Active", protos::MeminfoCounters::MEMINFO_ACTIVE},
+ {"Inactive", protos::MeminfoCounters::MEMINFO_INACTIVE},
+ {"Active(anon)", protos::MeminfoCounters::MEMINFO_ACTIVE_ANON},
+ {"Inactive(anon)", protos::MeminfoCounters::MEMINFO_INACTIVE_ANON},
+ {"Active(file)", protos::MeminfoCounters::MEMINFO_ACTIVE_FILE},
+ {"Inactive(file)", protos::MeminfoCounters::MEMINFO_INACTIVE_FILE},
+ {"Unevictable", protos::MeminfoCounters::MEMINFO_UNEVICTABLE},
+ {"Mlocked", protos::MeminfoCounters::MEMINFO_MLOCKED},
+ {"SwapTotal", protos::MeminfoCounters::MEMINFO_SWAP_TOTAL},
+ {"SwapFree", protos::MeminfoCounters::MEMINFO_SWAP_FREE},
+ {"Dirty", protos::MeminfoCounters::MEMINFO_DIRTY},
+ {"Writeback", protos::MeminfoCounters::MEMINFO_WRITEBACK},
+ {"AnonPages", protos::MeminfoCounters::MEMINFO_ANON_PAGES},
+ {"Mapped", protos::MeminfoCounters::MEMINFO_MAPPED},
+ {"Shmem", protos::MeminfoCounters::MEMINFO_SHMEM},
+ {"Slab", protos::MeminfoCounters::MEMINFO_SLAB},
+ {"SReclaimable", protos::MeminfoCounters::MEMINFO_SLAB_RECLAIMABLE},
+ {"SUnreclaim", protos::MeminfoCounters::MEMINFO_SLAB_UNRECLAIMABLE},
+ {"KernelStack", protos::MeminfoCounters::MEMINFO_KERNEL_STACK},
+ {"PageTables", protos::MeminfoCounters::MEMINFO_PAGE_TABLES},
+ {"CommitLimit", protos::MeminfoCounters::MEMINFO_COMMIT_LIMIT},
+ {"Committed_AS", protos::MeminfoCounters::MEMINFO_COMMITED_AS},
+ {"VmallocTotal", protos::MeminfoCounters::MEMINFO_VMALLOC_TOTAL},
+ {"VmallocUsed", protos::MeminfoCounters::MEMINFO_VMALLOC_USED},
+ {"VmallocChunk", protos::MeminfoCounters::MEMINFO_VMALLOC_CHUNK},
+ {"CmaTotal", protos::MeminfoCounters::MEMINFO_CMA_TOTAL},
+ {"CmaFree", protos::MeminfoCounters::MEMINFO_CMA_FREE},
};
const KeyAndId kVmstatKeys[] = {
- {"VmstatUnspecified", protos::pbzero::VmstatCounters::VMSTAT_UNSPECIFIED},
- {"nr_free_pages", protos::pbzero::VmstatCounters::VMSTAT_NR_FREE_PAGES},
- {"nr_alloc_batch", protos::pbzero::VmstatCounters::VMSTAT_NR_ALLOC_BATCH},
- {"nr_inactive_anon",
- protos::pbzero::VmstatCounters::VMSTAT_NR_INACTIVE_ANON},
- {"nr_active_anon", protos::pbzero::VmstatCounters::VMSTAT_NR_ACTIVE_ANON},
- {"nr_inactive_file",
- protos::pbzero::VmstatCounters::VMSTAT_NR_INACTIVE_FILE},
- {"nr_active_file", protos::pbzero::VmstatCounters::VMSTAT_NR_ACTIVE_FILE},
- {"nr_unevictable", protos::pbzero::VmstatCounters::VMSTAT_NR_UNEVICTABLE},
- {"nr_mlock", protos::pbzero::VmstatCounters::VMSTAT_NR_MLOCK},
- {"nr_anon_pages", protos::pbzero::VmstatCounters::VMSTAT_NR_ANON_PAGES},
- {"nr_mapped", protos::pbzero::VmstatCounters::VMSTAT_NR_MAPPED},
- {"nr_file_pages", protos::pbzero::VmstatCounters::VMSTAT_NR_FILE_PAGES},
- {"nr_dirty", protos::pbzero::VmstatCounters::VMSTAT_NR_DIRTY},
- {"nr_writeback", protos::pbzero::VmstatCounters::VMSTAT_NR_WRITEBACK},
- {"nr_slab_reclaimable",
- protos::pbzero::VmstatCounters::VMSTAT_NR_SLAB_RECLAIMABLE},
+ {"VmstatUnspecified", protos::VmstatCounters::VMSTAT_UNSPECIFIED},
+ {"nr_free_pages", protos::VmstatCounters::VMSTAT_NR_FREE_PAGES},
+ {"nr_alloc_batch", protos::VmstatCounters::VMSTAT_NR_ALLOC_BATCH},
+ {"nr_inactive_anon", protos::VmstatCounters::VMSTAT_NR_INACTIVE_ANON},
+ {"nr_active_anon", protos::VmstatCounters::VMSTAT_NR_ACTIVE_ANON},
+ {"nr_inactive_file", protos::VmstatCounters::VMSTAT_NR_INACTIVE_FILE},
+ {"nr_active_file", protos::VmstatCounters::VMSTAT_NR_ACTIVE_FILE},
+ {"nr_unevictable", protos::VmstatCounters::VMSTAT_NR_UNEVICTABLE},
+ {"nr_mlock", protos::VmstatCounters::VMSTAT_NR_MLOCK},
+ {"nr_anon_pages", protos::VmstatCounters::VMSTAT_NR_ANON_PAGES},
+ {"nr_mapped", protos::VmstatCounters::VMSTAT_NR_MAPPED},
+ {"nr_file_pages", protos::VmstatCounters::VMSTAT_NR_FILE_PAGES},
+ {"nr_dirty", protos::VmstatCounters::VMSTAT_NR_DIRTY},
+ {"nr_writeback", protos::VmstatCounters::VMSTAT_NR_WRITEBACK},
+ {"nr_slab_reclaimable", protos::VmstatCounters::VMSTAT_NR_SLAB_RECLAIMABLE},
{"nr_slab_unreclaimable",
- protos::pbzero::VmstatCounters::VMSTAT_NR_SLAB_UNRECLAIMABLE},
- {"nr_page_table_pages",
- protos::pbzero::VmstatCounters::VMSTAT_NR_PAGE_TABLE_PAGES},
- {"nr_kernel_stack", protos::pbzero::VmstatCounters::VMSTAT_NR_KERNEL_STACK},
- {"nr_overhead", protos::pbzero::VmstatCounters::VMSTAT_NR_OVERHEAD},
- {"nr_unstable", protos::pbzero::VmstatCounters::VMSTAT_NR_UNSTABLE},
- {"nr_bounce", protos::pbzero::VmstatCounters::VMSTAT_NR_BOUNCE},
- {"nr_vmscan_write", protos::pbzero::VmstatCounters::VMSTAT_NR_VMSCAN_WRITE},
+ protos::VmstatCounters::VMSTAT_NR_SLAB_UNRECLAIMABLE},
+ {"nr_page_table_pages", protos::VmstatCounters::VMSTAT_NR_PAGE_TABLE_PAGES},
+ {"nr_kernel_stack", protos::VmstatCounters::VMSTAT_NR_KERNEL_STACK},
+ {"nr_overhead", protos::VmstatCounters::VMSTAT_NR_OVERHEAD},
+ {"nr_unstable", protos::VmstatCounters::VMSTAT_NR_UNSTABLE},
+ {"nr_bounce", protos::VmstatCounters::VMSTAT_NR_BOUNCE},
+ {"nr_vmscan_write", protos::VmstatCounters::VMSTAT_NR_VMSCAN_WRITE},
{"nr_vmscan_immediate_reclaim",
- protos::pbzero::VmstatCounters::VMSTAT_NR_VMSCAN_IMMEDIATE_RECLAIM},
- {"nr_writeback_temp",
- protos::pbzero::VmstatCounters::VMSTAT_NR_WRITEBACK_TEMP},
- {"nr_isolated_anon",
- protos::pbzero::VmstatCounters::VMSTAT_NR_ISOLATED_ANON},
- {"nr_isolated_file",
- protos::pbzero::VmstatCounters::VMSTAT_NR_ISOLATED_FILE},
- {"nr_shmem", protos::pbzero::VmstatCounters::VMSTAT_NR_SHMEM},
- {"nr_dirtied", protos::pbzero::VmstatCounters::VMSTAT_NR_DIRTIED},
- {"nr_written", protos::pbzero::VmstatCounters::VMSTAT_NR_WRITTEN},
- {"nr_pages_scanned",
- protos::pbzero::VmstatCounters::VMSTAT_NR_PAGES_SCANNED},
- {"workingset_refault",
- protos::pbzero::VmstatCounters::VMSTAT_WORKINGSET_REFAULT},
- {"workingset_activate",
- protos::pbzero::VmstatCounters::VMSTAT_WORKINGSET_ACTIVATE},
+ protos::VmstatCounters::VMSTAT_NR_VMSCAN_IMMEDIATE_RECLAIM},
+ {"nr_writeback_temp", protos::VmstatCounters::VMSTAT_NR_WRITEBACK_TEMP},
+ {"nr_isolated_anon", protos::VmstatCounters::VMSTAT_NR_ISOLATED_ANON},
+ {"nr_isolated_file", protos::VmstatCounters::VMSTAT_NR_ISOLATED_FILE},
+ {"nr_shmem", protos::VmstatCounters::VMSTAT_NR_SHMEM},
+ {"nr_dirtied", protos::VmstatCounters::VMSTAT_NR_DIRTIED},
+ {"nr_written", protos::VmstatCounters::VMSTAT_NR_WRITTEN},
+ {"nr_pages_scanned", protos::VmstatCounters::VMSTAT_NR_PAGES_SCANNED},
+ {"workingset_refault", protos::VmstatCounters::VMSTAT_WORKINGSET_REFAULT},
+ {"workingset_activate", protos::VmstatCounters::VMSTAT_WORKINGSET_ACTIVATE},
{"workingset_nodereclaim",
- protos::pbzero::VmstatCounters::VMSTAT_WORKINGSET_NODERECLAIM},
+ protos::VmstatCounters::VMSTAT_WORKINGSET_NODERECLAIM},
{"nr_anon_transparent_hugepages",
- protos::pbzero::VmstatCounters::VMSTAT_NR_ANON_TRANSPARENT_HUGEPAGES},
- {"nr_free_cma", protos::pbzero::VmstatCounters::VMSTAT_NR_FREE_CMA},
- {"nr_swapcache", protos::pbzero::VmstatCounters::VMSTAT_NR_SWAPCACHE},
- {"nr_dirty_threshold",
- protos::pbzero::VmstatCounters::VMSTAT_NR_DIRTY_THRESHOLD},
+ protos::VmstatCounters::VMSTAT_NR_ANON_TRANSPARENT_HUGEPAGES},
+ {"nr_free_cma", protos::VmstatCounters::VMSTAT_NR_FREE_CMA},
+ {"nr_swapcache", protos::VmstatCounters::VMSTAT_NR_SWAPCACHE},
+ {"nr_dirty_threshold", protos::VmstatCounters::VMSTAT_NR_DIRTY_THRESHOLD},
{"nr_dirty_background_threshold",
- protos::pbzero::VmstatCounters::VMSTAT_NR_DIRTY_BACKGROUND_THRESHOLD},
- {"pgpgin", protos::pbzero::VmstatCounters::VMSTAT_PGPGIN},
- {"pgpgout", protos::pbzero::VmstatCounters::VMSTAT_PGPGOUT},
- {"pgpgoutclean", protos::pbzero::VmstatCounters::VMSTAT_PGPGOUTCLEAN},
- {"pswpin", protos::pbzero::VmstatCounters::VMSTAT_PSWPIN},
- {"pswpout", protos::pbzero::VmstatCounters::VMSTAT_PSWPOUT},
- {"pgalloc_dma", protos::pbzero::VmstatCounters::VMSTAT_PGALLOC_DMA},
- {"pgalloc_normal", protos::pbzero::VmstatCounters::VMSTAT_PGALLOC_NORMAL},
- {"pgalloc_movable", protos::pbzero::VmstatCounters::VMSTAT_PGALLOC_MOVABLE},
- {"pgfree", protos::pbzero::VmstatCounters::VMSTAT_PGFREE},
- {"pgactivate", protos::pbzero::VmstatCounters::VMSTAT_PGACTIVATE},
- {"pgdeactivate", protos::pbzero::VmstatCounters::VMSTAT_PGDEACTIVATE},
- {"pgfault", protos::pbzero::VmstatCounters::VMSTAT_PGFAULT},
- {"pgmajfault", protos::pbzero::VmstatCounters::VMSTAT_PGMAJFAULT},
- {"pgrefill_dma", protos::pbzero::VmstatCounters::VMSTAT_PGREFILL_DMA},
- {"pgrefill_normal", protos::pbzero::VmstatCounters::VMSTAT_PGREFILL_NORMAL},
- {"pgrefill_movable",
- protos::pbzero::VmstatCounters::VMSTAT_PGREFILL_MOVABLE},
- {"pgsteal_kswapd_dma",
- protos::pbzero::VmstatCounters::VMSTAT_PGSTEAL_KSWAPD_DMA},
+ protos::VmstatCounters::VMSTAT_NR_DIRTY_BACKGROUND_THRESHOLD},
+ {"pgpgin", protos::VmstatCounters::VMSTAT_PGPGIN},
+ {"pgpgout", protos::VmstatCounters::VMSTAT_PGPGOUT},
+ {"pgpgoutclean", protos::VmstatCounters::VMSTAT_PGPGOUTCLEAN},
+ {"pswpin", protos::VmstatCounters::VMSTAT_PSWPIN},
+ {"pswpout", protos::VmstatCounters::VMSTAT_PSWPOUT},
+ {"pgalloc_dma", protos::VmstatCounters::VMSTAT_PGALLOC_DMA},
+ {"pgalloc_normal", protos::VmstatCounters::VMSTAT_PGALLOC_NORMAL},
+ {"pgalloc_movable", protos::VmstatCounters::VMSTAT_PGALLOC_MOVABLE},
+ {"pgfree", protos::VmstatCounters::VMSTAT_PGFREE},
+ {"pgactivate", protos::VmstatCounters::VMSTAT_PGACTIVATE},
+ {"pgdeactivate", protos::VmstatCounters::VMSTAT_PGDEACTIVATE},
+ {"pgfault", protos::VmstatCounters::VMSTAT_PGFAULT},
+ {"pgmajfault", protos::VmstatCounters::VMSTAT_PGMAJFAULT},
+ {"pgrefill_dma", protos::VmstatCounters::VMSTAT_PGREFILL_DMA},
+ {"pgrefill_normal", protos::VmstatCounters::VMSTAT_PGREFILL_NORMAL},
+ {"pgrefill_movable", protos::VmstatCounters::VMSTAT_PGREFILL_MOVABLE},
+ {"pgsteal_kswapd_dma", protos::VmstatCounters::VMSTAT_PGSTEAL_KSWAPD_DMA},
{"pgsteal_kswapd_normal",
- protos::pbzero::VmstatCounters::VMSTAT_PGSTEAL_KSWAPD_NORMAL},
+ protos::VmstatCounters::VMSTAT_PGSTEAL_KSWAPD_NORMAL},
{"pgsteal_kswapd_movable",
- protos::pbzero::VmstatCounters::VMSTAT_PGSTEAL_KSWAPD_MOVABLE},
- {"pgsteal_direct_dma",
- protos::pbzero::VmstatCounters::VMSTAT_PGSTEAL_DIRECT_DMA},
+ protos::VmstatCounters::VMSTAT_PGSTEAL_KSWAPD_MOVABLE},
+ {"pgsteal_direct_dma", protos::VmstatCounters::VMSTAT_PGSTEAL_DIRECT_DMA},
{"pgsteal_direct_normal",
- protos::pbzero::VmstatCounters::VMSTAT_PGSTEAL_DIRECT_NORMAL},
+ protos::VmstatCounters::VMSTAT_PGSTEAL_DIRECT_NORMAL},
{"pgsteal_direct_movable",
- protos::pbzero::VmstatCounters::VMSTAT_PGSTEAL_DIRECT_MOVABLE},
- {"pgscan_kswapd_dma",
- protos::pbzero::VmstatCounters::VMSTAT_PGSCAN_KSWAPD_DMA},
+ protos::VmstatCounters::VMSTAT_PGSTEAL_DIRECT_MOVABLE},
+ {"pgscan_kswapd_dma", protos::VmstatCounters::VMSTAT_PGSCAN_KSWAPD_DMA},
{"pgscan_kswapd_normal",
- protos::pbzero::VmstatCounters::VMSTAT_PGSCAN_KSWAPD_NORMAL},
+ protos::VmstatCounters::VMSTAT_PGSCAN_KSWAPD_NORMAL},
{"pgscan_kswapd_movable",
- protos::pbzero::VmstatCounters::VMSTAT_PGSCAN_KSWAPD_MOVABLE},
- {"pgscan_direct_dma",
- protos::pbzero::VmstatCounters::VMSTAT_PGSCAN_DIRECT_DMA},
+ protos::VmstatCounters::VMSTAT_PGSCAN_KSWAPD_MOVABLE},
+ {"pgscan_direct_dma", protos::VmstatCounters::VMSTAT_PGSCAN_DIRECT_DMA},
{"pgscan_direct_normal",
- protos::pbzero::VmstatCounters::VMSTAT_PGSCAN_DIRECT_NORMAL},
+ protos::VmstatCounters::VMSTAT_PGSCAN_DIRECT_NORMAL},
{"pgscan_direct_movable",
- protos::pbzero::VmstatCounters::VMSTAT_PGSCAN_DIRECT_MOVABLE},
+ protos::VmstatCounters::VMSTAT_PGSCAN_DIRECT_MOVABLE},
{"pgscan_direct_throttle",
- protos::pbzero::VmstatCounters::VMSTAT_PGSCAN_DIRECT_THROTTLE},
- {"pginodesteal", protos::pbzero::VmstatCounters::VMSTAT_PGINODESTEAL},
- {"slabs_scanned", protos::pbzero::VmstatCounters::VMSTAT_SLABS_SCANNED},
- {"kswapd_inodesteal",
- protos::pbzero::VmstatCounters::VMSTAT_KSWAPD_INODESTEAL},
+ protos::VmstatCounters::VMSTAT_PGSCAN_DIRECT_THROTTLE},
+ {"pginodesteal", protos::VmstatCounters::VMSTAT_PGINODESTEAL},
+ {"slabs_scanned", protos::VmstatCounters::VMSTAT_SLABS_SCANNED},
+ {"kswapd_inodesteal", protos::VmstatCounters::VMSTAT_KSWAPD_INODESTEAL},
{"kswapd_low_wmark_hit_quickly",
- protos::pbzero::VmstatCounters::VMSTAT_KSWAPD_LOW_WMARK_HIT_QUICKLY},
+ protos::VmstatCounters::VMSTAT_KSWAPD_LOW_WMARK_HIT_QUICKLY},
{"kswapd_high_wmark_hit_quickly",
- protos::pbzero::VmstatCounters::VMSTAT_KSWAPD_HIGH_WMARK_HIT_QUICKLY},
- {"pageoutrun", protos::pbzero::VmstatCounters::VMSTAT_PAGEOUTRUN},
- {"allocstall", protos::pbzero::VmstatCounters::VMSTAT_ALLOCSTALL},
- {"pgrotated", protos::pbzero::VmstatCounters::VMSTAT_PGROTATED},
- {"drop_pagecache", protos::pbzero::VmstatCounters::VMSTAT_DROP_PAGECACHE},
- {"drop_slab", protos::pbzero::VmstatCounters::VMSTAT_DROP_SLAB},
- {"pgmigrate_success",
- protos::pbzero::VmstatCounters::VMSTAT_PGMIGRATE_SUCCESS},
- {"pgmigrate_fail", protos::pbzero::VmstatCounters::VMSTAT_PGMIGRATE_FAIL},
+ protos::VmstatCounters::VMSTAT_KSWAPD_HIGH_WMARK_HIT_QUICKLY},
+ {"pageoutrun", protos::VmstatCounters::VMSTAT_PAGEOUTRUN},
+ {"allocstall", protos::VmstatCounters::VMSTAT_ALLOCSTALL},
+ {"pgrotated", protos::VmstatCounters::VMSTAT_PGROTATED},
+ {"drop_pagecache", protos::VmstatCounters::VMSTAT_DROP_PAGECACHE},
+ {"drop_slab", protos::VmstatCounters::VMSTAT_DROP_SLAB},
+ {"pgmigrate_success", protos::VmstatCounters::VMSTAT_PGMIGRATE_SUCCESS},
+ {"pgmigrate_fail", protos::VmstatCounters::VMSTAT_PGMIGRATE_FAIL},
{"compact_migrate_scanned",
- protos::pbzero::VmstatCounters::VMSTAT_COMPACT_MIGRATE_SCANNED},
+ protos::VmstatCounters::VMSTAT_COMPACT_MIGRATE_SCANNED},
{"compact_free_scanned",
- protos::pbzero::VmstatCounters::VMSTAT_COMPACT_FREE_SCANNED},
- {"compact_isolated",
- protos::pbzero::VmstatCounters::VMSTAT_COMPACT_ISOLATED},
- {"compact_stall", protos::pbzero::VmstatCounters::VMSTAT_COMPACT_STALL},
- {"compact_fail", protos::pbzero::VmstatCounters::VMSTAT_COMPACT_FAIL},
- {"compact_success", protos::pbzero::VmstatCounters::VMSTAT_COMPACT_SUCCESS},
- {"compact_daemon_wake",
- protos::pbzero::VmstatCounters::VMSTAT_COMPACT_DAEMON_WAKE},
+ protos::VmstatCounters::VMSTAT_COMPACT_FREE_SCANNED},
+ {"compact_isolated", protos::VmstatCounters::VMSTAT_COMPACT_ISOLATED},
+ {"compact_stall", protos::VmstatCounters::VMSTAT_COMPACT_STALL},
+ {"compact_fail", protos::VmstatCounters::VMSTAT_COMPACT_FAIL},
+ {"compact_success", protos::VmstatCounters::VMSTAT_COMPACT_SUCCESS},
+ {"compact_daemon_wake", protos::VmstatCounters::VMSTAT_COMPACT_DAEMON_WAKE},
{"unevictable_pgs_culled",
- protos::pbzero::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_CULLED},
+ protos::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_CULLED},
{"unevictable_pgs_scanned",
- protos::pbzero::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_SCANNED},
+ protos::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_SCANNED},
{"unevictable_pgs_rescued",
- protos::pbzero::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_RESCUED},
+ protos::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_RESCUED},
{"unevictable_pgs_mlocked",
- protos::pbzero::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_MLOCKED},
+ protos::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_MLOCKED},
{"unevictable_pgs_munlocked",
- protos::pbzero::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_MUNLOCKED},
+ protos::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_MUNLOCKED},
{"unevictable_pgs_cleared",
- protos::pbzero::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_CLEARED},
+ protos::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_CLEARED},
{"unevictable_pgs_stranded",
- protos::pbzero::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_STRANDED},
+ protos::VmstatCounters::VMSTAT_UNEVICTABLE_PGS_STRANDED},
};
// Returns a lookup table of meminfo counter names addressable by counter id.
diff --git a/src/traced/probes/sys_stats/sys_stats_data_source.cc b/src/traced/probes/sys_stats/sys_stats_data_source.cc
index 00ab945..5f4b740 100644
--- a/src/traced/probes/sys_stats/sys_stats_data_source.cc
+++ b/src/traced/probes/sys_stats/sys_stats_data_source.cc
@@ -34,7 +34,7 @@
#include "perfetto/traced/sys_stats_counters.h"
#include "perfetto/tracing/core/sys_stats_config.h"
-#include "perfetto/common/sys_stats_counters.pbzero.h"
+#include "perfetto/common/sys_stats_counters.pb.h"
#include "perfetto/config/sys_stats/sys_stats_config.pb.h"
#include "perfetto/trace/sys_stats/sys_stats.pbzero.h"
#include "perfetto/trace/trace_packet.pbzero.h"