summaryrefslogtreecommitdiff
path: root/cmds/atrace/atrace.cpp
diff options
context:
space:
mode:
author YH LIN <yhli@google.com> 2022-10-03 12:06:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-03 12:06:57 +0000
commit57d52f22f399fe64fef8dd7213918277dff03b51 (patch)
tree5688cf47fb7f66126dc175e0b6bac9af90122526 /cmds/atrace/atrace.cpp
parentb3a61194618509b202262ecc6ef5a671f31396ca (diff)
parenta206608fa7d7e3e80bf05402b5c8cd42e6257b1e (diff)
Merge "atrace: add ufshcd_command event and change block events for disk category" am: 09e7c8bfc6 am: 1b4d79e1a9 am: db7df5dc74 am: 76f175b7a4 am: a206608fa7
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2240093 Change-Id: I2af32006936c1f782453a5c408b25f7b1a083b7e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'cmds/atrace/atrace.cpp')
-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" },