summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author YH LIN <yhli@google.com> 2022-10-03 10:29:36 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-03 10:29:36 +0000
commitdb7df5dc74007a610c5672621cf0c54ad557fdba (patch)
treeaef77a5bed21803f49120f1ba681bbbff11a9bd7
parent76a6c238a86aab87a7fd0a0a46c28c2d0c242439 (diff)
parent1b4d79e1a995f8c433946dee27d7fe4f7ab22b7e (diff)
Merge "atrace: add ufshcd_command event and change block events for disk category" am: 09e7c8bfc6 am: 1b4d79e1a9
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2240093 Change-Id: Ib7fbb91f126cc9d6cbfcb850220fc6e66880cad4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--cmds/atrace/atrace.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 6fb9a4d112..48d48acc69 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -193,8 +193,9 @@ static const TracingCategory k_categories[] = {
{ 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" },