summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-06-09Snap for 8702497 from df142880e86418dad6b40fddb001ebd897919595 to ↵t_frc_swc_330443040t_frc_swc_330443010android13-frc-media-swcodec-releaseAndroid Build Coastguard Worker
tm-frc-media-swcodec-release Change-Id: I7966a23733890cceec384d4cad04cc0ce0bde11f
2022-06-03populate attributes when re-writing perf dataandroid13-devRyan Zuklie
JoinCallChains, PostUnwindRecords, and MergeMapRecords all flush the current data to file and start a new data file using MoveRecordFile. Normally, creating the file fills in the attributes from the event selection set. However, DoRecording recently added CloseEventFiles calls which clear the event_fds which are used to populate the attrs. This change fixes the issue by copying the attrs from the old file. Test: ran simpleperf on device $ adb shell $ cd /data/local/tmp $ simpleperf record -a --exclude-perf --duration 2 -g \ -e power:sugov_next_freq -e power:sugov_util_update $ simpleperf report Before the fix, all samples would be attributed to the first event type. With this fix, the samples are correctly attributed. Bug: 231357972 Change-Id: Id077e3c6f6c4460df595fad04c355717985a914e (cherry picked from commit 62fe04581f910f5a847ad0653908a3e57b6ed8a2) Merged-In: Id077e3c6f6c4460df595fad04c355717985a914e
2022-04-28Snap for 8512216 from cd6b038e799ea13120e9676e0f1b23cdda4223db to ↵Android Build Coastguard Worker
tm-frc-media-swcodec-release Change-Id: Iaa07b2b7e3031a9cd67a508a9f526b4bf98de810
2022-04-21Merge "Add support for new unwindstack error codes." am: 30db4a5be2 am: ↵Christopher Ferris
6fcf9c2387 am: f078c382e6 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2068807 Change-Id: If50412205302ab93b9a55af36abf36d23b84fbbd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21Merge "Add support for new unwindstack error codes." am: 30db4a5be2 am: ↵Christopher Ferris
6fcf9c2387 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2068807 Change-Id: I965046ac793ffea1d50076742fedfb79dbd8be7d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21Merge "Add support for new unwindstack error codes." am: 30db4a5be2Christopher Ferris
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2068807 Change-Id: Idd09481b56fe241087232c807ed15f639eb1866b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20Merge "Add support for new unwindstack error codes."Christopher Ferris
2022-04-20[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: 74153d19ff -s ours am: f4df34b268 -s ours am skip reason: Merged-In Ib919d40c96d3c26d29d8c1b4af67300c4130ec42 with SHA-1 518046b346 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/17805281 Change-Id: I13699d195201f6ecc0855229f99e2d4e6d3c76c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19Add support for new unwindstack error codes.Christopher Ferris
Bug: 120606663 Test: Compiles. Change-Id: Ib1b5f31208507dd3911a2b4660e58370c83be70b
2022-04-19[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: 74153d19ff -s ours am skip reason: Merged-In Ib919d40c96d3c26d29d8c1b4af67300c4130ec42 with SHA-1 518046b346 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/17805281 Change-Id: I3305dd52e02a7d523b7aa2884e29b4d96fc48ec6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047Xin Li
Bug: 226662282 Merged-In: Ib919d40c96d3c26d29d8c1b4af67300c4130ec42 Change-Id: I2e27d93c2d7bc1085c855456b5db91e6eff27820
2022-04-14Merge "Fix more issues with python3 conversion of build_verity_metadata.py" ↵Cole Faust
am: 4e69dcd3fa am: 8c15f1a834 am: 583ce8b45d Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2064888 Change-Id: Ie8ad4aad3dd9ef8ed8b914e370fd08f74735aeda Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14Merge "Fix more issues with python3 conversion of build_verity_metadata.py" ↵Cole Faust
am: 4e69dcd3fa am: 8c15f1a834 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2064888 Change-Id: I97a8d6521f276bb0f36c57afee1afd25e15ba034 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14Merge "Fix more issues with python3 conversion of build_verity_metadata.py" ↵Cole Faust
am: 4e69dcd3fa Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2064888 Change-Id: Icd1e2fd57f1459910c3da11d58556ad449a3e3cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14Merge "Fix more issues with python3 conversion of build_verity_metadata.py"Cole Faust
2022-04-14Fix more issues with python3 conversion of build_verity_metadata.pyCole Faust
Bug: 203436762 Test: lunch hikey-userdebug; m droidcore Change-Id: I11ee92d7a3d9aa4e190c338e8438848c3ba47762
2022-04-13Fix CtsKernelConfigTestCases cts-on-gsiKeith Mok
run cts-on-gsi -m CtsKernelConfigTestCases will failed on device with kernel not enabled CONFIG_PSTORE_PMSG. If CONFIG_PSTORE_PMSG not enabled /dev/pmsg0 device node will not exists, but echo HELLOWORLD > /dev/pmsg0 will tries to create a file in /dev folder which will failed. Since CONFIG_PSTORE_PMSG is not a mandatory config, add a checking to see if /dev/pmsg0 exist first before echo/write into it. Bug: 215043302 Test: On device kernel without CONFIG_PSTORE_PMSG enabled run cts-on-gsi -m CtsKernelConfigTestCases Change-Id: I5009558fc3a853772c27e5967eb49bd44f171ae0 (cherry picked from commit 745b67e86f2e1d44462dbda25f9ae7166d1511b8)
2022-04-13Merge "Fix issue with python3 conversion of build_verity_metadata.py" am: ↵Treehugger Robot
c17997c5a3 am: c9284377f3 am: 9a207c0c12 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2063014 Change-Id: I047d7399c985fdbaa7e3155b8461397262959bef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Fix issue with python3 conversion of build_verity_metadata.py" am: ↵Treehugger Robot
c17997c5a3 am: c9284377f3 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2063014 Change-Id: I7dcfdeb222673643ae92e56314ad1d4a5b9a478f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Fix issue with python3 conversion of build_verity_metadata.py" am: ↵Treehugger Robot
c17997c5a3 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2063014 Change-Id: I979ac0fd579bc3cc382fb94ba60758f8ce5fc254 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Fix issue with python3 conversion of build_verity_metadata.py"Treehugger Robot
2022-04-13Fix issue with python3 conversion of build_verity_metadata.pyCole Faust
Files should be opened for reading/writing in text mode, not binary mode. Bug: 203436762 Test: Presubmits Change-Id: I86166bf434704dbd0a546e543c684818b57620f5
2022-04-06Merge "Convert build_verify_metadata to python 3" am: fbc4fb21ed am: ↵Cole Faust
a6c30f6aa9 am: 88c5339b43 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2056529 Change-Id: I6a9e6b10ac1c872229cef2ee8a513ac372f3ad07 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "Convert build_verify_metadata to python 3" am: fbc4fb21ed am: a6c30f6aa9Cole Faust
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2056529 Change-Id: I1930154d81a8e7abbf41959c5d15c0e0c49c14b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "Convert build_verify_metadata to python 3" am: fbc4fb21edCole Faust
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2056529 Change-Id: I3c2f5cde8e38d5f808f227104761b926f62312d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "Convert build_verify_metadata to python 3"Cole Faust
2022-04-05Convert build_verify_metadata to python 3Cole Faust
Also update some python 3 issues in mkuserimg_mke2fs. Bug: 203436762 Test: Presubmits Change-Id: Ib919d40c96d3c26d29d8c1b4af67300c4130ec42
2022-04-03[automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into ↵TreeHugger Robot
stage-aosp-master am: f9c71eed93 -s ours am: 10a5c3a58e -s ours am skip reason: Merged-In Ie1b27d286785c75292449886030bd6420b5a2c6d with SHA-1 a4e62a8cdf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/17544718 Change-Id: Ia43fabcbc95d6c7b030ca3c0e4afbb145f5a9328 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: a27bc483ba -s ours ↵Xin Li
am: 35bc61390e -s ours am skip reason: Merged-In Ie1b27d286785c75292449886030bd6420b5a2c6d with SHA-1 a4e62a8cdf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/17544718 Change-Id: I425fc82c98c8a986c7350d7d75dc66d1a39c8c3a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into ↵TreeHugger Robot
stage-aosp-master am: f9c71eed93 -s ours am skip reason: Merged-In Ie1b27d286785c75292449886030bd6420b5a2c6d with SHA-1 a4e62a8cdf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/17544718 Change-Id: Id94eb0d07e5a0a18c21cc9777c104b879cd8b47c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: a27bc483ba -s oursXin Li
am skip reason: Merged-In Ie1b27d286785c75292449886030bd6420b5a2c6d with SHA-1 a4e62a8cdf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/17544718 Change-Id: I737a928ed50fbcf42e1e91d4e83b969e3a4e5cba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-masterTreeHugger Robot
2022-04-01Merge "simpleperf: fix a segfault caused by CloseEventFiles." am: 36ba9c0a85 ↵Yabin Cui
am: c675d90a82 am: bb5e926ee8 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052024 Change-Id: I471cbd8188da7a058f688001959035b61cd87147 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "simpleperf: fix a segfault caused by CloseEventFiles." am: 36ba9c0a85 ↵Yabin Cui
am: c675d90a82 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052024 Change-Id: Ie7a12291533030e933fcf4cc1ed6b3300a472d61 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "simpleperf: fix a segfault caused by CloseEventFiles." am: 36ba9c0a85Yabin Cui
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052024 Change-Id: Ifd0f1df822d6026f67486fc403fde03ebc842c90 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "simpleperf: fix a segfault caused by CloseEventFiles."Yabin Cui
2022-04-01Merge Android 12 QPR3 ab/8391262Xin Li
Bug: 226662282 Merged-In: Ie1b27d286785c75292449886030bd6420b5a2c6d Change-Id: I93f2de585186b20ca8d2e7b5d5bbe95f80931df1
2022-04-01simpleperf: fix a segfault caused by CloseEventFiles.Yabin Cui
In aosp/2052096, simpleperf closes event files when stopping recording. After that, GetEventAttrWithId()[0].ids is empty, which makes ProcessJITDebugInfo() segfault. To fix it, save result of GetEventAttrWithId() in dumping_attr_id_ when preparing recording, and use dumping_attr_id_ in ProcessJITDebugInfo(). Bug: 227220328 Test: run simpleperf_unit_test Change-Id: I99678ff5defc7ca998a08b2cec22f7a84d1ed7bd
2022-04-01Merge changes Ib0160fe1,Ib5a11b7c am: 09fe7d7b48 am: e0c446c7d2 am: d01120acf0Yabin Cui
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052097 Change-Id: Iee4910a4379eb44170d59e00b55fa0e9a2e5dc46 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge changes Ib0160fe1,Ib5a11b7c am: 09fe7d7b48 am: e0c446c7d2Yabin Cui
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052097 Change-Id: Id98ec3f0963155d08c09a2a0968fd1f7354e6451 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge changes Ib0160fe1,Ib5a11b7c am: 09fe7d7b48Yabin Cui
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052097 Change-Id: I41f1a1b10bdf625de7d5c4e813e4d3cc5b213b37 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge changes Ib0160fe1,Ib5a11b7cYabin Cui
* changes: simpleperf: raise priority of stop recording events. simpleperf: Make stop recording time more accurate.
2022-04-01Merge "Non-module target." am: e518a5d38e am: ac6f8d438c am: 8ce7a8d069Bob Badour
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052094 Change-Id: I0460ade55857434d981042d49320bd2f05aebd38 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Non-module target." am: e518a5d38e am: ac6f8d438cBob Badour
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052094 Change-Id: I26618fad786a7c48a85ec012ce7d55570da504ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Non-module target." am: e518a5d38eBob Badour
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052094 Change-Id: I6fcb63b4515cab609346ab5b38b6376cd6b14f49 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Non-module target."Bob Badour
2022-03-31simpleperf: raise priority of stop recording events.Yabin Cui
Simpleperf main thread handles several events, like processing records from record read thread, periodically checking JIT debug file updates, etc. Some events may take significant time to finish, and slow down reaction to stop recording events. To alleviate it, this CL raises priority of stop recording events. So they only need to wait for the currently running event. Bug: 227220328 Test: run simpleperf_unit_test Change-Id: Ib0160fe1da6d81cae8e71f25a5870d320706d2a9
2022-03-31simpleperf: Make stop recording time more accurate.Yabin Cui
simpleperf stops recording in FinishReadMmapEventData(). It contains two steps: 1. Stop record read thread. 2. Process records in userspace buffer. But if the second steps takes significant time, users may think simpleperf doesn't receive the stop recording command. To avoid that, this CL moves the second step to post processing. This CL also closes event files when stopping recording. That prevents the kernel from generating more samples, which may slow down post processing. Bug: 227220328 Test: run simpleperf_unit_test Change-Id: Ib5a11b7ce039e2133a9070a10508da514197e610
2022-03-31Non-module target.Bob Badour
Bug: 151177513 Bug: 213388645 Bug: 210912771 Test: m droid dist reportmissinglicenses Change-Id: I29bd295be1a6aef16ae9b9ccdb9bef3365cc4a0c
2022-03-31Merge "simpleperf: update doc for supporting ETM in the kernel." am: ↵Yabin Cui
43ccc71e3d am: ab47ce778e am: a4e62a8cdf Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2050287 Change-Id: I66a4ba29a34d79543b0508657f3e9ccf2d96c936 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>