OSDN Git Service

android-x86/system-extras.git
8 years agoMerge changes Ibab1eb74,I08e82f70,I9f8bb375 am: 414cff342d
Lorenzo Colitti [Mon, 14 Dec 2015 08:13:40 +0000 (00:13 -0800)]
Merge changes Ibab1eb74,I08e82f70,I9f8bb375 am: 414cff342d
am: d8054a1d69

* commit 'd8054a1d69ddc86c5181f4376bf7aef026d7aa30':
  Support properly resetting non-SYN, non-FIN packets.
  Add a tests that checks NAs with the R flag set to 0.
  Add utility functions to neighbour_test.

8 years agoMerge changes Ibab1eb74,I08e82f70,I9f8bb375
Lorenzo Colitti [Mon, 14 Dec 2015 08:11:18 +0000 (00:11 -0800)]
Merge changes Ibab1eb74,I08e82f70,I9f8bb375
am: 414cff342d

* commit '414cff342d09380340cd6164d82b7d9416bc15a1':
  Support properly resetting non-SYN, non-FIN packets.
  Add a tests that checks NAs with the R flag set to 0.
  Add utility functions to neighbour_test.

8 years agoMerge changes Ibab1eb74,I08e82f70,I9f8bb375
Lorenzo Colitti [Mon, 14 Dec 2015 08:06:26 +0000 (08:06 +0000)]
Merge changes Ibab1eb74,I08e82f70,I9f8bb375

* changes:
  Support properly resetting non-SYN, non-FIN packets.
  Add a tests that checks NAs with the R flag set to 0.
  Add utility functions to neighbour_test.

8 years agoSupport properly resetting non-SYN, non-FIN packets.
Lorenzo Colitti [Wed, 9 Dec 2015 13:23:58 +0000 (22:23 +0900)]
Support properly resetting non-SYN, non-FIN packets.

Change-Id: Ibab1eb744a6223007851abdd272b990ad360a9e4

8 years agoAdd a tests that checks NAs with the R flag set to 0.
Lorenzo Colitti [Mon, 14 Dec 2015 07:44:20 +0000 (16:44 +0900)]
Add a tests that checks NAs with the R flag set to 0.

NAs with R=0 have been implicated in loss of connectivity. This
test checks that they behave as expected.

Change-Id: I08e82f704cde4f40b423c8f52a34fef1ebfd74ee

8 years agoAdd utility functions to neighbour_test.
Lorenzo Colitti [Mon, 14 Dec 2015 06:41:30 +0000 (15:41 +0900)]
Add utility functions to neighbour_test.

1. Clear the ND cache entries for the IPv6 routers before each
   test, so we can add tests and always start from a clean slate.
2. Support expecting multicast NS.
3. Support generating NAs with different source and destination
   addresses.

Change-Id: I9f8bb37540efa2d237eb236059e859f42aacdadc

8 years agoMerge "Rename libext2 host libraries to standard suffix." am: f8a6eb443f
Alex Deymo [Fri, 11 Dec 2015 17:28:16 +0000 (09:28 -0800)]
Merge "Rename libext2 host libraries to standard suffix." am: f8a6eb443f
am: 260f4e3106

* commit '260f4e3106fe5a957f4bc0844656b0750bff699b':
  Rename libext2 host libraries to standard suffix.

8 years agoMerge "bootctl: add is-slot-marked-successful command." am: 71dddf50ce
David Zeuthen [Fri, 11 Dec 2015 17:27:31 +0000 (09:27 -0800)]
Merge "bootctl: add is-slot-marked-successful command." am: 71dddf50ce
am: b9a9321258

* commit 'b9a9321258f6a40ffd780e6af5cfed431b5028ff':
  bootctl: add is-slot-marked-successful command.

8 years agoMerge "Changes to support automated test framework"
Todd Kjos [Fri, 11 Dec 2015 16:09:08 +0000 (16:09 +0000)]
Merge "Changes to support automated test framework"

8 years agoRename libext2 host libraries to standard suffix.
Alex Deymo [Thu, 10 Dec 2015 01:55:36 +0000 (17:55 -0800)]
Rename libext2 host libraries to standard suffix.

libext2_uuid_host was renamed to libext2_uuid-host to match the
"-host" suffix used in most libraries.

Bug: 24619596
TEST=m

(cherry picked from commit c5250dbccc217b984e141d99dc4b36d4bcf152c3)

Change-Id: I877dd8a5211256006582de19246c40795cc61343

8 years agoMerge "Rename libext2 host libraries to standard suffix."
Alex Deymo [Thu, 10 Dec 2015 22:28:29 +0000 (14:28 -0800)]
Merge "Rename libext2 host libraries to standard suffix."
am: f8a6eb443f

