diff options
| author | Lalit Maganti <lalitm@google.com> | 2021-03-01 16:31:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-01 16:31:08 +0000 |
| commit | e9eed1caa7f1360a5340a2c7bf3900ea61935d44 (patch) | |
| tree | 65e64fd2af5e089fe80c858a850a5f2f504ac8d4 | |
| parent | e307f07215038f8fb612950a71acb9196f46423e (diff) | |
| parent | c94a74c83a134bea95a68dfe5991a92c1c8fb6c9 (diff) | |
| download | perfetto-e9eed1caa7f1360a5340a2c7bf3900ea61935d44.tar.gz | |
Merge "tp: don't pass category/name for binder end events" am: c94a74c83a
Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/1611682
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6894b3b986a84b44f976486680ef468d34b6ce9d
| -rw-r--r-- | src/trace_processor/importers/ftrace/binder_tracker.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/trace_processor/importers/ftrace/binder_tracker.cc b/src/trace_processor/importers/ftrace/binder_tracker.cc index dc173a925..f8e040d43 100644 --- a/src/trace_processor/importers/ftrace/binder_tracker.cc +++ b/src/trace_processor/importers/ftrace/binder_tracker.cc @@ -125,7 +125,7 @@ void BinderTracker::Transaction(int64_t ts, }; context_->slice_tracker->AddArgs(track_id, binder_category_id_, reply_id_, dest_args_inserter); - context_->slice_tracker->End(ts, track_id, binder_category_id_, reply_id_, + context_->slice_tracker->End(ts, track_id, kNullStringId, kNullStringId, args_inserter); awaiting_rcv_for_reply_.insert(transaction_id); return; @@ -152,8 +152,7 @@ void BinderTracker::TransactionReceived(int64_t ts, StringId thread_name = thread_table.name()[utid]; TrackId track_id = context_->track_tracker->InternThreadTrack(utid); if (awaiting_rcv_for_reply_.count(transaction_id) > 0) { - context_->slice_tracker->End(ts, track_id, binder_category_id_, - transaction_slice_id_); + context_->slice_tracker->End(ts, track_id); awaiting_rcv_for_reply_.erase(transaction_id); return; } @@ -214,8 +213,7 @@ void BinderTracker::Locked(int64_t ts, uint32_t pid) { return; TrackId track_id = context_->track_tracker->InternThreadTrack(utid); - context_->slice_tracker->End(ts, track_id, binder_category_id_, - lock_waiting_id_); + context_->slice_tracker->End(ts, track_id); context_->slice_tracker->Begin(ts, track_id, binder_category_id_, lock_held_id_); |