OSDN Git Service
Jeremy Compostella [Thu, 16 Jun 2016 19:20:20 +0000 (19:20 +0000)]
Merge \"libfec: pack the fec_header structure\" into nyc-mr1-dev
am:
5ac3592d7f
Change-Id: Ia63d90ee113be85b4f987a162f0da73b669813a4
Thierry Strudel [Thu, 16 Jun 2016 19:15:40 +0000 (19:15 +0000)]
Merge "libfec: pack the fec_header structure" into nyc-mr1-dev
Jeremy Compostella [Tue, 10 May 2016 09:53:06 +0000 (11:53 +0200)]
libfec: pack the fec_header structure
The fec_header structure is generated build time and stored on disk.
The fec_header might be build on a 64 bits machine while it is read
per a 32 bits device or the other way around. In such situations, the
fec_header fields are not aligned as expected by the device and it
fails to read the fec_header structure.
This patch makes the fec_header packed.
Change-Id: I77546f850cea5559909971a1192e1a7616d22d50
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Yabin Cui [Wed, 15 Jun 2016 23:26:45 +0000 (23:26 +0000)]
Merge \\\"simpleperf: add type modifier when reporting events.\\\" am:
90d56472a6 am:
fb768fd700
am:
1f3b56c62f
Change-Id: I8f72b4f2bbde8e70660e0088a7d874851f4f7004
Yabin Cui [Wed, 15 Jun 2016 23:24:07 +0000 (23:24 +0000)]
Merge \\"simpleperf: add type modifier when reporting events.\\" am:
90d56472a6
am:
fb768fd700
Change-Id: I544470c367fa0b188b5bb0a1b570efcddd0bdec1
Yabin Cui [Wed, 15 Jun 2016 23:21:39 +0000 (23:21 +0000)]
Merge \"simpleperf: add type modifier when reporting events.\"
am:
90d56472a6
Change-Id: Iee188f56a1d74e972898f011e7d1bfc2a9e8ce12
Yabin Cui [Wed, 15 Jun 2016 22:50:12 +0000 (22:50 +0000)]
Merge "simpleperf: add type modifier when reporting events."
Yabin Cui [Wed, 15 Jun 2016 22:33:14 +0000 (22:33 +0000)]
Merge \\\"simpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function.\\\" am:
82cc1bf01d am:
bf66399909
am:
f3886d352f
Change-Id: I9f5ff1667b1c38e8e09729ecf14182ad426c030d
Yabin Cui [Wed, 15 Jun 2016 22:28:16 +0000 (22:28 +0000)]
Merge \\"simpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function.\\" am:
82cc1bf01d
am:
bf66399909
Change-Id: Iece599050c969665d2f03b20dc382d074b94b4ca
Yabin Cui [Wed, 15 Jun 2016 22:22:28 +0000 (22:22 +0000)]
Merge \"simpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function.\"
am:
82cc1bf01d
Change-Id: I4e62a848ea0a5299c8884ecaa335698f3a439891
Yabin Cui [Wed, 15 Jun 2016 21:50:10 +0000 (21:50 +0000)]
Merge "simpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function."
Yabin Cui [Wed, 15 Jun 2016 19:10:33 +0000 (12:10 -0700)]
simpleperf: add type modifier when reporting events.
Before the change:
$simpleperf record -e cpu-cycles:u sleep 1
$simpleperf report
...
Event: cpu-cycles (type 0, config 0)
...
After the change:
$simpleperf report
...
Event: cpu-cycles:u (type 0, config 0)
...
Change-Id: I296c5476e03250e928ed0f579483d6866576d417
Yabin Cui [Wed, 15 Jun 2016 18:49:23 +0000 (11:49 -0700)]
simpleperf: replace SIMPLEPERF_ALIGN macro with Align inline function.
Change-Id: Id9e9e67174ab3f857eb2baa9609351b60586b8dd
Mohamad Ayyash [Wed, 15 Jun 2016 17:02:47 +0000 (17:02 +0000)]
Merge changes from topic \\'squashfs_ota_incrementals\\' into nyc-dev am:
7354c0e18b
am:
67873bad91
Change-Id: I884b5511d21bfa260444f3c6c32b9f655963a068
Mohamad Ayyash [Wed, 15 Jun 2016 17:02:21 +0000 (17:02 +0000)]
resolve merge conflicts of
7354c0e to nyc-mr1-dev
am:
c8966476a1
Change-Id: Ief87c0cb7ff6fc0803b04ad69712068a4a186041
Mohamad Ayyash [Wed, 15 Jun 2016 16:38:04 +0000 (09:38 -0700)]
resolve merge conflicts of
7354c0e to nyc-mr1-dev
Change-Id: I19693f5459794b71decfae4507fb2742c74f7c41
Mohamad Ayyash [Wed, 15 Jun 2016 16:12:54 +0000 (16:12 +0000)]
Merge changes from topic \'squashfs_ota_incrementals\' into nyc-dev
am:
7354c0e18b
Change-Id: I46e8cfc15ebdcaba6da52f016a29146c2e92dab2
Mohamad Ayyash [Wed, 15 Jun 2016 16:03:08 +0000 (16:03 +0000)]
Merge changes from topic 'squashfs_ota_incrementals' into nyc-dev
* changes:
Disable fragments and duplicates detection for squashfs
mksquashfsimage.sh: Add support for passing block map files
Tao Bao [Tue, 14 Jun 2016 16:27:39 +0000 (16:27 +0000)]
Merge \\\"boot_control_copy: Track the the bootloader_message struct change.\\\" am:
42ca0e1992 am:
713a9a5c19
am:
22da4e5214
Change-Id: I5cbf51a14a7c8560d108a371f71167bda753f03e
Tao Bao [Tue, 14 Jun 2016 16:23:01 +0000 (16:23 +0000)]
Merge \\"boot_control_copy: Track the the bootloader_message struct change.\\" am:
42ca0e1992
am:
713a9a5c19
Change-Id: Iefde6de81a2a566b66a51b707ea0aa8a3dfb24d2
Tao Bao [Tue, 14 Jun 2016 16:18:27 +0000 (16:18 +0000)]
Merge \"boot_control_copy: Track the the bootloader_message struct change.\"
am:
42ca0e1992
Change-Id: If4d94cbe24619b3e9f7f7924d2e76dfe25b78f46
Tao Bao [Tue, 14 Jun 2016 16:09:16 +0000 (16:09 +0000)]
Merge "boot_control_copy: Track the the bootloader_message struct change."
Mohamad Ayyash [Tue, 24 May 2016 20:53:53 +0000 (13:53 -0700)]
Disable fragments and duplicates detection for squashfs
They don't play nicely with generating block maps. Fragments reduce
performance. A later patch will add workaround for duplicate detection.
BUG:
22322817
Change-Id: I01c731202ef7a2450b5d1beca627a0158c9cc3b4
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Mohamad Ayyash [Mon, 13 Jun 2016 21:45:31 +0000 (14:45 -0700)]
mksquashfsimage.sh: Add support for passing block map files
BUG:
22322817
Change-Id: I7e17f6ad3a503ee97f7a81a1a8382cff47a913c6
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Yabin Cui [Tue, 14 Jun 2016 01:57:33 +0000 (01:57 +0000)]
Merge \\\"simpleperf: fix mac build.\\\" am:
898b3f48e2 am:
ab0531d484
am:
f0925fb6a4
Change-Id: I3e4a59c41622e62e1f28f8643a6b998f71b9132e
Yabin Cui [Tue, 14 Jun 2016 01:52:57 +0000 (01:52 +0000)]
Merge \\"simpleperf: fix mac build.\\" am:
898b3f48e2
am:
ab0531d484
Change-Id: Iae639a12f2629774731b4ab7d85eab1b6755efd7
Yabin Cui [Tue, 14 Jun 2016 01:47:48 +0000 (01:47 +0000)]
Merge \"simpleperf: fix mac build.\"
am:
898b3f48e2
Change-Id: I92ea3c4aea4ec7426770a49c313223b52fd2d807
Yabin Cui [Tue, 14 Jun 2016 01:40:35 +0000 (01:40 +0000)]
Merge "simpleperf: fix mac build."
Yabin Cui [Tue, 14 Jun 2016 01:29:53 +0000 (01:29 +0000)]
Merge \\\"simpleperf: support report samples using format defined by protobuf.\\\" am:
9e02231f56 am:
78b15d0e54
am:
922bec969f
Change-Id: Ic2cb8a0493ee9d7a617ce77ffe8197d916beb7cc
Yabin Cui [Tue, 14 Jun 2016 01:24:17 +0000 (01:24 +0000)]
Merge \\"simpleperf: support report samples using format defined by protobuf.\\" am:
9e02231f56
am:
78b15d0e54
Change-Id: I166ad49ea4081500f77567a2cf7ab1f2664a793c
Yabin Cui [Tue, 14 Jun 2016 01:14:39 +0000 (18:14 -0700)]
simpleperf: fix mac build.
Bug:
28114205
Change-Id: I84ad011b10c19e07576b718ba4b6b6c52a823366
Yabin Cui [Tue, 14 Jun 2016 00:25:17 +0000 (00:25 +0000)]
Merge \"simpleperf: support report samples using format defined by protobuf.\"
am:
9e02231f56
Change-Id: I6d7fd1959484c588ace7b8753c8d7c67d691773e
Yabin Cui [Tue, 14 Jun 2016 00:16:34 +0000 (00:16 +0000)]
Merge "simpleperf: support report samples using format defined by protobuf."
Yabin Cui [Fri, 3 Jun 2016 22:06:53 +0000 (15:06 -0700)]
simpleperf: support report samples using format defined by protobuf.
Bug:
28114205
Change-Id: Idf6d64b8418b3d55d5a43f6096dd2d69764692c0
Sami Tolvanen [Mon, 13 Jun 2016 15:24:32 +0000 (15:24 +0000)]
Merge \\\"libfec: return raw and corrected verity metadata signatures\\\" am:
964cae530c am:
66c3086727
am:
18c04cbec1
Change-Id: Ifec6b8f806536c5fedc14917de05b390c4c1e7db
Sami Tolvanen [Mon, 13 Jun 2016 15:20:18 +0000 (15:20 +0000)]
Merge \\"libfec: return raw and corrected verity metadata signatures\\" am:
964cae530c
am:
66c3086727
Change-Id: I8be1b4fbca0ce966aede30acd91fc9f88994e9de
Sami Tolvanen [Mon, 13 Jun 2016 15:12:21 +0000 (15:12 +0000)]
Merge \"libfec: return raw and corrected verity metadata signatures\"
am:
964cae530c
Change-Id: I5965e8f81c8f9813ce8cfe979283e9348f4e9ea7
Sami Tolvanen [Mon, 13 Jun 2016 15:04:16 +0000 (15:04 +0000)]
Merge "libfec: return raw and corrected verity metadata signatures"
Yabin Cui [Sat, 11 Jun 2016 04:10:07 +0000 (04:10 +0000)]
Merge \\"simpleperf: restore perf_harden after simpleperf cts test.\\" into nyc-dev am:
4d9e9c66fb
am:
aabbbfde48
Change-Id: I5649fc456c92a918fc92e36e007378dd6ca45abb
Yabin Cui [Sat, 11 Jun 2016 04:05:58 +0000 (04:05 +0000)]
Merge \\"simpleperf: restore perf_harden after simpleperf cts test.\\" into nyc-dev am:
4d9e9c66fb -s ours
am:
2fd7432b78
Change-Id: Ia1edc98fa397d731694e9e13d6f73430dbaf981c
Yabin Cui [Sat, 11 Jun 2016 04:02:12 +0000 (04:02 +0000)]
Merge \"simpleperf: restore perf_harden after simpleperf cts test.\" into nyc-dev
am:
4d9e9c66fb -s ours
Change-Id: I4b6cf1587671fba18b5bc5b45d8f0352c436a75c
Yabin Cui [Sat, 11 Jun 2016 03:58:28 +0000 (03:58 +0000)]
Merge \"simpleperf: restore perf_harden after simpleperf cts test.\" into nyc-dev
am:
4d9e9c66fb
Change-Id: I39119b7d227b946e294b40bfd6805d886d92fa8b
Yabin Cui [Sat, 11 Jun 2016 03:53:11 +0000 (03:53 +0000)]
Merge "simpleperf: restore perf_harden after simpleperf cts test." into nyc-dev
Yabin Cui [Sat, 11 Jun 2016 02:08:06 +0000 (02:08 +0000)]
simpleperf: check perf event limit. am:
92c688b1f7 -s ours
am:
684913e3b5
Change-Id: Iac6257c9f1fa0f8fe568cd0db8371dc3d243d993
Yabin Cui [Sat, 11 Jun 2016 02:04:10 +0000 (02:04 +0000)]
simpleperf: check perf event limit. am:
92c688b1f7
am:
beafc29feb -s ours
Change-Id: I01a4bc712c8bcbc8eaa0c176d251199ac43dcf03
Yabin Cui [Sat, 11 Jun 2016 02:04:09 +0000 (02:04 +0000)]
simpleperf: check perf event limit.
am:
92c688b1f7 -s ours
Change-Id: Ic442205bbf8ba021f257f9cfcf46ed3ca30a7482
Yabin Cui [Fri, 10 Jun 2016 19:15:11 +0000 (12:15 -0700)]
simpleperf: restore perf_harden after simpleperf cts test.
Bug:
29264324
Change-Id: Ia78ef924f049630968d222729cf3c1f378105b8a
(cherry picked from commit
5896132e00c7e49d2468d7ebd5372654df29b872)
Yabin Cui [Sat, 11 Jun 2016 01:53:04 +0000 (01:53 +0000)]
simpleperf: check perf event limit.
am:
92c688b1f7
Change-Id: Ia53e2043e66f91a791e97353e7937ef1a4050d69
Yabin Cui [Sat, 11 Jun 2016 00:48:44 +0000 (00:48 +0000)]
Merge \\\"simpleperf: restore perf_harden after simpleperf cts test.\\\" am:
33732ddfd3 am:
9e3191452e
am:
77794d0906
Change-Id: I13dfebea47757fe81b80fb7d949006618f152145
Yabin Cui [Sat, 11 Jun 2016 00:45:19 +0000 (00:45 +0000)]
Merge \\"simpleperf: restore perf_harden after simpleperf cts test.\\" am:
33732ddfd3
am:
9e3191452e
Change-Id: I614cb8a32c44143e6c7630b1687c82fd1c9a8c5b
Yabin Cui [Sat, 11 Jun 2016 00:41:22 +0000 (00:41 +0000)]
Merge \"simpleperf: restore perf_harden after simpleperf cts test.\"
am:
33732ddfd3
Change-Id: Ibf4c201724d5254fed1db18e49ae8b1ccc6f05d3
Yabin Cui [Sat, 11 Jun 2016 00:30:03 +0000 (00:30 +0000)]
Merge "simpleperf: restore perf_harden after simpleperf cts test."
Yabin Cui [Wed, 1 Jun 2016 22:39:39 +0000 (15:39 -0700)]
simpleperf: check perf event limit.
The property security.perf_harden is added in https://android-review.googlesource.com/#/c/233736/5. And simpleperf needs to notice that.
Bug:
29054680
Change-Id: I5f1593f5b389d182a56c4bf3bd438a1dc2b66686
(cherry picked from commit
ebf79f3a65c81ef0f8cd7a3b875771be88157fcc)
Yabin Cui [Fri, 10 Jun 2016 19:15:11 +0000 (12:15 -0700)]
simpleperf: restore perf_harden after simpleperf cts test.
Bug:
29264324
Change-Id: Ia78ef924f049630968d222729cf3c1f378105b8a
Than McIntosh [Fri, 10 Jun 2016 11:11:57 +0000 (11:11 +0000)]
Merge \\\"Support for converting callchain profiles.\\\" am:
05c98248e6 am:
342b992f85
am:
5dfabbb05a
Change-Id: Ib4a5648c6a4fe638f43b5fb1315f341bbc76ba90
Than McIntosh [Fri, 10 Jun 2016 11:09:18 +0000 (11:09 +0000)]
Merge \\"Support for converting callchain profiles.\\" am:
05c98248e6
am:
342b992f85
Change-Id: I1d1f18dc1aa21f830bde03ec45ef121f94f0c5bf
Than McIntosh [Fri, 10 Jun 2016 11:06:34 +0000 (11:06 +0000)]
Merge \"Support for converting callchain profiles.\"
am:
05c98248e6
Change-Id: Ic217bbf8f52b1068e6778a56dea5e8a875305abd
Than McIntosh [Fri, 10 Jun 2016 11:02:40 +0000 (11:02 +0000)]
Merge "Support for converting callchain profiles."
Tao Bao [Fri, 10 Jun 2016 05:40:05 +0000 (22:40 -0700)]
boot_control_copy: Track the the bootloader_message struct change.
Bug:
29193360
Change-Id: I518e786eb2d45b6a71c25dc4402e3bbebef20dc6
Alex Deymo [Fri, 10 Jun 2016 04:04:56 +0000 (04:04 +0000)]
Merge \\\"postinst: Update comment to match implementation example.\\\" am:
47600b7efd am:
fa31c2c899
am:
9e7f69d629
Change-Id: I4c9c6b47e835c01a4fb2c0bc7b5da607bfd206e6
Alex Deymo [Fri, 10 Jun 2016 04:02:20 +0000 (04:02 +0000)]
Merge \\"postinst: Update comment to match implementation example.\\" am:
47600b7efd
am:
fa31c2c899
Change-Id: I96d62f4a8b607cba5fd6a763fd77e7a46f1dc547
Alex Deymo [Fri, 10 Jun 2016 03:59:36 +0000 (03:59 +0000)]
Merge \"postinst: Update comment to match implementation example.\"
am:
47600b7efd
Change-Id: I0ff2b20b3de03e08e3784e565d05e747718d34a3
Treehugger Robot [Fri, 10 Jun 2016 03:50:12 +0000 (03:50 +0000)]
Merge "postinst: Update comment to match implementation example."
Alex Deymo [Fri, 10 Jun 2016 01:09:43 +0000 (18:09 -0700)]
postinst: Update comment to match implementation example.
"set_progress" should be "global_progress" in the documentation as the
example shows.
Bug:
29223204
TEST=None
Change-Id: I01b2abb2ba500941e591515217533150ef05dd97
Sami Tolvanen [Fri, 3 Jun 2016 20:56:07 +0000 (13:56 -0700)]
libfec: return raw and corrected verity metadata signatures
Since it's not possible for libfec to identify whether the signature
field was successfully corrected, return both and allow the caller to
validate either signature.
Bug:
28943429
Change-Id: Ie913c21ba1d07d6df4c6feeb7226b2ec963f4d19
(cherry picked from commit
65cbaeb020b209f3d75d594ebbe49a609dd3c7e7)
Android Build Merger (Role) [Tue, 7 Jun 2016 04:06:03 +0000 (04:06 +0000)]
Merge "Do not build multinetwork tools when targeting the PDK am:
600c6341e6 am:
21d6b07cef" into nyc-mr1-dev-plus-aosp
Erik Kline [Tue, 7 Jun 2016 04:05:52 +0000 (04:05 +0000)]
Do not build multinetwork tools when targeting the PDK am:
600c6341e6
am:
21d6b07cef
* commit '
21d6b07cefb6d3c470255fea1325ffcf4f4f99ef':
Do not build multinetwork tools when targeting the PDK
Change-Id: Ifcfb1159f099f0d766e8aee1a6d1c91763e027b8
Erik Kline [Tue, 7 Jun 2016 04:05:44 +0000 (04:05 +0000)]
Do not build multinetwork tools when targeting the PDK am:
600c6341e6
am:
4a43478a82
* commit '
4a43478a82e2ac44388087619e978dd4809bfe4d':
Do not build multinetwork tools when targeting the PDK
Change-Id: I1c68046298d4e6af482a765d799e103654b270bf
Erik Kline [Tue, 7 Jun 2016 04:03:13 +0000 (04:03 +0000)]
Do not build multinetwork tools when targeting the PDK
am:
600c6341e6
* commit '
600c6341e62c165c60f526174d965cc7f1b30c38':
Do not build multinetwork tools when targeting the PDK
Change-Id: If2fcc9f0326ce63248b1845f26546baa894fcccd
Erik Kline [Tue, 7 Jun 2016 04:03:04 +0000 (04:03 +0000)]
Do not build multinetwork tools when targeting the PDK
am:
600c6341e6
* commit '
600c6341e62c165c60f526174d965cc7f1b30c38':
Do not build multinetwork tools when targeting the PDK
Change-Id: I1475ee586faf10942e805c51290d83aa1998cb5e
Erik Kline [Mon, 6 Jun 2016 21:57:12 +0000 (06:57 +0900)]
Do not build multinetwork tools when targeting the PDK
Bug:
29071416
Change-Id: Ie39cad3151907aabbf523895d6cde37b82ff29a2
Sami Tolvanen [Tue, 7 Jun 2016 01:13:58 +0000 (01:13 +0000)]
resolve merge conflicts of
65cbaeb to nyc-dev-plus-aosp
am:
8088eb27bd
* commit '
8088eb27bdaf6787bdc3d14123ec61e2010b0102':
Change-Id: I0fabe4dd397e98bc3db118162a9315f6a8326f71
Sami Tolvanen [Tue, 7 Jun 2016 00:53:02 +0000 (17:53 -0700)]
resolve merge conflicts of
98b6aad to nyc-mr1-dev-plus-aosp
Change-Id: If7685b0ed4a5c1cb01f6864fa6c5dcad91898bf0
Sami Tolvanen [Tue, 7 Jun 2016 00:47:07 +0000 (17:47 -0700)]
resolve merge conflicts of
65cbaeb to nyc-dev-plus-aosp
Change-Id: I577f36d8f4588866606ef4b3f4b88d5af3505fbf
Sami Tolvanen [Tue, 7 Jun 2016 00:05:42 +0000 (00:05 +0000)]
libfec: return raw and corrected verity metadata signatures
am:
65cbaeb020
* commit '
65cbaeb020b209f3d75d594ebbe49a609dd3c7e7':
libfec: return raw and corrected verity metadata signatures
Change-Id: I77bb88a549c2da0ed69f36d80ca6d93ed91a163b
Sami Tolvanen [Fri, 3 Jun 2016 20:56:07 +0000 (13:56 -0700)]
libfec: return raw and corrected verity metadata signatures
Since it's not possible for libfec to identify whether the signature
field was successfully corrected, return both and allow the caller to
validate either signature.
Bug:
28943429
Change-Id: Ie913c21ba1d07d6df4c6feeb7226b2ec963f4d19
Mohamad Ayyash [Mon, 6 Jun 2016 16:06:38 +0000 (16:06 +0000)]
Merge "Introduce squashfs compression threshold" into nyc-mr1-dev
am:
f6b999e7c8
* commit '
f6b999e7c8153c7f0615f302b2010c5510efe6f3':
Introduce squashfs compression threshold
Change-Id: If0a0df88ce9a5ac2a5dfaefb0e14538dff28cba0
Mohamad Ayyash [Mon, 6 Jun 2016 15:37:43 +0000 (15:37 +0000)]
Merge "Introduce squashfs compression threshold" into nyc-mr1-dev
Mohamad Ayyash [Sat, 4 Jun 2016 01:55:16 +0000 (18:55 -0700)]
Introduce squashfs compression threshold
If we can't beat that compression ratio for a single block then we leave
it uncompressed. The choice of the threshold depends on the cost of I/O
in a specific device which is determined from block I/O speed and CPU
speed.
BUG:
29058965
Change-Id: I8d17a4551c7d00ddb85687381b7cb0d6c60babf6
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Yabin Cui [Fri, 3 Jun 2016 23:45:57 +0000 (23:45 +0000)]
Merge "simpleperf: dump tracing data when needed." am:
86bebf8ff0 am:
38ed5b4c0c
am:
693608bb18
* commit '
693608bb181b2b855a03b14a5f62741d56a288ec':
simpleperf: dump tracing data when needed.
Change-Id: Ifc54248d057a0139f6860ac50d2594ef5090b0ac
Yabin Cui [Fri, 3 Jun 2016 23:40:10 +0000 (23:40 +0000)]
Merge "simpleperf: dump tracing data when needed." am:
86bebf8ff0
am:
38ed5b4c0c
* commit '
38ed5b4c0c4071c994bdccc5430eead4e3d47548':
simpleperf: dump tracing data when needed.
Change-Id: I60403f2546c52caaedc25f670ea03d24cee75e5b
Yabin Cui [Fri, 3 Jun 2016 23:32:30 +0000 (23:32 +0000)]
Merge "simpleperf: dump tracing data when needed."
am:
86bebf8ff0
* commit '
86bebf8ff08a2573ad505b93376b7fb15a3b1a56':
simpleperf: dump tracing data when needed.
Change-Id: Ie420f316db839d60e09089a490b75a6e9093add6
Treehugger Robot [Fri, 3 Jun 2016 23:26:14 +0000 (23:26 +0000)]
Merge "simpleperf: dump tracing data when needed."
Yabin Cui [Thu, 2 Jun 2016 00:29:06 +0000 (17:29 -0700)]
simpleperf: dump tracing data when needed.
When monitoring tracepoint events, dump tracing data to perf.data
can enable reporting on a different machine.
Bug:
27403614
Change-Id: Ie1af624717a245cacbeb44b4c1bcd499fc9ad8db
Yabin Cui [Fri, 3 Jun 2016 18:56:55 +0000 (18:56 +0000)]
Merge "simpleperf: add report-sample command." am:
471ec60687 am:
ea9056d785
am:
49b45daee6
* commit '
49b45daee6bfa4f7332ac28c0e9c3ccec1ee7723':
simpleperf: add report-sample command.
Change-Id: I27d5db3bb272d5dbb6ae21c364f7776381d856e9
Yabin Cui [Fri, 3 Jun 2016 18:51:23 +0000 (18:51 +0000)]
Merge "simpleperf: add report-sample command." am:
471ec60687
am:
ea9056d785
* commit '
ea9056d7857b79ee57283d07c61e2e832d58401d':
simpleperf: add report-sample command.
Change-Id: I3567f6f79c5b5e09015eb114ea810c01298d2371
Yabin Cui [Fri, 3 Jun 2016 18:30:43 +0000 (18:30 +0000)]
Merge "simpleperf: add report-sample command."
am:
471ec60687
* commit '
471ec606874a7224e304482f5fa9cc7d207d26b8':
simpleperf: add report-sample command.
Change-Id: Ibc209b97882ede350ced27fb025555227e44628d
Treehugger Robot [Fri, 3 Jun 2016 18:02:14 +0000 (18:02 +0000)]
Merge "simpleperf: add report-sample command."
Than McIntosh [Mon, 23 May 2016 15:07:08 +0000 (11:07 -0400)]
Support for converting callchain profiles.
Support conversion/logging of callchain profiles. A similar
change is already in place in google3.
Change-Id: Ibe5495b792f51a8aa010548d4d7ae9dd1aa40f72
Yabin Cui [Fri, 3 Jun 2016 04:02:43 +0000 (21:02 -0700)]
simpleperf: add report-sample command.
1. Add report-sample command to report each sample with symbol information.
2. Add --dump-symbols option to record command to collect dso and symbol
information in perf.data.
Bug:
28114205
Change-Id: I37424ee6abd74a21ad41cd3b6c4249cf0625c201
Than McIntosh [Thu, 2 Jun 2016 18:58:27 +0000 (18:58 +0000)]
Merge "Handle additional record types in perf.data reader." am:
d9aa9de346 am:
4ee0c018b3
am:
31f191f643
* commit '
31f191f6437d420bfbdc1b828f63f6cfc315bdfb':
Handle additional record types in perf.data reader.
Change-Id: I807e55f8a259d9cc9f71501e62dca9860eccf379
Than McIntosh [Thu, 2 Jun 2016 18:50:02 +0000 (18:50 +0000)]
Merge "Handle additional record types in perf.data reader." am:
d9aa9de346
am:
4ee0c018b3
* commit '
4ee0c018b326327e25174f6be876686d21edb152':
Handle additional record types in perf.data reader.
Change-Id: Ife09330d206ad18b161eb6ac392151803525fb18
Than McIntosh [Thu, 2 Jun 2016 18:46:37 +0000 (18:46 +0000)]
Merge "Handle additional record types in perf.data reader."
am:
d9aa9de346
* commit '
d9aa9de34638e46de141584bad9daf71c07ab678':
Handle additional record types in perf.data reader.
Change-Id: I9ad532edb743d4e38f94c3ccf4f9981030323e22
Than McIntosh [Thu, 2 Jun 2016 18:38:33 +0000 (18:38 +0000)]
Merge "Handle additional record types in perf.data reader."
Than McIntosh [Wed, 1 Jun 2016 16:21:42 +0000 (12:21 -0400)]
Handle additional record types in perf.data reader.
Enhance the perf.data reader in perfprofd to handle the new kernel
symbol records that simpleperf generates. In addition, add support for
handling PERF_SAMPLE_REGS_USER and PERF_SAMPLE_STACK_USER records as
well (these wind up in perf.data files if callchain profiling is
used). Perfprofd doesn't need to look at any of the data in these
records, but it does need to be able to read past them.
Bug:
29067424
Bug:
29067428
Change-Id: I38c12f6a219a4d28afe50e0418d30cfdcd1a9222
Yabin Cui [Thu, 2 Jun 2016 01:01:00 +0000 (01:01 +0000)]
Merge "simpleperf: check perf event limit." am:
99bdc07d68 am:
ab5fb6833e
am:
c5c5ccf4d2
* commit '
c5c5ccf4d23b04be2bb3a09b34713826bb4cbbc4':
simpleperf: check perf event limit.
Change-Id: Iada94c151feacf247055f0b556bad808ac6fce0b
Yabin Cui [Thu, 2 Jun 2016 00:57:19 +0000 (00:57 +0000)]
Merge "simpleperf: check perf event limit." am:
99bdc07d68
am:
ab5fb6833e
* commit '
ab5fb6833e1f10533db84946c07047167fc5e51e':
simpleperf: check perf event limit.
Change-Id: I84c61612fe785840997355ff3166bf04331e1165
Yabin Cui [Thu, 2 Jun 2016 00:53:57 +0000 (00:53 +0000)]
Merge "simpleperf: check perf event limit."
am:
99bdc07d68
* commit '
99bdc07d68f744950292cf2fcd8af0c954d52eae':
simpleperf: check perf event limit.
Change-Id: I3b770d6fe5eda4d0c5e8c0b4902459cf619e7992
Yabin Cui [Thu, 2 Jun 2016 00:42:22 +0000 (00:42 +0000)]
Merge "simpleperf: check perf event limit."
Yabin Cui [Wed, 1 Jun 2016 22:39:39 +0000 (15:39 -0700)]
simpleperf: check perf event limit.
The property security.perf_harden is added in https://android-review.googlesource.com/#/c/233736/5. And simpleperf needs to notice that.
Bug:
29054680
Change-Id: I5f1593f5b389d182a56c4bf3bd438a1dc2b66686