* commit 'f8a6eb443f7ed8bc22d74c876d243c63a2d7f2f6':
  Rename libext2 host libraries to standard suffix.

8 years agoMerge "Rename libext2 host libraries to standard suffix."
Alex Deymo [Thu, 10 Dec 2015 22:18:33 +0000 (22:18 +0000)]
Merge "Rename libext2 host libraries to standard suffix."

8 years agoprocrank: prefer new zram ABI
Greg Hackmann [Wed, 9 Dec 2015 22:55:53 +0000 (14:55 -0800)]
procrank: prefer new zram ABI

Starting with Linux 4.1, reading from /dev/block/zram*/mem_used_total
logs this warning:

"Attribute mem_used_total (and others) will be removed. See zram
documentation."

mem_used_total and several related counters are now consolidated under a
new node mm_stat.  Prefer that when it's available.

Bug: 25951511

Change-Id: Ida732ee56a1e39e01c390f61bb40b3f52f643004
Signed-off-by: Greg Hackmann <ghackmann@google.com>
8 years agoMerge "bootctl: add is-slot-marked-successful command."
David Zeuthen [Thu, 10 Dec 2015 21:24:58 +0000 (13:24 -0800)]
Merge "bootctl: add is-slot-marked-successful command."
am: 71dddf50ce

* commit '71dddf50cec9c21b24146901cdd1ce3dee44f4d7':
  bootctl: add is-slot-marked-successful command.

8 years agoMerge "bootctl: add is-slot-marked-successful command."
David Zeuthen [Thu, 10 Dec 2015 21:17:29 +0000 (21:17 +0000)]
Merge "bootctl: add is-slot-marked-successful command."

8 years agobootctl: add is-slot-marked-successful command.
David Zeuthen [Thu, 10 Dec 2015 21:09:17 +0000 (16:09 -0500)]
bootctl: add is-slot-marked-successful command.

This makes it easy to call the newly added isSlotMarkedSuccessful()
boot_control HAL method added in the CL at

 https://android-review.googlesource.com/#/c/185841/

This is useful for e.g. test suites.

Also improve error reporting for is-slot-bootable command.

Change-Id: I603e07d8310fc1de88114dadbaa1622a76289afb
Test: tested on edison (Brillo).

8 years agoChanges to support automated test framework
Todd Kjos [Wed, 9 Dec 2015 23:37:54 +0000 (15:37 -0800)]
Changes to support automated test framework

- output conforms to frameworks expected format
- take an argument to specify file size
- allow 32-bit builds

BUG: 26094894
Change-Id: I63b170693cf60c018341e67ce30fd3795689728b

8 years agoMerge "Add createuserkey"
Paul Lawrence [Thu, 10 Dec 2015 15:10:30 +0000 (15:10 +0000)]
Merge "Add createuserkey"

8 years agoMerge "Move CreateSocketPair to net_test.py so we can use it elsewhere." am: 001077aa92
Lorenzo Colitti [Thu, 10 Dec 2015 12:57:06 +0000 (04:57 -0800)]
Merge "Move CreateSocketPair to net_test.py so we can use it elsewhere." am: 001077aa92
am: 57e0e4d46e

* commit '57e0e4d46e04a87db378888f6d5e3844984378e2':
  Move CreateSocketPair to net_test.py so we can use it elsewhere.

8 years agoMerge "Move CreateSocketPair to net_test.py so we can use it elsewhere."
Lorenzo Colitti [Thu, 10 Dec 2015 12:54:54 +0000 (04:54 -0800)]
Merge "Move CreateSocketPair to net_test.py so we can use it elsewhere."
am: 001077aa92

* commit '001077aa9293cd52ac4b4b34132eacd9b9a6ad23':
  Move CreateSocketPair to net_test.py so we can use it elsewhere.

8 years agoMerge "Move CreateSocketPair to net_test.py so we can use it elsewhere."
Lorenzo Colitti [Thu, 10 Dec 2015 12:49:40 +0000 (12:49 +0000)]
Merge "Move CreateSocketPair to net_test.py so we can use it elsewhere."

8 years agoRename libext2 host libraries to standard suffix.
Alex Deymo [Thu, 10 Dec 2015 01:55:36 +0000 (17:55 -0800)]
Rename libext2 host libraries to standard suffix.

libext2_uuid_host was renamed to libext2_uuid-host to match the
"-host" suffix used in most libraries.

Bug: 24619596
TEST=m

Change-Id: Ia417e1e65fa7ee54baac1007c057fe2571bf8196

8 years agoAdd createuserkey
Paul Lawrence [Wed, 9 Dec 2015 21:54:09 +0000 (13:54 -0800)]
Add createuserkey

Add createuserkey so we can create user0 key on first boot

Change-Id: I211a5a483c416da08239341f85eaf6eb99dca797

