diff options
author | Florian Muller <mullerf@google.com> | 2022-01-29 00:43:11 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-29 00:43:11 +0000 |
commit | a331e9c67c6530f5c667855f7a784338eb03b141 (patch) | |
tree | 5db64db0a0090ea9aeae83a600cd202ccf977b85 | |
parent | c54d12318f0e511868f61681dc9f1a6dec46c2df (diff) | |
parent | 0eb3232339fb939c294ff8d2f999909b66bdee95 (diff) | |
download | extras-a331e9c67c6530f5c667855f7a784338eb03b141.tar.gz |
Merge "simpleperf: use 8 byte aligned stack size when resizing stack data." into android11-tests-dev am: 0eb3232339
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1965454
Change-Id: Ieb34e297f45e33ee16ede7b7c1e2ebbd4d57c84c
-rw-r--r-- | simpleperf/RecordReadThread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/simpleperf/RecordReadThread.cpp b/simpleperf/RecordReadThread.cpp index 16af9292..a8229303 100644 --- a/simpleperf/RecordReadThread.cpp +++ b/simpleperf/RecordReadThread.cpp @@ -540,7 +540,7 @@ void RecordReadThread::PushRecordToRecordBuffer(KernelRecordReader* kernel_recor // space in each sample to store stack data. However, a thread may use less stack than 64K. // So not all the 64K stack data in a sample is valid, and we only need to keep valid stack // data, whose size is dyn_stack_size. - uint64_t new_stack_size = std::min<uint64_t>(dyn_stack_size, stack_size_limit); + uint64_t new_stack_size = Align(std::min<uint64_t>(dyn_stack_size, stack_size_limit), 8); if (stack_size > new_stack_size) { // Remove part of the stack data. perf_event_header new_header = header; |