commit a206608fa7d7e3e80bf05402b5c8cd42e6257b1e
author YH LIN <yhli@google.com> Mon Oct 03 11:24:11 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 03 11:24:11 2022 +0000
tree 3afc01dea3b197af55dc220be8fa46a5d3ccc71c
parent 0993fe07694f8cdf671b3ca9f70e9ab91d6790c1
parent 76f175b7a4184a8935b123e435aa7819ac7dc0b7

Merge "atrace: add ufshcd_command event and change block events for disk category" am: 09e7c8bfc6 am: 1b4d79e1a9 am: db7df5dc74 am: 76f175b7a4

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2240093

Change-Id: I3cf331bbee0938fd5c94847de6b5cc658ea78185
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 6fb9a4d..48d48ac 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" },
+        { OPT,      "events/block/block_bio_queue/enable" },
+        { OPT,      "events/block/block_bio_complete/enable" },
+        { OPT,      "events/ufs/ufshcd_command/enable" },
     } },
     { "mmc",        "eMMC commands",    0, {
         { REQ,      "events/mmc/enable" },