8 years agoMerge "Minor changes to netlink code." am: 6ccb30917e
Lorenzo Colitti [Wed, 9 Dec 2015 13:56:54 +0000 (05:56 -0800)]
Merge "Minor changes to netlink code." am: 6ccb30917e
am: 771f46f216

* commit '771f46f21687031ea436a52cc4311cd90b0631c7':
  Minor changes to netlink code.

8 years agoMerge "Minor changes to netlink code."
Lorenzo Colitti [Wed, 9 Dec 2015 13:54:15 +0000 (05:54 -0800)]
Merge "Minor changes to netlink code."
am: 6ccb30917e

* commit '6ccb30917e16d709c269e75c5d1ab85e34eb52e1':
  Minor changes to netlink code.

8 years agoMove CreateSocketPair to net_test.py so we can use it elsewhere.
Lorenzo Colitti [Tue, 10 Nov 2015 08:13:43 +0000 (17:13 +0900)]
Move CreateSocketPair to net_test.py so we can use it elsewhere.

Change-Id: Ic46e1b9ffb9d1d6082c0453baaad71a3d43b432f

8 years agoMerge "Minor changes to netlink code."
Lorenzo Colitti [Wed, 9 Dec 2015 13:49:46 +0000 (13:49 +0000)]
Merge "Minor changes to netlink code."

8 years agoMinor changes to netlink code.
Lorenzo Colitti [Tue, 10 Nov 2015 07:59:37 +0000 (16:59 +0900)]
Minor changes to netlink code.

1. Remove IpRoute._Debug, since it's identical to the superclass
   version.
2. Add some setsockopt constants to netlink.py.
3. Do the right thing if the kernel returns an error in a dump
   request.

Change-Id: I37e49b35f1366760a408c7c4a73f95164d796a2e

8 years agoMerge "Simpleperf: check value returned by fopen." am: 4818f026d4
Yabin Cui [Wed, 9 Dec 2015 03:38:48 +0000 (03:38 +0000)]
Merge "Simpleperf: check value returned by fopen." am: 4818f026d4
am: 2cc3db947b

* commit '2cc3db947bedb8e562d123bbb1b75af286f983c0':
  Simpleperf: check value returned by fopen.

8 years agoMerge "Simpleperf: check value returned by fopen."
Yabin Cui [Wed, 9 Dec 2015 03:36:29 +0000 (03:36 +0000)]
Merge "Simpleperf: check value returned by fopen."
am: 4818f026d4

* commit '4818f026d4c35683222b84976de17da18ae178bb':
  Simpleperf: check value returned by fopen.

8 years agoMerge "Simpleperf: check value returned by fopen."
Yabin Cui [Wed, 9 Dec 2015 03:31:51 +0000 (03:31 +0000)]
Merge "Simpleperf: check value returned by fopen."

8 years agoSimpleperf: check value returned by fopen.
Yabin Cui [Wed, 9 Dec 2015 03:25:13 +0000 (19:25 -0800)]
Simpleperf: check value returned by fopen.

Change-Id: Iecddf0b7805ccc2ad930bab2cdfcefa0702e5661

8 years agoMerge "Simpleperf: check if elf file paths are valid before reading them." am: 95c06b156f
Yabin Cui [Wed, 9 Dec 2015 02:51:22 +0000 (02:51 +0000)]
Merge "Simpleperf: check if elf file paths are valid before reading them." am: 95c06b156f
am: f5c9df2769

* commit 'f5c9df2769496da6ffd768f0a1c4a84d4d522580':
  Simpleperf: check if elf file paths are valid before reading them.

8 years agoMerge "Simpleperf: check if elf file paths are valid before reading them."
Yabin Cui [Wed, 9 Dec 2015 02:49:07 +0000 (02:49 +0000)]
Merge "Simpleperf: check if elf file paths are valid before reading them."
am: 95c06b156f

* commit '95c06b156fd8008b74eac9720f933f479f84a340':
  Simpleperf: check if elf file paths are valid before reading them.

8 years agoMerge "Simpleperf: check if elf file paths are valid before reading them."
Yabin Cui [Wed, 9 Dec 2015 02:44:06 +0000 (02:44 +0000)]
Merge "Simpleperf: check if elf file paths are valid before reading them."

8 years agoSimpleperf: check if elf file paths are valid before reading them.
Yabin Cui [Wed, 9 Dec 2015 01:43:15 +0000 (17:43 -0800)]
Simpleperf: check if elf file paths are valid before reading them.

Reading invalid file paths can cause troubles. For example,
reading /dev/zero can eat all memory.

Bug: 25194400
Change-Id: I4de17f4f9200a43b50a4efe4c42a6fd9eaec1ba6

