summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author YH LIN <yhli@google.com> 2022-09-28 05:21:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-28 05:21:53 +0000
commit77d208672d6abb82eef8c8c0cf41f4df923aba07 (patch)
treec07400939ae395df3250b1529eb423f47b5f31fd
parentdb7608789a122c462b3296af08ffb028e5269e8a (diff)
parentf62fe25af20c0f1779231bd867e1ea4e78a10301 (diff)
Merge "atrace: add ufshcd_command event and change block events for disk category" am: 260480a3e6 am: 9e0a24caf7 am: 2aed45f211 am: 6c496e0c62 am: f62fe25af2
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2234266 Change-Id: I53fb20774174ed956993d344f099622b02baddd0 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..5cd2dea377 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" },
+ { 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" },