OSDN Git Service
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."
Yabin Cui [Tue, 23 Aug 2016 20:18:47 +0000 (13:18 -0700)]
simpleperf: omit samples get while dumping thread map information.
Bug: http://b/
31039737
Change-Id: Ia65c61b874a2f60d7022be3ef0774f5fc6b09d7c
Test: test manually as described in the bug.
Yabin Cui [Mon, 22 Aug 2016 23:14:39 +0000 (23:14 +0000)]
Merge "simpleperf: avoid selinux denials." am:
23a73bf538 am:
fdf68bdcf9
am:
dfb698649f
Change-Id: Ib36c4dde4a75785b41db9e046c9391d353674bec
Yabin Cui [Mon, 22 Aug 2016 23:10:38 +0000 (23:10 +0000)]
Merge "simpleperf: avoid selinux denials." am:
23a73bf538
am:
fdf68bdcf9
Change-Id: Ifc23416aee051bfc40077dfb6b2258644e3aa9e2
Yabin Cui [Mon, 22 Aug 2016 23:06:27 +0000 (23:06 +0000)]
Merge "simpleperf: avoid selinux denials."
am:
23a73bf538
Change-Id: Ia5b6064a5f3936f739480221a9603b66b744ed6f
Treehugger Robot [Mon, 22 Aug 2016 22:55:25 +0000 (22:55 +0000)]
Merge "simpleperf: avoid selinux denials."
Yabin Cui [Mon, 22 Aug 2016 20:39:19 +0000 (13:39 -0700)]
simpleperf: avoid selinux denials.
1. Don't stat() entries in /proc directory if not necessary.
2. Don't read tracing events in debugfs if not root.
Bug: http://b/
30981595
Change-Id: Ic695671357dad936d60f4e6d573ce4452dec217c
Test: run `simpleperf list` and check kmsg.
Yabin Cui [Sat, 20 Aug 2016 00:24:37 +0000 (17:24 -0700)]
simpleperf: monitor cpu hotplug in stat cmd.
Move code used to monitor cpu hotplug events
from cmd_record.cpp to event_selection_set.cpp,
so it can also be used by stat cmd.
Bug: http://b/
29245608
Change-Id: I1f5f3268192aa5c98c0be9fc1de763352c08eab6
Test: run simpleperf stat, and online/offline a cpu.
Colin Cross [Wed, 17 Aug 2016 18:29:51 +0000 (18:29 +0000)]
Merge "Build icache for arm on arm64" am:
cb0112fe64 am:
04c00f843e
am:
72e4bb0217
Change-Id: I367f9d4586ed83d4c8d01ef906a267f24026ae13
Chih-hung Hsieh [Wed, 17 Aug 2016 18:29:50 +0000 (18:29 +0000)]
Merge "Fix google-explicit-constructor warnings in ext4_utils." am:
e2d0366442 -s ours am:
dab4f37b48
am:
2d64812d0b
Change-Id: I64d922ad3e552d0a483d9e9ac62c50b7f2c544e9
Colin Cross [Wed, 17 Aug 2016 18:21:27 +0000 (18:21 +0000)]
Merge "Build icache for arm on arm64" am:
cb0112fe64
am:
04c00f843e
Change-Id: I0793b130cbed2483bd3fe3c047f393558d59361c
Colin Cross [Wed, 17 Aug 2016 18:18:49 +0000 (18:18 +0000)]
Merge "Build icache for arm on arm64"
am:
cb0112fe64
Change-Id: I5554ac7aaf799dda68731802bd8668b3db5bbfb5
Chih-hung Hsieh [Wed, 17 Aug 2016 18:02:54 +0000 (18:02 +0000)]
Merge "Fix google-explicit-constructor warnings in ext4_utils." am:
e2d0366442 -s ours
am:
dab4f37b48
Change-Id: I1f7f2be9fc0817fa7ccc4211d9daa38d4042efc3
Chih-hung Hsieh [Wed, 17 Aug 2016 17:47:58 +0000 (17:47 +0000)]
Merge "Fix google-explicit-constructor warnings in ext4_utils."
am:
e2d0366442 -s ours
Change-Id: Ic9f51fa2ad2f69004afc51fb31a75aa910697b0c
Damien Bargiacchi [Wed, 17 Aug 2016 00:42:39 +0000 (17:42 -0700)]
Remove unused function declarations
Change-Id: I71dc112b3e1028e3ec3d3c1ec832959b1232f2f6
Colin Cross [Wed, 17 Aug 2016 00:08:03 +0000 (00:08 +0000)]
Merge "Build icache for arm on arm64"
Colin Cross [Tue, 16 Aug 2016 22:23:45 +0000 (15:23 -0700)]
Build icache for arm on arm64
Change-Id: Iac9511f7d943fde9e00d21d46ca32f186d4d5673
Chih-hung Hsieh [Tue, 16 Aug 2016 16:50:45 +0000 (16:50 +0000)]
Merge "Fix google-explicit-constructor warnings in ext4_utils."
Yabin Cui [Tue, 16 Aug 2016 00:00:30 +0000 (00:00 +0000)]
Merge "simpleperf: add simpleperf_report.py to sdk artifacts." am:
64d7033269 am:
12532f668f
am:
7d43d2fb0b
Change-Id: I2924d2cdb9b5ddcac68683d89a49187126f0560e
Yabin Cui [Mon, 15 Aug 2016 23:56:29 +0000 (23:56 +0000)]
Merge "simpleperf: add simpleperf_report.py to sdk artifacts." am:
64d7033269
am:
12532f668f
Change-Id: I93e48fe203847850dc19bf25158225b619597202
Yabin Cui [Mon, 15 Aug 2016 23:52:02 +0000 (23:52 +0000)]
Merge "simpleperf: add simpleperf_report.py to sdk artifacts."
am:
64d7033269
Change-Id: I81c8b93e7ded46ba397eee79ea12b50ca051b1e6
Yabin Cui [Mon, 15 Aug 2016 23:42:30 +0000 (23:42 +0000)]
Merge "simpleperf: add simpleperf_report.py to sdk artifacts."
Yabin Cui [Fri, 12 Aug 2016 22:19:40 +0000 (15:19 -0700)]
simpleperf: add simpleperf_report.py to sdk artifacts.
Bug: http://b/
28911532
Change-Id: I27ddc735c5629c65e7ef9f1218551ed048b39a08
Test: None.
Dan Albert [Fri, 12 Aug 2016 09:24:57 +0000 (09:24 +0000)]
Merge "Stop hard coding gtest/gmock things." am:
9aef6c7d29 am:
37bbf91a24
am:
632565e26c
Change-Id: I7d33bbc218469ba70ce68cdca5571018a091fd45
Dan Albert [Fri, 12 Aug 2016 09:21:58 +0000 (09:21 +0000)]
Merge "Stop hard coding gtest/gmock things." am:
9aef6c7d29
am:
37bbf91a24
Change-Id: Ib46bf14481699dd5fbef4e5cc933ecdb584cced9
Dan Albert [Fri, 12 Aug 2016 09:18:30 +0000 (09:18 +0000)]
Merge "Stop hard coding gtest/gmock things."
am:
9aef6c7d29
Change-Id: Ied120d80f30e9b81314ad13f6b32450f54f298fa
Treehugger Robot [Fri, 12 Aug 2016 09:15:46 +0000 (09:15 +0000)]
Merge "Stop hard coding gtest/gmock things."
Nick Desaulniers [Fri, 12 Aug 2016 04:40:41 +0000 (04:40 +0000)]
Merge "procrank: fix bounds check to prevent heap overflow" am:
79dcfb73a2 am:
b11c7eb720
am:
071dce8236
Change-Id: I4a0e910ffba61181ab7c64f2226ea3cf147866c6
Nick Desaulniers [Fri, 12 Aug 2016 04:37:10 +0000 (04:37 +0000)]
Merge "procrank: fix bounds check to prevent heap overflow" am:
79dcfb73a2
am:
b11c7eb720
Change-Id: I29a9ea016d766c0d93a8361787532ab96ba4f0c3
Nick Desaulniers [Fri, 12 Aug 2016 04:34:13 +0000 (04:34 +0000)]
Merge "procrank: fix bounds check to prevent heap overflow"
am:
79dcfb73a2
Change-Id: Ied99331e9d88c1c5bcffc050164f7727ae46ae0e
Treehugger Robot [Fri, 12 Aug 2016 04:27:37 +0000 (04:27 +0000)]
Merge "procrank: fix bounds check to prevent heap overflow"
Chih-Hung Hsieh [Thu, 11 Aug 2016 23:53:22 +0000 (23:53 +0000)]
Merge "Fix google-explicit-constructor warnings in simpleperf." am:
eddb94dc8b am:
9ebb388c20
am:
02ab7380d5
Change-Id: Ic57a2c0c21f76e38216bb3b36811311623289637
Chih-Hung Hsieh [Thu, 11 Aug 2016 23:49:52 +0000 (23:49 +0000)]
Merge "Fix google-explicit-constructor warnings in simpleperf." am:
eddb94dc8b
am:
9ebb388c20
Change-Id: I929dd04d2325b6049021ed20b6bc0efba6844d18
Chih-Hung Hsieh [Thu, 11 Aug 2016 23:48:02 +0000 (23:48 +0000)]
Merge "Fix google-explicit-constructor warnings in simpleperf."
am:
eddb94dc8b
Change-Id: I55d778ab19963fa33e4ff37ce24ed3dafe19a9cd
Treehugger Robot [Thu, 11 Aug 2016 23:33:53 +0000 (23:33 +0000)]
Merge "Fix google-explicit-constructor warnings in simpleperf."
Nick Desaulniers [Wed, 10 Aug 2016 22:44:19 +0000 (15:44 -0700)]
procrank: fix bounds check to prevent heap overflow
Bug:
30774296
Change-Id: I44005caaa3cc17fe829f375a4cfeb5a464c97fbe
(cherry picked from commit
98a20cd1283b6ee029e871c0876815300475c40a)
Dan Albert [Thu, 11 Aug 2016 19:45:53 +0000 (12:45 -0700)]
Stop hard coding gtest/gmock things.
The headers are exported, and the build system automatically adds
libgtest for test modules.
Test: mma
Bug: None
Change-Id: I99373732aa71244c6dc8bfa21c5d06190ce76ada
Chih-Hung Hsieh [Thu, 11 Aug 2016 18:06:00 +0000 (11:06 -0700)]
Fix google-explicit-constructor warnings in simpleperf.
Bug:
28341362
Change-Id: I35f2be2563cd1dcd5bdac25e8e801c08eb665db5
Test: build with WITH_TIDY=1
David Zeuthen [Thu, 11 Aug 2016 14:52:19 +0000 (14:52 +0000)]
Merge "avb: Add common verified boot tools and library." am:
17361eb23c am:
3cbfa8ce60
am:
d56bce161b
Change-Id: I9605e8281ca37f55c4d5446d34a1f448e151858d
David Zeuthen [Thu, 11 Aug 2016 14:48:48 +0000 (14:48 +0000)]
Merge "avb: Add common verified boot tools and library." am:
17361eb23c
am:
3cbfa8ce60
Change-Id: Icb6ace6b077b9ab9f015a6b497e0e4c13edc2f4c
David Zeuthen [Thu, 11 Aug 2016 14:45:50 +0000 (14:45 +0000)]
Merge "avb: Add common verified boot tools and library."
am:
17361eb23c
Change-Id: I2547f28561c7652ab25c17536f2dc522a6574bc5
David Zeuthen [Thu, 11 Aug 2016 14:40:41 +0000 (14:40 +0000)]
Merge "avb: Add common verified boot tools and library."
Josh Gao [Thu, 11 Aug 2016 01:41:19 +0000 (01:41 +0000)]
Merge commit '
3609371c949ec3c31fc88bb6a2231774fdeb25c1' into manual_merge_3609371 am:
cb47e738d9
am:
75e8b08479
Change-Id: Id59ca38ad1f149f5e1d37e4a41893ab8d3d84f02
Josh Gao [Thu, 11 Aug 2016 01:37:50 +0000 (01:37 +0000)]
Merge commit '
3609371c949ec3c31fc88bb6a2231774fdeb25c1' into manual_merge_3609371
am:
cb47e738d9
Change-Id: Ic2f00a437e70f6067fbf3bed3e0d3c08c8c66604
Josh Gao [Thu, 11 Aug 2016 01:30:57 +0000 (18:30 -0700)]
Merge commit '
3609371c949ec3c31fc88bb6a2231774fdeb25c1' into manual_merge_3609371
Change-Id: I6b9c6b1d0281bfefcb8f664cfb0e535ae4c83647
Treehugger Robot [Thu, 11 Aug 2016 01:19:23 +0000 (01:19 +0000)]
Merge "alloc-stress: use nullptr for execl sentinel."
Nick Desaulniers [Thu, 11 Aug 2016 00:35:59 +0000 (00:35 +0000)]
Merge "procrank: fix bounds check to prevent heap overflow" into nyc-mr1-dev am:
96eaef2510
am:
b8623df988
Change-Id: I01392ce5241c12d34f5abc1fce38360aac964cc3
Nick Desaulniers [Thu, 11 Aug 2016 00:35:58 +0000 (00:35 +0000)]
procrank: fix bounds check to prevent heap overflow am:
98a20cd128
am:
791e7afcfc
Change-Id: Ifec13ab874d4830a5af9ca05642d409818874ab0
Nick Desaulniers [Thu, 11 Aug 2016 00:32:59 +0000 (00:32 +0000)]
Merge "procrank: fix bounds check to prevent heap overflow" into nyc-mr1-dev
am:
96eaef2510
Change-Id: I9dc98b9c1d27dcee8d74bdabf00422dc8dfd6abf
Nick Desaulniers [Thu, 11 Aug 2016 00:32:59 +0000 (00:32 +0000)]
procrank: fix bounds check to prevent heap overflow
am:
98a20cd128
Change-Id: I9e79ff3f83f36b68fa119d1b95f235a804cfb34e
Nick Desaulniers [Thu, 11 Aug 2016 00:24:09 +0000 (00:24 +0000)]
Merge "procrank: fix bounds check to prevent heap overflow" into nyc-mr1-dev
Josh Gao [Wed, 10 Aug 2016 23:59:40 +0000 (16:59 -0700)]
alloc-stress: use nullptr for execl sentinel.
Passing 0 as a sentinel for execl is incorrect, use nullptr instead.
Bug: http://b/
30793878
Change-Id: Ib05c9b509823442ef7c2174a2086b97c32df387b
Nick Desaulniers [Wed, 10 Aug 2016 22:44:19 +0000 (15:44 -0700)]
procrank: fix bounds check to prevent heap overflow
Bug:
30774296
Change-Id: I44005caaa3cc17fe829f375a4cfeb5a464c97fbe
Yabin Cui [Wed, 10 Aug 2016 00:38:25 +0000 (00:38 +0000)]
Merge "simpleperf: fix --pids option." am:
be52e2bb05 am:
1cc3b804f9
am:
7ffd3546c9
Change-Id: I1e5ca640aea3c50dd07d2705e92e8f08fad3f20e
Yabin Cui [Wed, 10 Aug 2016 00:35:37 +0000 (00:35 +0000)]
Merge "simpleperf: fix --pids option." am:
be52e2bb05
am:
1cc3b804f9
Change-Id: I2d7f439d8c44897d2c2061d0828a802c039743c0
OSDN Git Service