8 years agoresolve merge conflicts of 836476d90d to mnc-dr2-dev-plus-aosp.
Elliott Hughes [Wed, 9 Dec 2015 01:22:28 +0000 (01:22 +0000)]
resolve merge conflicts of 836476d90d to mnc-dr2-dev-plus-aosp.
am: f43f6cf5c3

* commit 'f43f6cf5c3b9ab4b0831cb0f4ce10969a33583d5':
  Fix showmap SIGSEGV.

8 years agoresolve merge conflicts of 836476d90d to mnc-dr2-dev-plus-aosp.
Elliott Hughes [Wed, 9 Dec 2015 01:17:48 +0000 (17:17 -0800)]
resolve merge conflicts of 836476d90d to mnc-dr2-dev-plus-aosp.

Change-Id: I8ae0ceb96f8bfe706cdaa4a512bf52935667600c

8 years agoMerge "Prevent future instances of the last bug." am: 113206fb65
Elliott Hughes [Tue, 8 Dec 2015 23:41:35 +0000 (23:41 +0000)]
Merge "Prevent future instances of the last bug." am: 113206fb65
am: 51942bedde

* commit '51942bedde56abe862f4d13af9ee27b916175d23':
  Prevent future instances of the last bug.

8 years agoFix showmap SIGSEGV.
Elliott Hughes [Tue, 8 Dec 2015 23:41:31 +0000 (23:41 +0000)]
Fix showmap SIGSEGV.
am: e2534e30bc

* commit 'e2534e30bc558035b1fb1036241e2063151be723':
  Fix showmap SIGSEGV.

8 years agoMerge "Prevent future instances of the last bug."
Elliott Hughes [Tue, 8 Dec 2015 23:38:33 +0000 (23:38 +0000)]
Merge "Prevent future instances of the last bug."
am: 113206fb65

* commit '113206fb6548cf95bdb91821c7b4dd384c926756':
  Prevent future instances of the last bug.

8 years agoMerge "Prevent future instances of the last bug."
Elliott Hughes [Tue, 8 Dec 2015 23:32:38 +0000 (23:32 +0000)]
Merge "Prevent future instances of the last bug."

8 years agoMerge "Fix showmap SIGSEGV." am: 8a72d54a4f
Elliott Hughes [Tue, 8 Dec 2015 23:22:33 +0000 (23:22 +0000)]
Merge "Fix showmap SIGSEGV." am: 8a72d54a4f
am: 29a53cf9c8

* commit '29a53cf9c8b1f1267b5a0cd14ad5461163f14d56':
  Fix showmap SIGSEGV.

8 years agolibrank: fix pm_memusage_t init and layout am: 76617ddbd1 am: 17c08c98fe
Thierry Strudel [Tue, 8 Dec 2015 23:20:07 +0000 (23:20 +0000)]
librank: fix pm_memusage_t init and layout am: 76617ddbd1 am: 17c08c98fe
am: f0c6dee6a9

* commit 'f0c6dee6a9639edc910779ea5987e028ebb4c7b0':
  librank: fix pm_memusage_t init and layout

8 years agoMerge "Fix showmap SIGSEGV."
Elliott Hughes [Tue, 8 Dec 2015 23:19:59 +0000 (23:19 +0000)]
Merge "Fix showmap SIGSEGV."
am: 8a72d54a4f

* commit '8a72d54a4f6636734f1f6a8a9d76022829f2001a':
  Fix showmap SIGSEGV.

8 years agoFix showmap SIGSEGV.
Elliott Hughes [Tue, 8 Dec 2015 22:57:22 +0000 (14:57 -0800)]
Fix showmap SIGSEGV.

Bug: http://b/26084907
Change-Id: I6ed8a26b93d90348d2bb806ccd7752a1a76144a6

8 years agoPrevent future instances of the last bug.
Elliott Hughes [Tue, 8 Dec 2015 23:13:36 +0000 (15:13 -0800)]
Prevent future instances of the last bug.

Also make the columns line up, and make it visible in the code that they
do now line up.

Bug: http://b/26084907
Change-Id: If6abfffcafceab8e8d548c93fbbb13e371c79732

8 years agolibrank: fix pm_memusage_t init and layout am: 76617ddbd1
Thierry Strudel [Tue, 8 Dec 2015 23:15:35 +0000 (23:15 +0000)]
librank: fix pm_memusage_t init and layout am: 76617ddbd1
am: 17c08c98fe

* commit '17c08c98fe93f3b7b9f1c291910fd488bd3a6027':
  librank: fix pm_memusage_t init and layout

8 years agolibrank: fix pm_memusage_t init and layout
Thierry Strudel [Tue, 8 Dec 2015 23:12:53 +0000 (23:12 +0000)]
librank: fix pm_memusage_t init and layout
am: 76617ddbd1

* commit '76617ddbd19525a8d82e7304a0e4b1c771438329':
  librank: fix pm_memusage_t init and layout

