OSDN Git Service
Elliott Hughes [Sat, 3 Sep 2016 03:19:05 +0000 (03:19 +0000)]
Merge "Use android::base::GetExecutablePath in simpleperf." am:
3eee005507 am:
7633b9ee01
am:
cb12c4f0d4
Change-Id: I9eca56c93fc315b7db0f6cdc77a1f32707a5bb73
Elliott Hughes [Sat, 3 Sep 2016 03:16:35 +0000 (03:16 +0000)]
Merge "Use android::base::GetExecutablePath in simpleperf." am:
3eee005507
am:
7633b9ee01
Change-Id: I6901c8268bd4c752400efc6a94e25bd3e9767350
Elliott Hughes [Sat, 3 Sep 2016 03:14:08 +0000 (03:14 +0000)]
Merge "Use android::base::GetExecutablePath in simpleperf."
am:
3eee005507
Change-Id: I22691e3f07655fc11ea02836099619f6e14f8a7a
Treehugger Robot [Sat, 3 Sep 2016 03:06:05 +0000 (03:06 +0000)]
Merge "Use android::base::GetExecutablePath in simpleperf."
Elliott Hughes [Fri, 2 Sep 2016 20:26:14 +0000 (13:26 -0700)]
Use android::base::GetExecutablePath in simpleperf.
Bug: http://b/
30988271
Change-Id: Ide5f1696834cfa1081e86131e24499bd15131cd6
Sami Tolvanen [Fri, 2 Sep 2016 18:24:46 +0000 (18:24 +0000)]
Merge "fec: add --padding" am:
d77d48271a am:
fd5615187c
am:
d82f21fb26
Change-Id: I4e29fec6e8fdf7e6da47ca1cecd2ff6383f0237f
Sami Tolvanen [Fri, 2 Sep 2016 18:24:45 +0000 (18:24 +0000)]
Merge "libfec: allow fec_header to be located anywhere" am:
c5d58971b7 am:
afdacc7e57
am:
31f50ef70a
Change-Id: Iff09d9513bf86a247ff66f24dada05915abb6c23
Sami Tolvanen [Fri, 2 Sep 2016 18:21:44 +0000 (18:21 +0000)]
Merge "fec: add --padding" am:
d77d48271a
am:
fd5615187c
Change-Id: I4d8eb3eab0fb4ee9a3fd3d98d9914a5aeae37099
Sami Tolvanen [Fri, 2 Sep 2016 18:21:43 +0000 (18:21 +0000)]
Merge "libfec: allow fec_header to be located anywhere" am:
c5d58971b7
am:
afdacc7e57
Change-Id: I1c6c9311a5775772dde94c15b2d72b1c737d78bb
Sami Tolvanen [Fri, 2 Sep 2016 18:18:34 +0000 (18:18 +0000)]
Merge "fec: add --padding"
am:
d77d48271a
Change-Id: I91b412aeda0ca388e1a60e354d84984d143e38d4
Sami Tolvanen [Fri, 2 Sep 2016 18:18:29 +0000 (18:18 +0000)]
Merge "libfec: allow fec_header to be located anywhere"
am:
c5d58971b7
Change-Id: I7baa7ef4e801e0b7569edb231d90e019477906ae
Treehugger Robot [Fri, 2 Sep 2016 18:13:32 +0000 (18:13 +0000)]
Merge "fec: add --padding"
Treehugger Robot [Fri, 2 Sep 2016 18:13:32 +0000 (18:13 +0000)]
Merge "libfec: allow fec_header to be located anywhere"
Yabin Cui [Fri, 2 Sep 2016 17:48:00 +0000 (17:48 +0000)]
Merge "simpleperf: handle monitored processes correctly when a cpu is up." am:
25bbfdede1 am:
1edf3e586d
am:
81ee16b741
Change-Id: Iebff1281feb6d0ea1f215f02e197a6cc6ae884e8
Yabin Cui [Fri, 2 Sep 2016 17:34:06 +0000 (17:34 +0000)]
Merge "simpleperf: handle monitored processes correctly when a cpu is up." am:
25bbfdede1
am:
1edf3e586d
Change-Id: I2fcbc03bb1170dfba625574a7db214aa1d5aff53
Yabin Cui [Fri, 2 Sep 2016 17:27:07 +0000 (17:27 +0000)]
Merge "simpleperf: handle monitored processes correctly when a cpu is up."
am:
25bbfdede1
Change-Id: I28e427cd0d3f8a631cfc3f119dc7c42740a2a883
Yabin Cui [Fri, 2 Sep 2016 17:18:15 +0000 (17:18 +0000)]
Merge "simpleperf: handle monitored processes correctly when a cpu is up."
Sami Tolvanen [Thu, 1 Sep 2016 23:02:36 +0000 (23:02 +0000)]
Merge changes Ic9258141,If4b32546 am:
643af28f1d am:
700840cf42
am:
5fc58f52a2
Change-Id: If28d755f641d5f1005654fa8e59955446933911d
Sami Tolvanen [Thu, 1 Sep 2016 22:59:51 +0000 (22:59 +0000)]
Merge changes Ic9258141,If4b32546 am:
643af28f1d
am:
700840cf42
Change-Id: I9dbcd9e7df0895d442f498737faf6ee5154b9067
Sami Tolvanen [Thu, 1 Sep 2016 22:56:23 +0000 (22:56 +0000)]
Merge changes Ic9258141,If4b32546
am:
643af28f1d
Change-Id: Id8222d4f40996c578d8da03c1e25aaa2c61a2fa9
Sami Tolvanen [Thu, 1 Sep 2016 22:51:12 +0000 (15:51 -0700)]
libfec: allow fec_header to be located anywhere
Don't require fec_header to be immediately after ECC data.
Bug:
28865197
Change-Id: Ie8faeeb07c35e2593553f7678762aae7f14c2ff7
Treehugger Robot [Thu, 1 Sep 2016 22:47:01 +0000 (22:47 +0000)]
Merge changes Ic9258141,If4b32546
* changes:
fec: remove unneeded target executable
fec: remove unused mmap code
Sami Tolvanen [Thu, 1 Sep 2016 21:54:09 +0000 (14:54 -0700)]
fec: add --padding
Add an option to insert padding between ECC data and fec_header to
make it easier to position the header at the end of the partition.
Bug:
28865197
Change-Id: I8c11401df56d15362fe3eb3c2a6a91ea82b02a83
Sami Tolvanen [Thu, 1 Sep 2016 20:43:51 +0000 (13:43 -0700)]
fec: remove unneeded target executable
Change-Id: Ic925814191b8ac952b584a994cf455f871a8ee0c
Sami Tolvanen [Thu, 1 Sep 2016 20:35:17 +0000 (13:35 -0700)]
fec: remove unused mmap code
Change-Id: If4b32546c6678afaaebffbcf1fbeee17a1879561
Yabin Cui [Wed, 31 Aug 2016 19:30:46 +0000 (19:30 +0000)]
Merge "simpleperf: add python report interface on linux." am:
2cb0a666a2 am:
d05f2841af
am:
ed59da040d
Change-Id: Ib115d926cd45ef211d05122247519f49d924892a
Yabin Cui [Wed, 31 Aug 2016 19:27:44 +0000 (19:27 +0000)]
Merge "simpleperf: add python report interface on linux." am:
2cb0a666a2
am:
d05f2841af
Change-Id: I6c7c682c96e8ad70de914c4c241430a72b2f7986
Yabin Cui [Wed, 31 Aug 2016 19:24:45 +0000 (19:24 +0000)]
Merge "simpleperf: add python report interface on linux."
am:
2cb0a666a2
Change-Id: I36b955ab33c05eda69a081daab8f0208cd81c63a
Yabin Cui [Wed, 31 Aug 2016 19:14:52 +0000 (19:14 +0000)]
Merge "simpleperf: add python report interface on linux."
Yabin Cui [Wed, 31 Aug 2016 01:34:30 +0000 (01:34 +0000)]
Merge "simpleperf: fix two errors." am:
9baf7c33bb am:
fc62dc7f69
am:
ddd70a190f
Change-Id: I7822043a7795a78e8003f123bd32f61c975d3fdb
Yabin Cui [Wed, 31 Aug 2016 01:32:00 +0000 (01:32 +0000)]
Merge "simpleperf: fix two errors." am:
9baf7c33bb
am:
fc62dc7f69
Change-Id: I8a2a40312ff480580b417207236ce07021b0d02f
Yabin Cui [Wed, 31 Aug 2016 01:29:02 +0000 (01:29 +0000)]
Merge "simpleperf: fix two errors."
am:
9baf7c33bb
Change-Id: Iaaef78effbbbacbdb6f7d764f998f1681289b0da
Yabin Cui [Wed, 31 Aug 2016 01:23:33 +0000 (01:23 +0000)]
Merge "simpleperf: fix two errors."
Yabin Cui [Fri, 26 Aug 2016 18:35:28 +0000 (11:35 -0700)]
simpleperf: add python report interface on linux.
1. Build libsimpleperf_report.so on host, which exports functions
to access samples.
2. Add simpleperf_report_lib.py to wrap libsimpleperf_report.so.
3. Write report_sample.py to test simpleperf_report_lib.py. The
output format of report_sample.py matches the need of building
FlameGraph.
Bug: http://b/
31069528
Test: run report_sample.py on perf.data.
Test: run simpleperf_unit_test.
Change-Id: I4949f8ea506f12101a9c4fb4c896957c96676853
Daniel Rosenberg [Tue, 30 Aug 2016 20:54:13 +0000 (20:54 +0000)]
Merge "Test: Basic bootloader tests via fastboot" am:
cbbc907a4d am:
9478bf8b40
am:
e5aa18acf1
Change-Id: I45c4fdfd13a549e98fd934346f4b51bad69679b2
Daniel Rosenberg [Tue, 30 Aug 2016 20:47:09 +0000 (20:47 +0000)]
Merge "Test: Basic bootloader tests via fastboot" am:
cbbc907a4d
am:
9478bf8b40
Change-Id: Ie202777a9dc60997424628ec38a019d5fbe03eef
Daniel Rosenberg [Tue, 30 Aug 2016 20:41:41 +0000 (20:41 +0000)]
Merge "Test: Basic bootloader tests via fastboot"
am:
cbbc907a4d
Change-Id: I644f3d99f55fe84da2d517c3e5e6bae439a35a12
Daniel Rosenberg [Tue, 30 Aug 2016 20:35:22 +0000 (20:35 +0000)]
Merge "Test: Basic bootloader tests via fastboot"
Yabin Cui [Tue, 30 Aug 2016 20:13:17 +0000 (13:13 -0700)]
simpleperf: fix two errors.
Fix two errors when reporting perf.data generated by linux perf.
And add corresponding tests.
Test: run simpleperf_unit_test.
Change-Id: I04dd88461fdd6a85763847570bac16db1ccb81fa
Mitchell Wills [Tue, 30 Aug 2016 01:13:22 +0000 (01:13 +0000)]
Merge commit '
cb8b5af' into nyc-dev-plus-aosp
am:
3587c22e55
Change-Id: Ife0d09d14b4244bfc0c42d79653032b84a1e5c52
The Android Automerger [Tue, 30 Aug 2016 01:03:24 +0000 (01:03 +0000)]
Merge commit '
cb8b5af' into nyc-dev-plus-aosp
Mitchell Wills [Mon, 29 Aug 2016 20:02:48 +0000 (20:02 +0000)]
Merge "Remove ancient wifi stress test" into stage-aosp-master
Yabin Cui [Mon, 29 Aug 2016 19:33:17 +0000 (12:33 -0700)]
simpleperf: handle monitored processes correctly when a cpu is up.
For stat/record cmd, the way to handle -p option is to change the
process list into a thread list before profiling. However, it doesn't
work well if we want to open new event files when a cpu is up. The
situation in problem is as below:
1. Monitor for process A, which currently has thread a.
2. Then we open event files for thread a.
3. Process A creates thread b. If profiling child threads/processes
is enabled, the kernel will monitor thread b automatically.
4. A new cpu is up, and we need to open new event files on that
cpu. But we will only open event file for thread a, although the
user command is to monitor the whole process.
To fix this, remember which processes are monitored in
EventSelectionSet, and search threads in the monitored processes
each time to open new event files.
Bug: http://b/
29245608
Test: run simpleperf record cmd and make cpu offline and online.
Test: run simpleperf_unit_test.
Change-Id: Iabf9e30be9f0bc5a3651227e4695034c0b9e0258
Yabin Cui [Sat, 27 Aug 2016 19:10:31 +0000 (19:10 +0000)]
Merge "simpleperf: support hotplug events in record cmd." am:
728c8de11d am:
77a7b76fea
am:
071e0d9db2
Change-Id: I19713281848ccf0eb82efb19a0f84b0f10739684
Yabin Cui [Sat, 27 Aug 2016 19:07:00 +0000 (19:07 +0000)]
Merge "simpleperf: support hotplug events in record cmd." am:
728c8de11d
am:
77a7b76fea
Change-Id: I7f2fea5498c5d9d0aaec1e8da6e0b7c16f86c462
Yabin Cui [Sat, 27 Aug 2016 19:04:05 +0000 (19:04 +0000)]
Merge "simpleperf: support hotplug events in record cmd."
am:
728c8de11d
Change-Id: Id5719e1c027d0c9fb09b789d5aab48167fb1bf3a
Treehugger Robot [Sat, 27 Aug 2016 18:59:00 +0000 (18:59 +0000)]
Merge "simpleperf: support hotplug events in record cmd."
Yabin Cui [Sat, 27 Aug 2016 01:25:21 +0000 (18:25 -0700)]
simpleperf: support hotplug events in record cmd.
1. When a cpu is down, read records from event files on that cpu,
then close those event files.
2. When a cpu is up, open event files on that cpu, and create
mapped buffer for those event files to dump records.
3. Instead of creating a mapped buffer for each event type on each
cpu, we can just create a mapped buffer for all event types on
each cpu.
4. When new event files are created, store a EventIdRecord record in
perf.data to notify record_file_reader.cpp.
Bug: http://b/
29245608
Test: run simpleperf record cmd and make cpu offline and online.
Test: run simpleperf_unit_test.
Change-Id: Ib97a24b6292fa143e9b35cb105bdddf1e826d60a
Colin Cross [Fri, 26 Aug 2016 20:40:37 +0000 (20:40 +0000)]
Merge "Replace libziparchive-host with libziparchive" am:
b5a1a4a772 am:
e882b6c845
am:
aceb1decfd
Change-Id: Icfa8cbc09325c481227c318c9ae027b03c1efcef
Colin Cross [Fri, 26 Aug 2016 20:32:31 +0000 (20:32 +0000)]
Merge "Replace libziparchive-host with libziparchive" am:
b5a1a4a772
am:
e882b6c845
Change-Id: Id3c0ffe5359c8963ed8385f225920755b17a5574
Christopher Wiley [Wed, 15 Jun 2016 20:37:58 +0000 (13:37 -0700)]
Remove ancient wifi stress test
Bug:
29321445
Change-Id: Ib6797def04d69f20ea4e856d4005c57b5ec6ac42
(cherry picked from commit
3defd8f2199234c5a7a6092fba320f143caf3622)
Colin Cross [Fri, 26 Aug 2016 20:25:37 +0000 (20:25 +0000)]
Merge "Replace libziparchive-host with libziparchive"
am:
b5a1a4a772
Change-Id: Ic4b372e601b2e66aef25c3c2b536fce86547657c
Colin Cross [Fri, 26 Aug 2016 20:18:54 +0000 (20:18 +0000)]
Merge "Replace libziparchive-host with libziparchive"
Colin Cross [Fri, 26 Aug 2016 18:16:28 +0000 (11:16 -0700)]
Replace libziparchive-host with libziparchive
libziparchive-host is no longer necessary, and mixing libziparchive-host
and libziparchive can cause ODR violations.
Change-Id: I018d3726e6ab099a86a3ea662ab6d52509218510
Yabin Cui [Fri, 26 Aug 2016 17:21:39 +0000 (17:21 +0000)]
Merge "simpleperf: support hotplug events in stat cmd." am:
c3ead4eb80 am:
4da74b3dfb
am:
0b948b0cba
Change-Id: Id19ed463c808c905b84ba48bb8205eae928fc57b
Yabin Cui [Fri, 26 Aug 2016 17:19:38 +0000 (17:19 +0000)]
Merge "simpleperf: support hotplug events in stat cmd." am:
c3ead4eb80
am:
4da74b3dfb
Change-Id: Idb8ed215d038b8f0b0e2f17e727bbc5dbab6d48d
Yabin Cui [Fri, 26 Aug 2016 17:16:10 +0000 (17:16 +0000)]
Merge "simpleperf: support hotplug events in stat cmd."
am:
c3ead4eb80
Change-Id: Ibb93a0572bdd79c75e4e40a35f8699f1f69498ca
Treehugger Robot [Fri, 26 Aug 2016 17:07:21 +0000 (17:07 +0000)]
Merge "simpleperf: support hotplug events in stat cmd."
Yabin Cui [Thu, 25 Aug 2016 02:32:55 +0000 (19:32 -0700)]
simpleperf: support hotplug events in stat cmd.
1. When a cpu is down, read counters from event files on that cpu,
then close those events files.
2. When a cpu is up, open event files on that cpu.
3. Remove check of time_running != 0 in cmd_stat.cpp, because
1) We no longer need the check as we no longer open event file
for each cpu for non system wide profiling.
2) The kernel has a bug that can make time_running == 0 if
a cpu is down while profiling. But the counter value is
still valid, and shouldn't be ignored.
Bug: http://b/
29245608
Test: run simpleperf and make cpu offline and online.
Change-Id: I3e7bec139c5f50bea1311c95bb154a5b290a72ea
Yabin Cui [Thu, 25 Aug 2016 19:16:59 +0000 (19:16 +0000)]
Merge "simpleperf: print file path used for reading symbols." am:
4a35dafc21 am:
220ae01bc4
am:
5259c1452f
Change-Id: Ib8f2a82a2506c85707ce69955ca44c2007b21e65
Yabin Cui [Thu, 25 Aug 2016 19:13:58 +0000 (19:13 +0000)]
Merge "simpleperf: print file path used for reading symbols." am:
4a35dafc21
am:
220ae01bc4
Change-Id: I920c7c4363d121fe1cfca4b263a409bc3a339236
Yabin Cui [Thu, 25 Aug 2016 19:10:30 +0000 (19:10 +0000)]
Merge "simpleperf: print file path used for reading symbols."
am:
4a35dafc21
Change-Id: I5a2751fbb762f98f9ef1050372a2c5e506e2c76d
Treehugger Robot [Thu, 25 Aug 2016 19:00:47 +0000 (19:00 +0000)]
Merge "simpleperf: print file path used for reading symbols."
Yabin Cui [Thu, 25 Aug 2016 17:46:40 +0000 (10:46 -0700)]
simpleperf: print file path used for reading symbols.
It helps users to find out which files are used for
reporting.
Bug: http://b/
29574526
Change-Id: I3d608e61c50471632c50bf6e8f6f9e45c63fc4b4
Test: run `simpleperf report --log verbose` manually.
Alex Deymo [Thu, 25 Aug 2016 01:49:11 +0000 (01:49 +0000)]
Merge "Don't include multinetwork tools in Brillo." am:
db7a1c571a am:
7dc5b65930
am:
fada028a42
Change-Id: I4f48c5aeb94fb4c3e30a2408eb2d039d65bc5070
Alex Deymo [Thu, 25 Aug 2016 01:36:23 +0000 (01:36 +0000)]
Merge "Don't include multinetwork tools in Brillo." am:
db7a1c571a
am:
7dc5b65930
Change-Id: Ic20c4d1d69db20567389f3a5cc15db5b43130d34
Alex Deymo [Thu, 25 Aug 2016 01:33:24 +0000 (01:33 +0000)]
Merge "Don't include multinetwork tools in Brillo."
am:
db7a1c571a
Change-Id: I27b4a11bcdf4c578f908ffa4ca7c5a9d2599b547
Alex Deymo [Thu, 25 Aug 2016 01:28:42 +0000 (01:28 +0000)]
Merge "Don't include multinetwork tools in Brillo."
Yabin Cui [Wed, 24 Aug 2016 23:52:32 +0000 (23:52 +0000)]
Merge "simpleperf: improve cpu_hotplug_test." am:
a903cc9b9c am:
9e71d361ea
am:
97669706ea
Change-Id: If77f4d9aefbbc3b222711de2653c4eb761ac83e3
Yabin Cui [Wed, 24 Aug 2016 23:49:30 +0000 (23:49 +0000)]
Merge "simpleperf: improve cpu_hotplug_test." am:
a903cc9b9c
am:
9e71d361ea
Change-Id: I1e78cf2aaa09819c969ca1be73269d4703b94769
Yabin Cui [Wed, 24 Aug 2016 23:46:35 +0000 (23:46 +0000)]
Merge "simpleperf: improve cpu_hotplug_test."
am:
a903cc9b9c
Change-Id: I53f788aa6100b0eb6917920334efa624af14e77f
Alex Deymo [Wed, 24 Aug 2016 23:42:11 +0000 (16:42 -0700)]
Don't include multinetwork tools in Brillo.
These tools depend on libandroid, which is not present in Brillo.
Bug:
31068444
Change-Id: I0565775ab3effa910149f28bef790b6fed4e6485
Test: `make dist`
Treehugger Robot [Wed, 24 Aug 2016 23:36:28 +0000 (23:36 +0000)]
Merge "simpleperf: improve cpu_hotplug_test."
Yabin Cui [Thu, 18 Aug 2016 00:34:26 +0000 (17:34 -0700)]
simpleperf: improve cpu_hotplug_test.
1. Add offline_while_user_process_profiling test for
http://b/
28086229.
2. Add options to adjust test duration and cpu hotplug
interval.
3. Report test time periodically for tests running for
a long time.
Bug: http://b/
25193162
Bug: http://b/
28086229
Bug: http://b/
30839193
Change-Id: If02a45aed2dab718ca381b24da2898f22fed1a8d
Android Build Merger (Role) [Wed, 24 Aug 2016 20:47:17 +0000 (20:47 +0000)]
Merge changes from topic 'am-
cca20719ce864a0298fe5d9833985170' into nyc-mr1-dev-plus-aosp
* changes:
Merge "Remove unused function declarations" into cw-f-dev am:
6199f023a7
Remove unused function declarations am:
47c3ecb53a
Bill Yi [Wed, 24 Aug 2016 20:45:26 +0000 (20:45 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am:
4d269c7593 am:
1c98bd15ca
am:
590203cf6b
Change-Id: I8a6ba87570a118c5d781f88e4da3aa9f7ddddb74
Yabin Cui [Wed, 24 Aug 2016 20:45:25 +0000 (20:45 +0000)]
Merge "simpleperf: notify user for unsupported modifiers." am:
43908a31c1 am:
61cb08b492
am:
dacf5b4a3c
Change-Id: Ia68bf60c55294a00f525558c8ab3e553a1e5c28e
Damien Bargiacchi [Wed, 24 Aug 2016 20:45:20 +0000 (20:45 +0000)]
Merge "Remove unused function declarations" into cw-f-dev
am:
6199f023a7
Change-Id: I428b58de9f99935cee84250fc1d241c107acd5dc
Damien Bargiacchi [Wed, 24 Aug 2016 20:45:19 +0000 (20:45 +0000)]
Remove unused function declarations
am:
47c3ecb53a
Change-Id: I2bdf92d7c129c2278c50abfc927828dabd1a7336
Damien Bargiacchi [Wed, 24 Aug 2016 20:36:35 +0000 (20:36 +0000)]
Merge "Remove unused function declarations" into cw-f-dev
Bill Yi [Wed, 24 Aug 2016 20:26:32 +0000 (20:26 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am:
4d269c7593
am:
1c98bd15ca
Change-Id: I04d7d35ff2d02cc9244c8fc5f1bb4e297064c97f
Yabin Cui [Wed, 24 Aug 2016 20:26:32 +0000 (20:26 +0000)]
Merge "simpleperf: notify user for unsupported modifiers." am:
43908a31c1
am:
61cb08b492
Change-Id: Ic8880b14a59346fd69a84efb456923c2a941e4f7
Bill Yi [Wed, 24 Aug 2016 20:16:27 +0000 (20:16 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am:
4d269c7593
Change-Id: I7a58fdbab63c1c4cd11973d49278571db0c50fde
Yabin Cui [Wed, 24 Aug 2016 20:16:24 +0000 (20:16 +0000)]
Merge "simpleperf: notify user for unsupported modifiers."
am:
43908a31c1
Change-Id: I4f53fa84ea663a4090a99f2261f153faf8f0b8fb
Bill Yi [Wed, 24 Aug 2016 19:08:29 +0000 (12:08 -0700)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Yabin Cui [Wed, 24 Aug 2016 18:54:10 +0000 (18:54 +0000)]
Merge "simpleperf: notify user for unsupported modifiers."
Yabin Cui [Wed, 24 Aug 2016 17:01:12 +0000 (17:01 +0000)]
Merge "simpleperf: monitor cpu hotplug in stat cmd." am:
ef99a90b46 am:
d4d0a196fc
am:
fc658b7737
Change-Id: Ic3dc7dabf578312b4aaed271a3b25fe9db80b638
Yabin Cui [Wed, 24 Aug 2016 16:58:41 +0000 (16:58 +0000)]
Merge "simpleperf: monitor cpu hotplug in stat cmd." am:
ef99a90b46
am:
d4d0a196fc
Change-Id: Iddddf45bd26e2545c3cc3a77d3123d52cb44ffd2
Yabin Cui [Wed, 24 Aug 2016 16:55:23 +0000 (16:55 +0000)]
Merge "simpleperf: monitor cpu hotplug in stat cmd."
am:
ef99a90b46
Change-Id: I7c89d8155b9ade3c288d92d496ec9fc84be648b6
Yabin Cui [Fri, 19 Aug 2016 22:42:39 +0000 (15:42 -0700)]
simpleperf: notify user for unsupported modifiers.
If there is no need to record samples, u/k modifiers
used in event cpu-clock and task-clock are ignored
by the kernel.
Bug: http://b/
29574526
Change-Id: Id45568448888965a3bfa382c4420e395a741f77a
Test: simpleperf_unit_test.
Treehugger Robot [Wed, 24 Aug 2016 16:38:03 +0000 (16:38 +0000)]
Merge "simpleperf: monitor cpu hotplug in stat cmd."
Elliott Hughes [Wed, 24 Aug 2016 03:19:48 +0000 (03:19 +0000)]
Merge "Don't invent our own pagemap constants." am:
5079d0aabc am:
cb060d9bfb
am:
4bfe8527cd
Change-Id: Id55bf0c3805c5fc0eb853b9f60616f42bab71c27
Elliott Hughes [Wed, 24 Aug 2016 03:17:18 +0000 (03:17 +0000)]
Merge "Don't invent our own pagemap constants." am:
5079d0aabc
am:
cb060d9bfb
Change-Id: I60b1aa9a76eb08eaeb9c546c8b2fec93bbaa5840
Elliott Hughes [Wed, 24 Aug 2016 03:13:54 +0000 (03:13 +0000)]
Merge "Don't invent our own pagemap constants."
am:
5079d0aabc
Change-Id: Ica4813dcf76197b8866307c7c0ba5fc4a56fd6e3
Treehugger Robot [Wed, 24 Aug 2016 03:05:17 +0000 (03:05 +0000)]
Merge "Don't invent our own pagemap constants."
Elliott Hughes [Wed, 24 Aug 2016 00:47:49 +0000 (17:47 -0700)]
Don't invent our own pagemap constants.
Use the uapi ones instead, so I don't have to think about whether ours
are correct.
Bug: http://b/
31044648
Change-Id: Ibe4a078ad3223419301a5f585e8ed24dd7366ce2
Yabin Cui [Tue, 23 Aug 2016 22:32:12 +0000 (22:32 +0000)]
Merge "simpleperf: omit samples get while dumping thread map information." am:
84ea73e65c am:
f600c50b67
am:
27cb69ae6e
Change-Id: I77320c7d18aa12bccceb3e60d3ef2f4d1b094717
Yabin Cui [Tue, 23 Aug 2016 22:29:13 +0000 (22:29 +0000)]
Merge "simpleperf: omit samples get while dumping thread map information." am:
84ea73e65c
am:
f600c50b67
Change-Id: Ic333f4f9912c3329a1e7bf5ffef59e069b73e1d4
Yabin Cui [Tue, 23 Aug 2016 22:26:57 +0000 (22:26 +0000)]
Merge "simpleperf: omit samples get while dumping thread map information."
am:
84ea73e65c
Change-Id: I7f7aa533eb8f4d0d224981f2b2865ee45e0d718f
Treehugger Robot [Tue, 23 Aug 2016 22:17:15 +0000 (22:17 +0000)]
Merge "simpleperf: omit samples get while dumping thread map information."
OSDN Git Service
