Fix JSON error and add I/O events
Bug: 73625480
Change-Id: I3c1f057a4e7cb8d8c8c72b60b58e7edbf99b0edd
diff --git a/test/configs/ftrace.cfg b/test/configs/ftrace.cfg
index d06b8cb..d0923df 100644
--- a/test/configs/ftrace.cfg
+++ b/test/configs/ftrace.cfg
@@ -14,10 +14,28 @@
ftrace_events: "binder_lock"
ftrace_events: "binder_locked"
ftrace_events: "binder_set_priority"
- ftrace_events: "binder_transaction"
ftrace_events: "binder_transaction_received"
+ ftrace_events: "binder_transaction"
ftrace_events: "binder_unlock"
+ ftrace_events: "block_bio_backmerge"
+ ftrace_events: "block_bio_bounce"
+ ftrace_events: "block_bio_complete"
+ ftrace_events: "block_bio_frontmerge"
+ ftrace_events: "block_bio_queue"
+ ftrace_events: "block_bio_remap"
+ ftrace_events: "block_dirty_buffer"
+ ftrace_events: "block_getrq"
+ ftrace_events: "block_plug"
+ ftrace_events: "block_rq_abort"
+ ftrace_events: "block_rq_complete"
+ ftrace_events: "block_rq_insert"
ftrace_events: "block_rq_issue"
+ ftrace_events: "block_rq_remap"
+ ftrace_events: "block_rq_requeue"
+ ftrace_events: "block_sleeprq"
+ ftrace_events: "block_split"
+ ftrace_events: "block_touch_buffer"
+ ftrace_events: "block_unplug"
ftrace_events: "cgroup_attach_task"
ftrace_events: "cgroup_destroy_root"
ftrace_events: "cgroup_mkdir"
@@ -30,8 +48,8 @@
ftrace_events: "clock_disable"
ftrace_events: "clock_enable"
ftrace_events: "clock_set_rate"
- ftrace_events: "cpu_frequency"
ftrace_events: "cpu_frequency_limits"
+ ftrace_events: "cpu_frequency"
ftrace_events: "cpu_idle"
ftrace_events: "cpufreq_interactive_already"
ftrace_events: "cpufreq_interactive_boost"
@@ -39,10 +57,101 @@
ftrace_events: "cpufreq_interactive_setspeed"
ftrace_events: "cpufreq_interactive_target"
ftrace_events: "cpufreq_interactive_unboost"
+ ftrace_events: "ext4_alloc_da_blocks"
+ ftrace_events: "ext4_allocate_blocks"
+ ftrace_events: "ext4_allocate_inode"
+ ftrace_events: "ext4_begin_ordered_truncate"
+ ftrace_events: "ext4_collapse_range"
+ ftrace_events: "ext4_da_release_space"
+ ftrace_events: "ext4_da_reserve_space"
+ ftrace_events: "ext4_da_update_reserve_space"
ftrace_events: "ext4_da_write_begin"
ftrace_events: "ext4_da_write_end"
+ ftrace_events: "ext4_da_write_pages_extent"
+ ftrace_events: "ext4_da_write_pages"
+ ftrace_events: "ext4_direct_IO_enter"
+ ftrace_events: "ext4_direct_IO_exit"
+ ftrace_events: "ext4_discard_blocks"
+ ftrace_events: "ext4_discard_preallocations"
+ ftrace_events: "ext4_drop_inode"
+ ftrace_events: "ext4_es_cache_extent"
+ ftrace_events: "ext4_es_find_delayed_extent_range_enter"
+ ftrace_events: "ext4_es_find_delayed_extent_range_exit"
+ ftrace_events: "ext4_es_insert_extent"
+ ftrace_events: "ext4_es_lookup_extent_enter"
+ ftrace_events: "ext4_es_lookup_extent_exit"
+ ftrace_events: "ext4_es_remove_extent"
+ ftrace_events: "ext4_es_shrink_count"
+ ftrace_events: "ext4_es_shrink_scan_enter"
+ ftrace_events: "ext4_es_shrink_scan_exit"
+ ftrace_events: "ext4_es_shrink"
+ ftrace_events: "ext4_evict_inode"
+ ftrace_events: "ext4_ext_convert_to_initialized_enter"
+ ftrace_events: "ext4_ext_convert_to_initialized_fastpath"
+ ftrace_events: "ext4_ext_handle_unwritten_extents"
+ ftrace_events: "ext4_ext_in_cache"
+ ftrace_events: "ext4_ext_load_extent"
+ ftrace_events: "ext4_ext_map_blocks_enter"
+ ftrace_events: "ext4_ext_map_blocks_exit"
+ ftrace_events: "ext4_ext_put_in_cache"
+ ftrace_events: "ext4_ext_remove_space_done"
+ ftrace_events: "ext4_ext_remove_space"
+ ftrace_events: "ext4_ext_rm_idx"
+ ftrace_events: "ext4_ext_rm_leaf"
+ ftrace_events: "ext4_ext_show_extent"
+ ftrace_events: "ext4_fallocate_enter"
+ ftrace_events: "ext4_fallocate_exit"
+ ftrace_events: "ext4_find_delalloc_range"
+ ftrace_events: "ext4_forget"
+ ftrace_events: "ext4_free_blocks"
+ ftrace_events: "ext4_free_inode"
+ ftrace_events: "ext4_get_implied_cluster_alloc_exit"
+ ftrace_events: "ext4_get_reserved_cluster_alloc"
+ ftrace_events: "ext4_ind_map_blocks_enter"
+ ftrace_events: "ext4_ind_map_blocks_exit"
+ ftrace_events: "ext4_insert_range"
+ ftrace_events: "ext4_invalidatepage"
+ ftrace_events: "ext4_journal_start_reserved"
+ ftrace_events: "ext4_journal_start"
+ ftrace_events: "ext4_journalled_invalidatepage"
+ ftrace_events: "ext4_journalled_write_end"
+ ftrace_events: "ext4_load_inode_bitmap"
+ ftrace_events: "ext4_load_inode"
+ ftrace_events: "ext4_mark_inode_dirty"
+ ftrace_events: "ext4_mb_bitmap_load"
+ ftrace_events: "ext4_mb_buddy_bitmap_load"
+ ftrace_events: "ext4_mb_discard_preallocations"
+ ftrace_events: "ext4_mb_new_group_pa"
+ ftrace_events: "ext4_mb_new_inode_pa"
+ ftrace_events: "ext4_mb_release_group_pa"
+ ftrace_events: "ext4_mb_release_inode_pa"
+ ftrace_events: "ext4_mballoc_alloc"
+ ftrace_events: "ext4_mballoc_discard"
+ ftrace_events: "ext4_mballoc_free"
+ ftrace_events: "ext4_mballoc_prealloc"
+ ftrace_events: "ext4_other_inode_update_time"
+ ftrace_events: "ext4_punch_hole"
+ ftrace_events: "ext4_read_block_bitmap_load"
+ ftrace_events: "ext4_readpage"
+ ftrace_events: "ext4_releasepage"
+ ftrace_events: "ext4_remove_blocks"
+ ftrace_events: "ext4_request_blocks"
+ ftrace_events: "ext4_request_inode"
ftrace_events: "ext4_sync_file_enter"
ftrace_events: "ext4_sync_file_exit"
+ ftrace_events: "ext4_sync_fs"
+ ftrace_events: "ext4_trim_all_free"
+ ftrace_events: "ext4_trim_extent"
+ ftrace_events: "ext4_truncate_enter"
+ ftrace_events: "ext4_truncate_exit"
+ ftrace_events: "ext4_unlink_enter"
+ ftrace_events: "ext4_unlink_exit"
+ ftrace_events: "ext4_write_begin"
+ ftrace_events: "ext4_write_end"
+ ftrace_events: "ext4_writepage"
+ ftrace_events: "ext4_writepages_result"
+ ftrace_events: "ext4_writepages"
+ ftrace_events: "ext4_zero_range"
ftrace_events: "i2c_read"
ftrace_events: "i2c_reply"
ftrace_events: "i2c_result"
@@ -93,13 +202,13 @@
ftrace_events: "mm_vmscan_kswapd_sleep"
ftrace_events: "mm_vmscan_kswapd_wake"
ftrace_events: "print"
- ftrace_events: "regulator_disable"
ftrace_events: "regulator_disable_complete"
- ftrace_events: "regulator_enable"
+ ftrace_events: "regulator_disable"
ftrace_events: "regulator_enable_complete"
ftrace_events: "regulator_enable_delay"
- ftrace_events: "regulator_set_voltage"
+ ftrace_events: "regulator_enable"
ftrace_events: "regulator_set_voltage_complete"
+ ftrace_events: "regulator_set_voltage"
ftrace_events: "rotator_bw_ao_as_context"
ftrace_events: "sched_blocked_reason"
ftrace_events: "sched_cpu_hotplug"
@@ -110,8 +219,8 @@
ftrace_events: "sched_process_hang"
ftrace_events: "sched_process_wait"
ftrace_events: "sched_switch"
- ftrace_events: "sched_wakeup"
ftrace_events: "sched_wakeup_new"
+ ftrace_events: "sched_wakeup"
ftrace_events: "sched_waking"
ftrace_events: "smbus_read"
ftrace_events: "smbus_reply"
diff --git a/tools/trace_to_text/main.cc b/tools/trace_to_text/main.cc
index 6b1600d..8a63e07 100644
--- a/tools/trace_to_text/main.cc
+++ b/tools/trace_to_text/main.cc
@@ -2295,6 +2295,7 @@
}
// TODO(taylori): Confirm correct format for this.
+// Calling this breaks loading into chrome://tracing
std::string FormatProcess(const Process& process) {
char line[2048];
sprintf(line, "process: pid=%d ppid=%d cmdline=", process.pid(),
@@ -2315,6 +2316,7 @@
return output;
}
+// Calling this breaks loading into chrome://tracing
std::string FormatInodeFileMap(const Entry& entry) {
char line[2048];
sprintf(line, "inode_file_map: ino=%llu type=%s path=", entry.inode_number(),
@@ -2341,22 +2343,6 @@
}
for (const TracePacket& packet : trace.packet()) {
- if (packet.has_process_tree()) {
- const ProcessTree& process_tree = packet.process_tree();
- for (const auto& process : process_tree.processes()) {
- std::string line = FormatProcess(process);
- sorted.emplace(0, line);
- }
- }
-
- if (packet.has_inode_file_map()) {
- const InodeFileMap& inode_file_map = packet.inode_file_map();
- // TODO(azappone): format device block id and mount points
- for (const auto& entry : inode_file_map.entries()) {
- std::string line = FormatInodeFileMap(entry);
- sorted.emplace(0, line);
- }
- }
if (!packet.has_ftrace_events())
continue;