8 years agoMerge "Fix showmap SIGSEGV."
Elliott Hughes [Tue, 8 Dec 2015 23:11:37 +0000 (23:11 +0000)]
Merge "Fix showmap SIGSEGV."

8 years agoMerge "Showmap: show swap." am: 88add2dbc1
Elliott Hughes [Tue, 8 Dec 2015 23:05:34 +0000 (23:05 +0000)]
Merge "Showmap: show swap." am: 88add2dbc1
am: 4be7b235f9

* commit '4be7b235f977911ae78d605e67da7d9b9d4a1856':
  Showmap: show swap.

8 years agoMerge "Showmap: show swap."
Elliott Hughes [Tue, 8 Dec 2015 23:02:48 +0000 (23:02 +0000)]
Merge "Showmap: show swap."
am: 88add2dbc1

* commit '88add2dbc12ee79b3cc22bc70a71f857fe46b2b3':
  Showmap: show swap.

8 years agolibrank: fix pm_memusage_t init and layout
Thierry Strudel [Tue, 8 Dec 2015 22:59:46 +0000 (14:59 -0800)]
librank: fix pm_memusage_t init and layout

pm_memusage_t variables must be initialized to 0 or call initializer.

Bug: 26083907
Change-Id: I62882be13de9c546e73bcdc24ec43ed0d5251db1

8 years agoFix showmap SIGSEGV.
Elliott Hughes [Tue, 8 Dec 2015 22:57:22 +0000 (14:57 -0800)]
Fix showmap SIGSEGV.

Bug: http://b/26084907
Change-Id: I6ed8a26b93d90348d2bb806ccd7752a1a76144a6

8 years agoMerge "Showmap: show swap."
Elliott Hughes [Tue, 8 Dec 2015 22:56:18 +0000 (22:56 +0000)]
Merge "Showmap: show swap."

8 years agoShowmap: show swap.
Martijn Coenen [Fri, 4 Dec 2015 16:22:15 +0000 (17:22 +0100)]
Showmap: show swap.

Bug: 26019993
Change-Id: I50a22a6be958dc336da0a1942989a164bb489937

8 years agoMerge "Simpleperf: add separate cpu_hotplug_test." am: 8460573b13
Yabin Cui [Tue, 8 Dec 2015 21:24:19 +0000 (21:24 +0000)]
Merge "Simpleperf: add separate cpu_hotplug_test." am: 8460573b13
am: ef3f6278f2

* commit 'ef3f6278f2505ef3ae0e24f236b7a14f9ba2d472':
  Simpleperf: add separate cpu_hotplug_test.

8 years agoMerge "Simpleperf: add separate cpu_hotplug_test."
Yabin Cui [Tue, 8 Dec 2015 21:21:04 +0000 (21:21 +0000)]
Merge "Simpleperf: add separate cpu_hotplug_test."
am: 8460573b13

* commit '8460573b13e2cc3fc94ec6f7a25fac5885ad4ff1':
  Simpleperf: add separate cpu_hotplug_test.

8 years agoMerge "Simpleperf: add separate cpu_hotplug_test."
Yabin Cui [Tue, 8 Dec 2015 21:16:17 +0000 (21:16 +0000)]
Merge "Simpleperf: add separate cpu_hotplug_test."

8 years agoSimpleperf: add separate cpu_hotplug_test.
Yabin Cui [Tue, 8 Dec 2015 04:14:14 +0000 (20:14 -0800)]
Simpleperf: add separate cpu_hotplug_test.

cpu_hotplug_test runs much longer than unit tests, so separate it.
It uses the same strategy as the shell scripts I used to find all
kernel bugs.

Bug: 26032318
Bug: 25193162
Change-Id: I2f26d4f0d65e680b597e40cce9e775b9568599ef

8 years agoShowmap: show swap. am: 9f82eca8b9 am: dc33fe9b55
Martijn Coenen [Mon, 7 Dec 2015 23:49:16 +0000 (23:49 +0000)]
Showmap: show swap. am: 9f82eca8b9 am: dc33fe9b55
am: 6226ddd576

* commit '6226ddd5762897b09dec7c79deaf6a9c44eba2fc':
  Showmap: show swap.

8 years agoShowmap: show swap. am: 9f82eca8b9
Martijn Coenen [Mon, 7 Dec 2015 23:29:01 +0000 (23:29 +0000)]
Showmap: show swap. am: 9f82eca8b9
am: dc33fe9b55

* commit 'dc33fe9b554ee8ba5471c340e431c1b8db3e94e1':
  Showmap: show swap.

8 years agoShowmap: show swap.
Martijn Coenen [Mon, 7 Dec 2015 23:06:16 +0000 (23:06 +0000)]
Showmap: show swap.
am: 9f82eca8b9

