summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-01-29 21:09:16 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-01-29 21:09:16 +0000
commitfb56b6d93afec98df892af55c9497264023cbc73 (patch)
tree5db64db0a0090ea9aeae83a600cd202ccf977b85
parentc999d57fa82625990117de570f52731fd2f57193 (diff)
parente0b9d49b9bcbe77766c6552552536368fe85ddf5 (diff)
downloadextras-fb56b6d93afec98df892af55c9497264023cbc73.tar.gz
Merge "Snap for 8131688 from 2cbc0596712eddd5c269133855a15b4d2b4c59b3 to android12-tests-release" into android12-tests-releaseandroid-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4
-rw-r--r--simpleperf/RecordReadThread.cpp2
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;