OSDN Git Service
Yabin Cui [Fri, 22 Nov 2019 20:13:41 +0000 (20:13 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
6021660."
Yabin Cui [Wed, 20 Nov 2019 23:26:06 +0000 (15:26 -0800)]
simpleperf: update simpleperf prebuilts to build
6021660.
Taken from branch aosp-simpleperf-release.
Bug: none
Test: run test.py on devices with different android versions.
Change-Id: I39c33e6f7c1d3776288db78554feafea0bff959f
David Anderson [Thu, 21 Nov 2019 21:39:28 +0000 (21:39 +0000)]
Merge "lpdumpd: Do not use stack to store arguments."
David Anderson [Thu, 21 Nov 2019 20:18:05 +0000 (20:18 +0000)]
Merge "lpdump: When using -h, print usage to stdout so lpdumpd prints it."
Cody Caldwell [Wed, 20 Nov 2019 20:40:30 +0000 (20:40 +0000)]
Merge "Revert "lpmake: Don't assume a device is retrofit if it has one block device for super.""
Cody Caldwell [Wed, 20 Nov 2019 20:36:12 +0000 (20:36 +0000)]
Revert "lpmake: Don't assume a device is retrofit if it has one block device for super."
This reverts commit
13945230d36282a0dd2ad7c240f2b88ffc506205.
Reason for revert: Potential culprit for Bug b/
144809373 - verifying through Forrest before revert submission
Change-Id: Ic4ed750a5386f6f45a871ac7112142a6991dfd2c
David Anderson [Wed, 20 Nov 2019 01:04:39 +0000 (17:04 -0800)]
lpdumpd: Do not use stack to store arguments.
Bug:
144052321
Test: manual test
Change-Id: I700e22ef5c6c0a0c6a5f05c5bb4ea29b0077b34e
David Anderson [Wed, 20 Nov 2019 01:07:14 +0000 (17:07 -0800)]
lpdump: When using -h, print usage to stdout so lpdumpd prints it.
Bug: N/A
Test: lpdump -h
Change-Id: I7bad9f8b5d5c14b831e42d1f21fe8bfeccba3fb0
David Anderson [Wed, 20 Nov 2019 00:10:37 +0000 (00:10 +0000)]
Merge "lpmake: Don't assume a device is retrofit if it has one block device for super."
Yabin Cui [Tue, 19 Nov 2019 19:21:07 +0000 (19:21 +0000)]
Merge "simpleperf: support libraries without build ids when recording."
Yabin Cui [Tue, 19 Nov 2019 00:40:28 +0000 (16:40 -0800)]
simpleperf: support libraries without build ids when recording.
Simpleperf can download unstripped libraries on device and use them
for unwinding during recording, through `app_profiler.py -lib` and
`simpleperf record --symfs` options. But it doesn't support libraries
without build ids.
To support them:
1. In app_profiler.py, download libraries without build ids in native
lib dir.
2. In DebugElfFileFinder in dso.cpp, check path with the same basename
in symfs_dir.
Also add document for downloading unstripped libraries on device.
Bug: none
Test: run simpleperf_unit_test.
Test: run test.py.
Change-Id: I5d9015e683f2ecb992d425a42f1f7303307b2cea
Yabin Cui [Tue, 19 Nov 2019 18:25:36 +0000 (18:25 +0000)]
Merge "simpleperf: exclude undefined symbols."
Yabin Cui [Tue, 19 Nov 2019 01:23:27 +0000 (17:23 -0800)]
simpleperf: exclude undefined symbols.
Bug: none
Test: run simpleperf_unit_test.
Change-Id: I13c1e926d21897090103741744a7613b3f844c6a
Yabin Cui [Fri, 15 Nov 2019 22:48:20 +0000 (22:48 +0000)]
Merge "simpleperf:add MSM8909 into whitelist, omit tests requireing hw counters."
Yabin Cui [Fri, 15 Nov 2019 22:24:23 +0000 (22:24 +0000)]
Merge "simpleperf: fix build_id checking."
Yabin Cui [Thu, 14 Nov 2019 23:24:07 +0000 (15:24 -0800)]
simpleperf: fix build_id checking.
Native libraries in apks may not have build ids. So change to below
rules when looking for a debug elf file:
1) If having a build id, the build ids should match.
2) Otherwise, the debug elf file should exist and not have a build id.
Bug: none
Test: run simpleperf_unit_test.
Test: test.py.
Change-Id: I01332e3010a6df17e70c6c55e15874d43bfaeb86
pmc.waiver [Thu, 7 Nov 2019 07:54:38 +0000 (16:54 +0900)]
simpleperf:add MSM8909 into whitelist, omit tests requireing hw counters.
Test: run cts -m CtsSimpleperfTestCases -t record_cmd#generate_samples_by_hw_counters
Test: hw counters.
Bug:
144472902
(cherry picked from commit
8a0a1ebb671bed0c910d35e71bbc083a031f7331)
Change-Id: I728ea2d83c9b89fc04d442971f76293fed9099ed
Yabin Cui [Thu, 14 Nov 2019 19:58:33 +0000 (19:58 +0000)]
Merge "simpleperf: fix failed python tests on Android O."
Treehugger Robot [Sat, 9 Nov 2019 00:45:33 +0000 (00:45 +0000)]
Merge "Fix build with new googletest"
Yabin Cui [Sat, 9 Nov 2019 00:04:05 +0000 (16:04 -0800)]
simpleperf: fix failed python tests on Android O.
Fix *.test_pprof_proto_generator tests by allowing elf files
not having build id.
Fix TestExamplePureJavaTraceOffCpu.test_smoke by loosing check.
Bug: none
Test: run test.py on Android O.
Change-Id: I5a796f433a56735989b90a2339765d1e70e3939f
Yabin Cui [Fri, 8 Nov 2019 21:57:37 +0000 (21:57 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
5991547."
Yabin Cui [Fri, 8 Nov 2019 21:48:09 +0000 (21:48 +0000)]
Merge "simpleperf: fix test due to llvm-symbolizer upgrade."
Yabin Cui [Fri, 8 Nov 2019 21:46:04 +0000 (13:46 -0800)]
simpleperf: fix test due to llvm-symbolizer upgrade.
Bug: none
Test: test.py *test_addr2nearestline
Change-Id: I1de1f55c25d7f9652e931a23416947ba63beb101
Yabin Cui [Thu, 7 Nov 2019 18:01:27 +0000 (10:01 -0800)]
simpleperf: update simpleperf prebuilts to build
5991547.
Taken from branch aosp-simpleperf-release.
Bug: none
Test: run test.py on flame.
Change-Id: I4e0848a9006ec24cb7b17297ebfd5d993f1aa0fd
Haibo Huang [Fri, 8 Nov 2019 20:20:22 +0000 (12:20 -0800)]
Fix build with new googletest
The new googletest requires prefix to be non-empty.
Change-Id: Iacd96a6e2fcfb2193c7627212e9e710fb655d6d9
Yabin Cui [Thu, 7 Nov 2019 00:35:35 +0000 (00:35 +0000)]
Merge "simpleperf: fix test.py on x86/x86_64."
Yabin Cui [Wed, 6 Nov 2019 20:28:48 +0000 (12:28 -0800)]
simpleperf: fix test.py on x86/x86_64.
Find 32bit abi on device instead of hardcoding to arm.
Add x86/x86_64 libraries in test apks.
Bug: none
Test: run test.py on x86 emulator.
Change-Id: Ie19b8423c2dfb2260bdc4bae6313b54aaa2847ab
Yabin Cui [Wed, 6 Nov 2019 20:35:02 +0000 (20:35 +0000)]
Merge "simpleperf: allow more than one pattern in test.py."
Yabin Cui [Wed, 6 Nov 2019 00:25:36 +0000 (16:25 -0800)]
simpleperf: allow more than one pattern in test.py.
Bug: none
Test: run test.py TestTools* TestExample*.
Change-Id: I26e0a37113044cb96c90ff8a02d7f3b34d356c19
Yabin Cui [Wed, 6 Nov 2019 19:22:31 +0000 (19:22 +0000)]
Merge "simpleperf: add browser option in test.py."
Yabin Cui [Tue, 5 Nov 2019 23:53:58 +0000 (15:53 -0800)]
simpleperf: add browser option in test.py.
To control whether generated html files should be shown in browser.
Bug: none
Test: test.py.
Change-Id: I58eeae716e42068bd5f278bb8006d8818e3fc63c
Yabin Cui [Tue, 5 Nov 2019 23:41:02 +0000 (23:41 +0000)]
Merge "simpleperf: add temporary work around for debug interface change."
Yabin Cui [Tue, 5 Nov 2019 22:31:17 +0000 (14:31 -0800)]
simpleperf: add temporary work around for debug interface change.
To fix a libunwindstack problem, ART appends new debug entries to the
end of the debug entry list, insteading prepending to it. This breaks
CtsSimpleperfTestCases.
This CL adds a temporary work around in simpleperf, so we have time
to try other fixes in ART.
Bug:
143375574
Test: run simpleperf_unit_test
Change-Id: I5d73792996fb89d22a664b982e667ba0a4ee8276
Yabin Cui [Tue, 5 Nov 2019 21:24:23 +0000 (21:24 +0000)]
Merge "simpleperf: keep generated data of test.py."
Yabin Cui [Tue, 29 Oct 2019 00:16:54 +0000 (17:16 -0700)]
simpleperf: keep generated data of test.py.
Keep generated data of each test of test.py in a separate directory,
so we can:
1) check generated html after testing.
2) check profiling data for failed tests.
3) run tests for different devices in different dirs at the same time.
Also continue test when a test pass fails in run_tests().
Bug:
142972498
Test: run test.py.
Change-Id: If8468f0e180d441b74c070b978375b27c293a006
Yabin Cui [Fri, 1 Nov 2019 22:23:43 +0000 (22:23 +0000)]
Merge "simpleperf: test profiling apps with the same abi."
Yabin Cui [Wed, 30 Oct 2019 23:40:55 +0000 (16:40 -0700)]
simpleperf: test profiling apps with the same abi.
32-bit simpleperf can't profile 64-bit java app. Because simpleperf
uses process_vm_readv() to read jit debug interface of the app process.
If the jit debug info is at address >= 1<<32, then 32-bit simpleperf
can't read it.
So install apks in the same abi as the test to avoid test failure.
Bug: none
Test: run 32-bit simpleperf_unit_test.
Change-Id: Ie3b4db320389bf5acb30ff5ea1f071b5fc3e2736
Yabin Cui [Thu, 31 Oct 2019 17:39:12 +0000 (17:39 +0000)]
Merge "simpleperf: fix small errors in JITDebugReader."
Yabin Cui [Wed, 30 Oct 2019 23:07:28 +0000 (16:07 -0700)]
simpleperf: fix small errors in JITDebugReader.
1. When seeing an entry with symfile_size = 0, we should move
to the next entry.
2. Skip labels having zero length in jit debug file.
Bug: none
Test: run simpleperf_unit_test.
Change-Id: Iaa914cc4c6567ae5950194507c82e92316802a80
Elliott Hughes [Wed, 30 Oct 2019 19:39:36 +0000 (19:39 +0000)]
Merge "simpleperf: just use _Exit directly."
Elliott Hughes [Wed, 30 Oct 2019 01:34:28 +0000 (18:34 -0700)]
simpleperf: just use _Exit directly.
We don't actually need the quick_exit() machinery because we weren't
setting any at_quick_exit() handlers, so just call _Exit() directly.
This will let us remove the Mac/Windows quick_exit() implementation from
libbase (and will let simpleperf exit just a little bit quicker).
Test: treehugger
Change-Id: I4ce74cb80acc744721cf367930ca3e577b8fc614
Treehugger Robot [Wed, 30 Oct 2019 00:27:58 +0000 (00:27 +0000)]
Merge "libfscrypt: Export FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64"
Paul Crowley [Tue, 29 Oct 2019 21:16:57 +0000 (14:16 -0700)]
libfscrypt: Export FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64
We need to test for this flag when deciding whether to set
stable_inodes.
Bug:
143307095
Test: Set inlinecrypt_optimized, check that stable_inodes is set
Change-Id: Ic3245466eccd88ed2784ff4b2a348ca65085e2a4
Treehugger Robot [Tue, 29 Oct 2019 15:32:39 +0000 (15:32 +0000)]
Merge "libfscrypt: Support inlinecrypt_optimized flag"
Treehugger Robot [Tue, 29 Oct 2019 04:01:55 +0000 (04:01 +0000)]
Merge changes I28f35a1e,Ieb72dc88
* changes:
libfscrypt: Infer flags at parse time and include in options struct
libfscrypt: No need for parts-parsing any more, integrate code.
Paul Crowley [Tue, 29 Oct 2019 02:00:36 +0000 (02:00 +0000)]
Merge changes from topic "fstab-options"
* changes:
libfscrypt: Options parser now fills missing defaults
libfscrypt: Log which version of policy we set.
Paul Crowley [Sat, 26 Oct 2019 00:09:03 +0000 (17:09 -0700)]
libfscrypt: Support inlinecrypt_optimized flag
Bug:
143307095
Test: add flag in fstab, check policy logs
Change-Id: Ic80d348c2c7d56048e0e73d985f709e8d287cd9f
Paul Crowley [Fri, 25 Oct 2019 17:28:53 +0000 (10:28 -0700)]
libfscrypt: Infer flags at parse time and include in options struct
Bug:
143307095
Test: cuttlefish, policy=v1 -> flags=0, policy=v2 -> flags=2
Change-Id: I28f35a1e0ee474d07e2e2b591c84e9057ecb6acf
Paul Crowley [Fri, 25 Oct 2019 06:27:50 +0000 (23:27 -0700)]
libfscrypt: Options parser now fills missing defaults
Bug:
143307095
Test: use parser for fstab
Change-Id: Ia103a2e7947d03fb50a378472203363477d865e5
Paul Crowley [Fri, 25 Oct 2019 17:19:10 +0000 (10:19 -0700)]
libfscrypt: No need for parts-parsing any more, integrate code.
Bug:
143307095
Test: atest libfscrypt_unit_test
Change-Id: Ieb72dc88c227128ecadc44096a2266fe2af0d20b
Paul Crowley [Fri, 25 Oct 2019 05:51:20 +0000 (22:51 -0700)]
libfscrypt: Log which version of policy we set.
Bug:
143307095
Test: check logs
Change-Id: Ib8a91dc153919063bc3daf5075848a64a7e48cf8
Yabin Cui [Fri, 25 Oct 2019 21:32:36 +0000 (21:32 +0000)]
Merge "simpleperf: don't adjust frequency for etm recording."
Paul Crowley [Fri, 25 Oct 2019 18:05:26 +0000 (18:05 +0000)]
Merge "Provide struct-based C++ interface"
Paul Crowley [Thu, 24 Oct 2019 21:51:44 +0000 (14:51 -0700)]
Provide struct-based C++ interface
Replace many-parameter C interface with a cleaner and more complete
C++ interface for passing around policies in a struct.
Bug:
143307095
Test: treehugger
Change-Id: I95aeaae211f7ad698854bcc66c6d25a0bcb24cfe
Wei Wang [Fri, 25 Oct 2019 02:18:28 +0000 (02:18 +0000)]
Merge "libperfmgr: remove node written tests"
Wei Wang [Thu, 24 Oct 2019 23:42:35 +0000 (16:42 -0700)]
libperfmgr: remove node written tests
Test: build
Change-Id: I0754c42a46f0a7f252190dcad2a58bc7877a85cf
Wei Wang [Thu, 24 Oct 2019 04:25:45 +0000 (21:25 -0700)]
Merge "Update help commands"
am:
f133fac48c
Change-Id: I81aaa1c3f122529c9f1d728e20e50e0ed531976d
Wei Wang [Thu, 24 Oct 2019 04:10:49 +0000 (04:10 +0000)]
Merge "Update help commands"
TreeHugger Robot [Thu, 24 Oct 2019 00:26:48 +0000 (00:26 +0000)]
Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-master
Wei Wang [Wed, 23 Oct 2019 23:08:03 +0000 (16:08 -0700)]
Update help commands
Test: build
Change-Id: I41b2e23d19c8e01927ae7e78585f19aedfd2a37a
Wei Wang [Wed, 23 Oct 2019 22:35:55 +0000 (15:35 -0700)]
Merge "add options to exec individual hint and specify hint duration"
am:
c3e7371880
Change-Id: I9e4a262520f95b7a87ce1de3dd53d36a499e15e4
Wei Wang [Wed, 23 Oct 2019 22:06:35 +0000 (22:06 +0000)]
Merge "add options to exec individual hint and specify hint duration"
Wei Wang [Wed, 23 Oct 2019 00:06:50 +0000 (17:06 -0700)]
add options to exec individual hint and specify hint duration
Test: boot and run perfmgr_config_verifier
Change-Id: I0239edc457a04f793bd85a81e726668d605321f7
Yabin Cui [Mon, 21 Oct 2019 22:12:40 +0000 (15:12 -0700)]
Merge "simpleperf: add periodic callback to flush etm data."
am:
b0afbc964f
Change-Id: I206910e8132e4681929d5b67a2dbc4a50227d2e2
Yabin Cui [Mon, 21 Oct 2019 18:26:06 +0000 (11:26 -0700)]
simpleperf: don't adjust frequency for etm recording.
Bug: none
Test: run simpleperf_unit_test.
Change-Id: I401bcc72492b8a751c4a06f37026ef93d0af74c0
Yabin Cui [Mon, 21 Oct 2019 21:18:14 +0000 (21:18 +0000)]
Merge "simpleperf: add periodic callback to flush etm data."
Yabin Cui [Mon, 21 Oct 2019 20:28:12 +0000 (13:28 -0700)]
Merge "simpleperf: fix ScopedEventTypes."
am:
d5c0d63fc1
Change-Id: I66373e86dff93084256068b825b78f9e261b8132
Yabin Cui [Mon, 21 Oct 2019 18:54:46 +0000 (18:54 +0000)]
Merge "simpleperf: fix ScopedEventTypes."
Yabin Cui [Fri, 18 Oct 2019 23:54:47 +0000 (16:54 -0700)]
simpleperf: add periodic callback to flush etm data.
Bug: none
Test: run simpleperf_unit_test.
Test: record etm data manually.
Change-Id: I620bcd0606c5ecf7eb076db503baad7f1a54b1d4
Martin Stjernholm [Sat, 19 Oct 2019 12:38:42 +0000 (05:38 -0700)]
Merge "Clean up unnecessary dependency on ART internal defaults module."
am:
1476635e45
Change-Id: Id84a9a4d0708b7cec8738b0b73d4fddbf44ae349
Treehugger Robot [Sat, 19 Oct 2019 12:20:47 +0000 (12:20 +0000)]
Merge "Clean up unnecessary dependency on ART internal defaults module."
Yabin Cui [Sat, 19 Oct 2019 00:23:32 +0000 (17:23 -0700)]
simpleperf: fix ScopedEventTypes.
Bug: none
Test: run simpleperf_unit_test.
Change-Id: I7d9e91075e535ff5c85d4c13a301704359907f0a
Yabin Cui [Fri, 18 Oct 2019 23:56:10 +0000 (16:56 -0700)]
Merge "simpleperf: reduce and recover from etm decoding errors."
am:
81932dc525
Change-Id: Ife0846a3ea8df69c33f0feef4ab60f17cce08fe7
Yabin Cui [Fri, 18 Oct 2019 23:24:43 +0000 (23:24 +0000)]
Merge "simpleperf: reduce and recover from etm decoding errors."
Yabin Cui [Fri, 18 Oct 2019 21:01:15 +0000 (14:01 -0700)]
simpleperf: reduce and recover from etm decoding errors.
ETM decoding fails when processing some invalid data like invalid packet
headers. Invalid data may be caused by truncated etm data or other
reasons.
Invalid data can be skipped by resetting decoders, which will force
decoders to look for sync points (I_ASYNC packets) in the data stream.
So to fix the problem:
1. Reset decoders when processing a new data block, which avoid invalid
data at the beginning of a block.
2. When having a decoding error, recover from it by resetting decoders.
Bug: none
Test: run simpleperf_unit_test.
Test: record and decode etm data continuously on device.
Change-Id: If44edc04428f22e605afe994aabeb6ff350cffb1
Christopher Ferris [Fri, 18 Oct 2019 01:05:41 +0000 (18:05 -0700)]
Merge "Allow trace files to be zipped or text files."
am:
9a28fa0125
Change-Id: I629d73519af7db2ee5a404f26546a079c988e5ce
Christopher Ferris [Fri, 18 Oct 2019 00:54:49 +0000 (00:54 +0000)]
Merge "Allow trace files to be zipped or text files."
Martin Stjernholm [Wed, 9 Oct 2019 23:26:01 +0000 (00:26 +0100)]
Clean up unnecessary dependency on ART internal defaults module.
Only libdexfile_support_static is actually used.
Test: atest system/extras/simpleperf
Bug:
133140750
Change-Id: I2d71b25a1610664648f9172613046ae1ab13177f
Christopher Ferris [Thu, 17 Oct 2019 21:58:57 +0000 (14:58 -0700)]
Allow trace files to be zipped or text files.
Add and update unit tests to verify this behavior.
Test: Ran unit tests.
Test: Ran memory_replay on zipped file and text file.
Test: Ran trace_benchmark.
Change-Id: I296b27902a5a53a130a2c09063efc369830a9d05
Xin Li [Wed, 16 Oct 2019 22:19:31 +0000 (15:19 -0700)]
Skip QD1A.190821.011 in stage-aosp-master
Bug:
141248619
Change-Id: If13d25087fb538b7165d10fd1a010953ba86c58d
Yabin Cui [Fri, 11 Oct 2019 21:26:39 +0000 (14:26 -0700)]
Merge "simpleperf: update simpleperf prebuilts to build
5933778."
am:
a8bd5066f2
Change-Id: Ie72385ef75198b8420218921990b7a2c83f24d97
Treehugger Robot [Fri, 11 Oct 2019 21:08:09 +0000 (21:08 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
5933778."
Yabin Cui [Fri, 11 Oct 2019 17:19:32 +0000 (10:19 -0700)]
simpleperf: update simpleperf prebuilts to build
5933778.
Taken from branch aosp-simpleperf-release.
Bug: none
Test: run test.py on linux.
Change-Id: I79ccb883d484812866e6f11d494ee8c5c6042856
Yabin Cui [Fri, 11 Oct 2019 00:45:06 +0000 (17:45 -0700)]
Merge "simpleperf: change based on jit debug interface change."
am:
84b9c942fb
Change-Id: I9ee97e7510c288ffafe0e7cbd968b163046435d4
Yabin Cui [Fri, 11 Oct 2019 00:22:16 +0000 (00:22 +0000)]
Merge "simpleperf: change based on jit debug interface change."
Yabin Cui [Mon, 7 Oct 2019 22:15:12 +0000 (15:15 -0700)]
simpleperf: change based on jit debug interface change.
1. Change magic field and sizeof_entry check for JITDescriptor.
2. Use seqlock field in JITCodeEntryV2 to check its valid.
3. Allow but skip entry with symfile_size = 0 in V2.
Bug:
141558390
Test: run simpleperf_unit_test.
Change-Id: I30e214597cec78c73492fdfeac1f9766b775f0e3
David Anderson [Thu, 10 Oct 2019 01:58:20 +0000 (18:58 -0700)]
lpmake: Don't assume a device is retrofit if it has one block device for super.
Bug:
141936600
Test: lpmake with one retrofit partition
Change-Id: I3644ce3af68d6f7d037626938615cc5b9a786e15
Yabin Cui [Wed, 9 Oct 2019 17:48:52 +0000 (10:48 -0700)]
Merge "simpleperf: create one map for each jit symbol."
am:
7ea25d629c
Change-Id: I860b84d19fada18f48f35b0fb36f278d2e3e4f6a
Yabin Cui [Wed, 9 Oct 2019 17:14:43 +0000 (17:14 +0000)]
Merge "simpleperf: create one map for each jit symbol."
Yabin Cui [Tue, 8 Oct 2019 23:27:09 +0000 (16:27 -0700)]
Merge "simpleperf: merge jitted and interpreted java methods."
am:
bf9f91a149
Change-Id: Iad4f3daffa1cf3cf315a0e6de4575fdf04b19b5c
Yabin Cui [Tue, 8 Oct 2019 23:10:18 +0000 (23:10 +0000)]
Merge "simpleperf: merge jitted and interpreted java methods."
Yabin Cui [Tue, 8 Oct 2019 00:44:05 +0000 (17:44 -0700)]
simpleperf: merge jitted and interpreted java methods.
Bug:
132370901
Test: run test.py TestReportLib.test_merge_java_methods.
Change-Id: I9e2cc9a0db6a6f94611947c4f146a51aff85d593
Yabin Cui [Mon, 7 Oct 2019 22:57:56 +0000 (15:57 -0700)]
simpleperf: create one map for each jit symbol.
JIT debug interface in ART regularly repacks jit symbols, making
overlapped jit symfile maps:
For example, jit symfile A contains many symbols, in addr range [0xa000, 0xb000),
but excluding [0xa100, 0xa110]. And jit symfile B contains only one symbol, in
addr range [0xa100, 0xa108).
So jit symfile A and B have overlapped addr range, while the symbols in
them are all valid.
Simpleperf can't keep maps with overlapped addr range, thus fails to unwind in
this situation.
Fix it by creating one map for each jit symbol instead of jit symfile.
Bug: none
Test: run simpleperf_unit_test.
Test: run test.py TestRecordingRealApps.test_recording_displaybitmaps.
Change-Id: I8392bb331c98830dc9a98031a08c0567dd66ff4b
Eric Biggers [Mon, 7 Oct 2019 19:26:49 +0000 (12:26 -0700)]
Merge "libfscrypt: support setting v2 encryption policies"
am:
c5f7c38480
Change-Id: Ief71f4a70e9e2c2be5524a44795c793cf5bd311b
Eric Biggers [Mon, 7 Oct 2019 19:09:44 +0000 (19:09 +0000)]
Merge "libfscrypt: support setting v2 encryption policies"
Anton Hansson [Fri, 4 Oct 2019 06:52:42 +0000 (23:52 -0700)]
Merge "Make cppreopts.sh deal with new layout"
am:
cf29d5254c
Change-Id: Ie9db469d29e292d3b44daaea2b274b0b37603920
Anton Hansson [Fri, 4 Oct 2019 06:30:55 +0000 (06:30 +0000)]
Merge "Make cppreopts.sh deal with new layout"
Yabin Cui [Thu, 3 Oct 2019 20:47:10 +0000 (13:47 -0700)]
Merge "simpleperf: add app tests in python test."
am:
955434d2fc
Change-Id: I308992609af219fd6774dce78af75e55efa9f180
Yabin Cui [Thu, 3 Oct 2019 20:31:04 +0000 (20:31 +0000)]
Merge "simpleperf: add app tests in python test."
Yabin Cui [Thu, 3 Oct 2019 19:06:27 +0000 (12:06 -0700)]
simpleperf: add app tests in python test.
Also fix log overwrite in TestLogger.
Bug:
141882072
Test: run test.py TestRecordingRealApps*.
Change-Id: I0e85224c40a66dbbd1caab5ff0bb48852712a06e