* commit '9f82eca8b9ac9068e4ea86036b7f183006e4c248':
  Showmap: show swap.

8 years agoFix build.
Martijn Coenen [Mon, 7 Dec 2015 08:51:12 +0000 (09:51 +0100)]
Fix build.

Change-Id: I83b1dd7850382ed5b5c0c4dee5d2a2360d2e2106

8 years agoMerge "Pagecache tools."
Martijn Coenen [Mon, 7 Dec 2015 08:22:59 +0000 (08:22 +0000)]
Merge "Pagecache tools."

8 years agoMerge "Simpleperf: don\'t use ioctl(PERF_EVENT_IOC_ENABLE)." am: b9ca50b319 am: 58736...
Yabin Cui [Sat, 5 Dec 2015 00:28:12 +0000 (00:28 +0000)]
Merge "Simpleperf: don\'t use ioctl(PERF_EVENT_IOC_ENABLE)." am: b9ca50b319 am: 58736022de
am: 3394e9a61a

* commit '3394e9a61aa65ee7a2e17fe601a9ddd50fe8b0f7':
  Simpleperf: don't use ioctl(PERF_EVENT_IOC_ENABLE).

8 years agoMerge "Track rename from base/ to android-base/." am: 5d8fdbb6ff am: 9ff83ae0e4
Elliott Hughes [Sat, 5 Dec 2015 00:28:00 +0000 (00:28 +0000)]
Merge "Track rename from base/ to android-base/." am: 5d8fdbb6ff am: 9ff83ae0e4
am: c8ecb374bd

* commit 'c8ecb374bd1666955cbf03adcbb61ae80feee1e8':
  Track rename from base/ to android-base/.

8 years agoprocrank: add proportional swap accounting am: 08ea6e722b am: 6ca5d69923
Thierry Strudel [Sat, 5 Dec 2015 00:27:56 +0000 (00:27 +0000)]
procrank: add proportional swap accounting am: 08ea6e722b am: 6ca5d69923
am: c641ee4131

* commit 'c641ee41319181e02e3a9afc2fc93d3989d1d41e':
  procrank: add proportional swap accounting

8 years agoMerge "Simpleperf: don\'t use ioctl(PERF_EVENT_IOC_ENABLE)." am: b9ca50b319
Yabin Cui [Sat, 5 Dec 2015 00:23:18 +0000 (00:23 +0000)]
Merge "Simpleperf: don\'t use ioctl(PERF_EVENT_IOC_ENABLE)." am: b9ca50b319
am: 58736022de

* commit '58736022dedb503a32de80540a854526aa9bc0cb':
  Simpleperf: don't use ioctl(PERF_EVENT_IOC_ENABLE).

8 years agoMerge "Simpleperf: don\'t use ioctl(PERF_EVENT_IOC_ENABLE)."
Yabin Cui [Sat, 5 Dec 2015 00:20:20 +0000 (16:20 -0800)]
Merge "Simpleperf: don\'t use ioctl(PERF_EVENT_IOC_ENABLE)."
am: b9ca50b319

* commit 'b9ca50b319d2083c5a92c468e54796b0e71a4ad9':
  Simpleperf: don't use ioctl(PERF_EVENT_IOC_ENABLE).

8 years agoMerge "Simpleperf: don't use ioctl(PERF_EVENT_IOC_ENABLE)."
Yabin Cui [Sat, 5 Dec 2015 00:15:38 +0000 (00:15 +0000)]
Merge "Simpleperf: don't use ioctl(PERF_EVENT_IOC_ENABLE)."

8 years agoMerge "Track rename from base/ to android-base/." am: 5d8fdbb6ff
Elliott Hughes [Fri, 4 Dec 2015 23:33:38 +0000 (15:33 -0800)]
Merge "Track rename from base/ to android-base/." am: 5d8fdbb6ff
am: 9ff83ae0e4

* commit '9ff83ae0e4f5e7de90d3bc5e8bd2d7d0b45d371b':
  Track rename from base/ to android-base/.

8 years agoMerge "Track rename from base/ to android-base/."
Elliott Hughes [Fri, 4 Dec 2015 23:29:35 +0000 (15:29 -0800)]
Merge "Track rename from base/ to android-base/."
am: 5d8fdbb6ff

* commit '5d8fdbb6ff3d617e48198e12a2b1c10b48d22f79':
  Track rename from base/ to android-base/.

8 years agoMerge "Track rename from base/ to android-base/."
Elliott Hughes [Fri, 4 Dec 2015 23:22:53 +0000 (23:22 +0000)]
Merge "Track rename from base/ to android-base/."

8 years agoTrack rename from base/ to android-base/.
Elliott Hughes [Fri, 4 Dec 2015 22:00:57 +0000 (14:00 -0800)]
Track rename from base/ to android-base/.

