Merge "atrace: add ufshcd_command event and change block events for disk category" am: 260480a3e6 am: 9e0a24caf7 am: 2aed45f211
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2234266
Change-Id: I69ce08ff3e47f83f3060fadb7a04c84447bc1ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 6fb9a4d..5cd2dea 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -193,8 +193,9 @@
{ OPT, "events/ext4/ext4_da_write_end/enable" },
{ OPT, "events/ext4/ext4_sync_file_enter/enable" },
{ OPT, "events/ext4/ext4_sync_file_exit/enable" },
- { REQ, "events/block/block_rq_issue/enable" },
- { REQ, "events/block/block_rq_complete/enable" },
+ { REQ, "events/block/block_bio_queue/enable" },
+ { REQ, "events/block/block_bio_complete/enable" },
+ { REQ, "events/ufs/ufshcd_command/enable" },
} },
{ "mmc", "eMMC commands", 0, {
{ REQ, "events/mmc/enable" },