Change-Id: Ic15d4778c7accd1382de0b440a437aba2cf67016

8 years agoShowmap: show swap.
Martijn Coenen [Fri, 4 Dec 2015 16:22:15 +0000 (17:22 +0100)]
Showmap: show swap.

Bug: 26019993
Change-Id: I50a22a6be958dc336da0a1942989a164bb489937

8 years agoPagecache tools.
Martijn Coenen [Mon, 30 Nov 2015 13:43:10 +0000 (14:43 +0100)]
Pagecache tools.

Dumpcache: dumps complete pagecache of device.
pagecache.py: shows live info on files going in/out of pagecache

Change-Id: Ieb2960d9e5daea8a7d9dcf23d2c31986182bc359

8 years agoSimpleperf: don't use ioctl(PERF_EVENT_IOC_ENABLE).
Yabin Cui [Thu, 3 Dec 2015 18:31:37 +0000 (10:31 -0800)]
Simpleperf: don't use ioctl(PERF_EVENT_IOC_ENABLE).

Some android kernels(like bullhead/angler) can't handle
ioctl(PERF_EVENT_IOC_ENABLE) correctly when cpu-hotplug
happens. Instead of fixing all of them in kernel, we
can't simply don't use it.

Bug: 25193162
Change-Id: I9df1458045ffd2ccc2c7ba393e746ebba7c253de

8 years agoprocrank: add proportional swap accounting am: 08ea6e722b
Thierry Strudel [Wed, 2 Dec 2015 23:53:00 +0000 (23:53 +0000)]
procrank: add proportional swap accounting am: 08ea6e722b
am: 6ca5d69923

* commit '6ca5d6992307ac6d063e4a7a1f0457afb88e033c':
  procrank: add proportional swap accounting

8 years agoprocrank: add proportional swap accounting
Thierry Strudel [Wed, 2 Dec 2015 23:49:41 +0000 (23:49 +0000)]
procrank: add proportional swap accounting
am: 08ea6e722b

* commit '08ea6e722b1f2d6359f54fe39c6bed82f524291c':
  procrank: add proportional swap accounting

8 years agoMerge "Add _directory function for fd-based ext4 filesystem creation"
Paul Crowley [Tue, 1 Dec 2015 10:39:42 +0000 (10:39 +0000)]
Merge "Add _directory function for fd-based ext4 filesystem creation"

8 years agoprocrank: add proportional swap accounting
Thierry Strudel [Sat, 21 Nov 2015 02:07:15 +0000 (18:07 -0800)]
procrank: add proportional swap accounting

Shared pages are reported in each of the sharing process swapped pages.
Compute a proportional swap usage to get a meaningful value of what each
process has in swap. Report also process unique pages swapped out.
In case ZRAM is used compute the compression ration and report the
actual RAM use of the swapped pages.

Bug: 25392275
Change-Id: I3a28c7812a09a02e1a604593615f5c6ad0340f9f

8 years agoAdd _directory function for fd-based ext4 filesystem creation
Paul Crowley [Fri, 27 Nov 2015 09:05:39 +0000 (09:05 +0000)]
Add _directory function for fd-based ext4 filesystem creation

Allow an initializing directory to be specified in ext4 filesystem
creation where the target is specified as as an fd, to match
where it is given as a filename.

Bug: 25898323
Change-Id: I945c9554b885ab9f903fd2985ad4b73399304321

8 years agoMerge "Simpleperf: remove unnecessary exit()." am: dd7f62ed57 am: 5345ea0e4f
Yabin Cui [Thu, 26 Nov 2015 00:08:11 +0000 (00:08 +0000)]
Merge "Simpleperf: remove unnecessary exit()." am: dd7f62ed57 am: 5345ea0e4f
am: 002efefd9d

* commit '002efefd9d24da9740667530350d04b4ff3ee2b1':
  Simpleperf: remove unnecessary exit().

8 years agoMerge "zram performance test." am: bb0eca64ee am: 50f6f801ff
Riley Andrews [Thu, 26 Nov 2015 00:07:16 +0000 (00:07 +0000)]
Merge "zram performance test." am: bb0eca64ee am: 50f6f801ff
am: 3057b631b6

* commit '3057b631b6deb095e85ca81cd4958f6eb5818688':
  zram performance test.

8 years agoMerge "Simpleperf: remove unnecessary exit()." am: dd7f62ed57
Yabin Cui [Wed, 25 Nov 2015 01:09:06 +0000 (01:09 +0000)]
Merge "Simpleperf: remove unnecessary exit()." am: dd7f62ed57
am: 5345ea0e4f

* commit '5345ea0e4f77b97b7292131161d4ed8789236ee3':
  Simpleperf: remove unnecessary exit().

8 years agoMerge "Simpleperf: remove unnecessary exit()."
Yabin Cui [Wed, 25 Nov 2015 01:06:22 +0000 (01:06 +0000)]
Merge "Simpleperf: remove unnecessary exit()."
am: dd7f62ed57

* commit 'dd7f62ed576e70e73a92b278c99dcba0d27f33a5':
  Simpleperf: remove unnecessary exit().

8 years agoMerge "Simpleperf: remove unnecessary exit()."
Yabin Cui [Wed, 25 Nov 2015 01:03:01 +0000 (01:03 +0000)]
Merge "Simpleperf: remove unnecessary exit()."

8 years agoSimpleperf: remove unnecessary exit().
Yabin Cui [Wed, 25 Nov 2015 00:58:53 +0000 (16:58 -0800)]
Simpleperf: remove unnecessary exit().

Change-Id: I5256617373c3414195a7a994d0ce217d9afd47e6

8 years agoMerge "zram performance test." am: bb0eca64ee
Riley Andrews [Mon, 23 Nov 2015 22:37:31 +0000 (22:37 +0000)]
Merge "zram performance test." am: bb0eca64ee
am: 50f6f801ff

* commit '50f6f801ff406bc1983e5ae21c5e875c1ae11479':
  zram performance test.

8 years agoMerge "zram performance test."
Riley Andrews [Mon, 23 Nov 2015 22:33:22 +0000 (22:33 +0000)]
Merge "zram performance test."
am: bb0eca64ee

* commit 'bb0eca64eea52340daf187a6e5908a6f27875e0a':
  zram performance test.

8 years agoMerge "zram performance test."
Riley Andrews [Mon, 23 Nov 2015 22:27:48 +0000 (22:27 +0000)]
Merge "zram performance test."

8 years agozram performance test.
Riley Andrews [Fri, 20 Nov 2015 23:40:09 +0000 (15:40 -0800)]
zram performance test.

Test dumps raw read and write performance to the zram device. It will
turn off the swap, benchmark, and then restore the swap device during a
successful run.

Signed-off-by: Riley Andrews <riandrews@google.com>
Change-Id: I9b5474b5f0a7556ca2093f3f0d1f792fa2fb1514

8 years agoprocrank: Fix some printf alignements am: 5e20c25f63 am: 7ad5b7d135
Thierry Strudel [Sat, 21 Nov 2015 02:20:58 +0000 (02:20 +0000)]
procrank: Fix some printf alignements am: 5e20c25f63 am: 7ad5b7d135
am: a763c6bb61

* commit 'a763c6bb61a81012112b97c0189c372a651db961':
  procrank: Fix some printf alignements

8 years agoSwap column in procrank not reported with swap enabled am: aa5a7df9d8 am: 2424169f81
Yu Liu [Sat, 21 Nov 2015 02:20:54 +0000 (02:20 +0000)]
Swap column in procrank not reported with swap enabled am: aa5a7df9d8 am: 2424169f81
am: 587130ca09

* commit '587130ca09b76e2bd92e83fdbec1e25493422a20':
  Swap column in procrank not reported with swap enabled

8 years agoprocrank: Fix some printf alignements am: 5e20c25f63
Thierry Strudel [Sat, 21 Nov 2015 02:18:00 +0000 (02:18 +0000)]
procrank: Fix some printf alignements am: 5e20c25f63
am: 7ad5b7d135

* commit '7ad5b7d13581832472d9f8da576c50f72c203bf2':
  procrank: Fix some printf alignements

8 years agoSwap column in procrank not reported with swap enabled am: aa5a7df9d8
Yu Liu [Sat, 21 Nov 2015 02:17:57 +0000 (02:17 +0000)]
Swap column in procrank not reported with swap enabled am: aa5a7df9d8
am: 2424169f81

* commit '2424169f810933f2713358f4cb393934528f322f':
  Swap column in procrank not reported with swap enabled

8 years agoprocrank: Fix some printf alignements
Thierry Strudel [Sat, 21 Nov 2015 02:15:07 +0000 (02:15 +0000)]
procrank: Fix some printf alignements
am: 5e20c25f63

* commit '5e20c25f630fcaace1728090a43998f076b2851f':
  procrank: Fix some printf alignements

8 years agoSwap column in procrank not reported with swap enabled
Yu Liu [Sat, 21 Nov 2015 02:15:02 +0000 (02:15 +0000)]
Swap column in procrank not reported with swap enabled
am: aa5a7df9d8

* commit 'aa5a7df9d83c39e41fd07c1281a9912544022448':
  Swap column in procrank not reported with swap enabled

8 years agoprocrank: Fix some printf alignements
Thierry Strudel [Fri, 20 Nov 2015 20:45:09 +0000 (12:45 -0800)]
procrank: Fix some printf alignements

Bug: 25392275
Change-Id: I8ea4d01310190c34b68d3f3140ea336ad82df665