OSDN Git Service
Lorenzo Colitti [Wed, 28 Oct 2015 08:45:28 +0000 (08:45 +0000)]
Merge "Move packet definitions to their own file."
Lorenzo Colitti [Wed, 28 Oct 2015 07:56:12 +0000 (16:56 +0900)]
Move packet definitions to their own file.
Change-Id: I68c57311915e2a8dbdb6842dfb87367485fcf819
Lorenzo Colitti [Wed, 28 Oct 2015 07:07:12 +0000 (07:07 +0000)]
Merge "Test SIOCKILLADDR on non-empty addresses too."
Lorenzo Colitti [Tue, 27 Oct 2015 08:37:00 +0000 (17:37 +0900)]
Test SIOCKILLADDR on non-empty addresses too.
Change-Id: Ifddc4e16c4cd59f96048dd517186d0a1f440f02c
Lorenzo Colitti [Tue, 27 Oct 2015 08:06:17 +0000 (08:06 +0000)]
Merge "Add a test for timewait crash."
Lorenzo Colitti [Tue, 27 Oct 2015 08:05:55 +0000 (08:05 +0000)]
Merge "Test nuking IPv4 sockets as well as IPv6."
Lorenzo Colitti [Tue, 27 Oct 2015 08:05:14 +0000 (08:05 +0000)]
Merge "Add functional tests for tcp_nuke_addr."
Lorenzo Colitti [Fri, 16 Oct 2015 04:52:11 +0000 (13:52 +0900)]
Add a test for timewait crash.
Change-Id: I6cbaf2274c002eeef97a62880f31c8546554765e
Lorenzo Colitti [Thu, 1 Oct 2015 08:36:37 +0000 (17:36 +0900)]
Test nuking IPv4 sockets as well as IPv6.
Also, for clarity, use cstruct.Struct to make the ifreq
structures instead of hand-packing them.
Change-Id: I917d6e38b3db067182ef1c971ff6c676fc2d7431
Lorenzo Colitti [Fri, 25 Sep 2015 08:43:55 +0000 (17:43 +0900)]
Add functional tests for tcp_nuke_addr.
1. Test for the hash table off-by-one error.
2. Test that sockets are closed and read() calls are interrupted
with ETIMEDOUT.
Change-Id: Id8cdd50f1f5447734c230341f73d71fcfecdddd8
Lorenzo Colitti [Tue, 27 Oct 2015 06:33:36 +0000 (06:33 +0000)]
Merge "Support reading /proc/net/tcp[6]."
Lorenzo Colitti [Tue, 27 Oct 2015 06:33:10 +0000 (06:33 +0000)]
Merge "Add support for iif rules."
Lorenzo Colitti [Tue, 27 Oct 2015 06:32:41 +0000 (06:32 +0000)]
Merge "Make host network access optional."
Lorenzo Colitti [Tue, 27 Oct 2015 06:31:03 +0000 (06:31 +0000)]
Merge "Fix ambiguous commit number."
Lorenzo Colitti [Tue, 27 Oct 2015 06:30:53 +0000 (06:30 +0000)]
Merge "Make tcp_nuke_addr_test pass when run more than once."
Lorenzo Colitti [Tue, 27 Oct 2015 06:30:35 +0000 (06:30 +0000)]
Merge "Add some Android-specific kernel options."
Lorenzo Colitti [Fri, 16 Oct 2015 04:37:33 +0000 (13:37 +0900)]
Support reading /proc/net/tcp[6].
Support the two different TCP socket formats, and move the
parsing code to net_test.py so it can be used for other things
apart from ping.
Change-Id: Iaa10cc323d11834b6ac9429d42708f6cdf89f404
Lorenzo Colitti [Fri, 16 Oct 2015 04:01:35 +0000 (13:01 +0900)]
Add support for iif rules.
On real systems, we use this to set up tethering.
Change-Id: I0896191754c81e385a08b325922ad42230980d9e
Lorenzo Colitti [Fri, 16 Oct 2015 03:57:39 +0000 (12:57 +0900)]
Make host network access optional.
This isn't required to run the tests, so it's an unnecessary
burden - it needs uml_utilities installed, needs root access,
and doesn't even perform a full network setup.
Change-Id: I8b0c3783290526909de9fe7d40ecaf7399891ba8
Yabin Cui [Mon, 26 Oct 2015 20:57:19 +0000 (20:57 +0000)]
Merge "Simpleperf: Don't load whole perf.data into memory."
Dan Albert [Mon, 26 Oct 2015 18:29:22 +0000 (18:29 +0000)]
Merge "Always use clang for iotop."
Dan Albert [Mon, 26 Oct 2015 18:24:47 +0000 (11:24 -0700)]
Always use clang for iotop.
iotop makes use of a lambda that uses an `auto` typedef parameter.
This is a C++14 feature, and we need to move GCC back to C++11 because
GCC 4.9 doesn't have a correct C++14 ABI.
Bug: http://b/
25022512
Change-Id: I3946bd3d287c99eeee1d570ea46e073828b5c1d2
Than McIntosh [Mon, 26 Oct 2015 12:21:01 +0000 (12:21 +0000)]
Merge "Reduce oom_score_adj to zero for perfprofd."
Lorenzo Colitti [Thu, 1 Oct 2015 08:35:29 +0000 (17:35 +0900)]
Fix ambiguous commit number.
Change-Id: I5081c360a8ab996d7c77e41c099e4acdd65a8ce2
Yabin Cui [Sat, 24 Oct 2015 02:48:42 +0000 (19:48 -0700)]
Simpleperf: Don't load whole perf.data into memory.
perf.data can be too large to be loaded into memory.
To avoid this, use fread() instead of mmap() to read perf.data,
and always use RecordCache to sort records.
Fix unit tests failure caused by previous change.
Bug:
25194400
Change-Id: If29dc0bb0ed992ba34202c2cb1a204a1d9123b7a
Than McIntosh [Fri, 23 Oct 2015 17:15:07 +0000 (13:15 -0400)]
Reduce oom_score_adj to zero for perfprofd.
Up until this point perfprofd has inherited a
decreased OOM score of -1000 from init -- this
doens't make sense given that perfprofd is not
a critical system service. This fixes perfprofd to
reduce its oom_score_adj to 0.
Bug:
25216630
Change-Id: Ica8a300d8c33016bcbd3b0ecd25393828654878e
Yabin Cui [Fri, 23 Oct 2015 01:14:16 +0000 (01:14 +0000)]
Merge "Simpleperf: fix some unknown symbols for report result."
Yabin Cui [Mon, 12 Oct 2015 23:56:05 +0000 (16:56 -0700)]
Simpleperf: fix some unknown symbols for report result.
Using debug shared libraries in /usr/lib/debug on linux host.
Match ip addresses with symbols by symbols' virtual addresses instead of
file offsets in elf file. Because symbols' file offsets in debug shared
libraries are different from those in original shared libraries.
Fix overlapped maps.
Bug:
24716851
Change-Id: I9cb64958c4de5c7a6c77c3febc5f689cf2df650f
Yabin Cui [Fri, 23 Oct 2015 00:17:29 +0000 (00:17 +0000)]
Merge "Simpleperf: do stack unwinding while recording."
Kenny Root [Thu, 22 Oct 2015 00:09:39 +0000 (00:09 +0000)]
Merge "system/extras: remove BORINGSSL_201509 support."
Christopher Ferris [Wed, 21 Oct 2015 19:44:14 +0000 (19:44 +0000)]
Merge "Add timing of allocation functions."
Christopher Ferris [Wed, 14 Oct 2015 20:25:15 +0000 (13:25 -0700)]
Add timing of allocation functions.
Report the time it takes to execute every different allocation function
during the replay.
Change-Id: I4e8321409357824c10f2f176b02c7c33538d353b
Elliott Hughes [Tue, 20 Oct 2015 20:28:29 +0000 (20:28 +0000)]
Merge "Fix lseek argument order."
Elliott Hughes [Tue, 20 Oct 2015 20:14:28 +0000 (13:14 -0700)]
Fix lseek argument order.
Change-Id: I782d17a0678d7e74be89c46c42de942129750e55
Mike Frysinger [Tue, 20 Oct 2015 19:25:39 +0000 (19:25 +0000)]
Merge "brillo_config: add missing mkdir for product rules"
Mike Frysinger [Tue, 20 Oct 2015 18:11:47 +0000 (14:11 -0400)]
brillo_config: add missing mkdir for product rules
When doing a clean build, creating this file fails because the dir does
not yet exist:
echo "" > out/target/product/brilloemulator_arm/obj/ETC/product_id_intermediates/product_id
/bin/bash: out/target/product/brilloemulator_arm/obj/ETC/product_id_intermediates/product_id: No such file or directory
BUG:
24585672
Change-Id: I9c4a646b8d86cd303b0114f9b64d02896797f720
Sami Tolvanen [Tue, 20 Oct 2015 14:22:42 +0000 (14:22 +0000)]
Merge "libfec: add a function to disable verity"
Sami Tolvanen [Tue, 20 Oct 2015 12:23:19 +0000 (13:23 +0100)]
libfec: add a function to disable verity
Add fec_verity_set_status to allow disabling verity on userdebug
builds by updating metadata magic.
Change-Id: I02f83b0d1d4e7ef5cd5d13a37ff0b84f17e23376
Dan Albert [Mon, 19 Oct 2015 23:59:51 +0000 (23:59 +0000)]
Merge "Include what we use."
Dan Albert [Mon, 19 Oct 2015 22:57:14 +0000 (15:57 -0700)]
Include what we use.
libc++ used to leak unistd.h, causing ioctl and close to be leaked. It
doesn't anymore, so actually include this.
Change-Id: I510301a71ea0d9526a4862a634c7726053baa8f8
Sami Tolvanen [Mon, 19 Oct 2015 09:49:18 +0000 (09:49 +0000)]
Merge "verity: move metadata after the hash tree"
Mohamad Ayyash [Thu, 15 Oct 2015 20:16:03 +0000 (20:16 +0000)]
Merge "Setup filesystem for automatic forced repair"
Sami Tolvanen [Fri, 25 Sep 2015 13:57:41 +0000 (14:57 +0100)]
verity: move metadata after the hash tree
Move the verity metadata block after the hash tree to make locating
it easier and more reliable.
Needs matching changes from
I6945cbab99e214566a1f9d3702333f2dbbc35816
Change-Id: Ide48f581bbba77aed6132f77b309db71630d81ed
Bertrand Simonnet [Tue, 13 Oct 2015 19:58:46 +0000 (19:58 +0000)]
Merge "Add an Android.mk to generate build time configuration."
Bertrand SIMONNET [Thu, 8 Oct 2015 20:06:35 +0000 (13:06 -0700)]
Add an Android.mk to generate build time configuration.
Some build time variables need to be installed on the image. Instead of
adding those fields in some system services, create a new Android.mk for
it.
BUG:
24585672
Change-Id: Ia4132ef7a200e7839702fe10f878b70cc4dfff43
Sami Tolvanen [Tue, 13 Oct 2015 13:52:11 +0000 (13:52 +0000)]
Merge "slideshow: Switch to android::uptimeMillis"
Sami Tolvanen [Tue, 13 Oct 2015 13:51:45 +0000 (13:51 +0000)]
Merge "slideshow: Filter out non key events"
Yabin Cui [Wed, 7 Oct 2015 22:00:46 +0000 (15:00 -0700)]
Simpleperf: do stack unwinding while recording.
Dumping user's stack consumes lots of disk space, which makes long period recording
impossible. This patch does stack unwinding before writing to perf.data, so it doesn't
need to save user's stack. Previous behavior is still supported with --post-unwind option.
A record cache is used for online record processing.
Bug:
22229391
Change-Id: Idcc6ec46924fff3fcc8c165d62f8af875b173cd4
Johan Redestig [Mon, 12 Oct 2015 08:24:30 +0000 (10:24 +0200)]
slideshow: Switch to android::uptimeMillis
time(2) is not guaranteed to always go forward which makes
it a bit dangerous to use in loops like slideshow does.
switch to uptimeMillis which is based on clock_gettime
CLOCK_MONOTONIC which is is safe.
Change-Id: Ica1b7ee50df00fcc7bc849d7eaebe64f62434a47
Johan Redestig [Fri, 9 Oct 2015 11:25:39 +0000 (13:25 +0200)]
slideshow: Filter out non key events
The driver could send EV_SYN events which need
to be filtered out, otherwise we would change
image too soon.
Change-Id: I954e8a4f228da4165a7af3fa544e95a22390a35b
Yabin Cui [Sat, 10 Oct 2015 05:24:10 +0000 (05:24 +0000)]
Merge "Simpleperf: add runtest for callgraph."
Yabin Cui [Thu, 8 Oct 2015 18:42:55 +0000 (11:42 -0700)]
Simpleperf: add runtest for callgraph.
Bug:
22885658
Change-Id: Ief8d0f1462f78ceae76a10c3effbbe66e0b3b6c1
Sami Tolvanen [Fri, 9 Oct 2015 09:41:02 +0000 (09:41 +0000)]
Merge "slideshow: Trigger on key down only"
Sami Tolvanen [Fri, 9 Oct 2015 09:40:52 +0000 (09:40 +0000)]
Merge "slideshow: Dont crash when -t is used"
Johan Redestig [Fri, 9 Oct 2015 08:37:37 +0000 (10:37 +0200)]
slideshow: Dont crash when -t is used
Change-Id: I68764b86ad05afb3853ed753a28b4a53580cb68c
Johan Redestig [Fri, 9 Oct 2015 07:54:57 +0000 (09:54 +0200)]
slideshow: Trigger on key down only
Currently slideshow reacts to both key down and release
events which makes the last image just flicker very
briefly.
Change-Id: I5b3215eacf127a7c739826af313c6e1fd0732775
Yabin Cui [Thu, 8 Oct 2015 21:44:34 +0000 (21:44 +0000)]
Merge "Simpleperf: add a simple gui interface for report command."
Yabin Cui [Tue, 6 Oct 2015 21:14:39 +0000 (14:14 -0700)]
Simpleperf: add a simple gui interface for report command.
Change-Id: Ie3293a3f223117bd2dc2b398d0a96f9df8cf484b
Yabin Cui [Tue, 6 Oct 2015 22:02:30 +0000 (22:02 +0000)]
Merge "Simpleperf: do dwarf unwinding in record command."
Yabin Cui [Tue, 6 Oct 2015 21:03:50 +0000 (21:03 +0000)]
Merge "Simpleperf: add runtest."
Yabin Cui [Fri, 2 Oct 2015 00:24:07 +0000 (17:24 -0700)]
Simpleperf: add runtest.
Bug:
22885658
Change-Id: If710c215340665a8fa7d7bfdcd5a6686598cccbd
Sami Tolvanen [Mon, 5 Oct 2015 09:03:48 +0000 (09:03 +0000)]
am
92e11ea1: Merge "Add NOTICE files"
* commit '
92e11ea1b900fc89cf98604a9e2ebb5c7d570a01':
Add NOTICE files
Sami Tolvanen [Mon, 5 Oct 2015 08:04:54 +0000 (08:04 +0000)]
Merge "Add NOTICE files"
Yabin Cui [Thu, 1 Oct 2015 00:22:35 +0000 (17:22 -0700)]
Simpleperf: do dwarf unwinding in record command.
As libbacktrace only supports unwinding for the same architecture it is running on, simpleperf
report command running on host can't unwind perf.data collected on device. So we'd better do
unwinding work in record command on device.
Bug:
22229391
Change-Id: I085ca074ea83dab79f08563523bdbc7a36650a64
Sami Tolvanen [Fri, 2 Oct 2015 08:18:08 +0000 (09:18 +0100)]
Add NOTICE files
Bug:
24571219
Change-Id: Ib7a4374974c2d0d9225caa1e43d0b78251a36bd2
Yabin Cui [Thu, 1 Oct 2015 19:02:28 +0000 (19:02 +0000)]
am
eac5440e: Merge "Simpleperf: warn if it can\'t read kernel symbols addresses."
* commit '
eac5440e1fcff3ba0b5ed0779f962e9405918e06':
Simpleperf: warn if it can't read kernel symbols addresses.
Yabin Cui [Thu, 1 Oct 2015 18:55:38 +0000 (18:55 +0000)]
Merge "Simpleperf: warn if it can't read kernel symbols addresses."
Yabin Cui [Thu, 1 Oct 2015 18:32:44 +0000 (11:32 -0700)]
Simpleperf: warn if it can't read kernel symbols addresses.
And a little format adjustment.
Bug:
24404256
Change-Id: Ie8dcd37138a693df18101d415e6e3243f4963582
Adam Langley [Wed, 30 Sep 2015 22:03:46 +0000 (15:03 -0700)]
system/extras: remove BORINGSSL_201509 support.
The BORINGSSL_201509 define was used to make updating BoringSSL in
external/boringssl less painful. It allowed code to compile with either
the old BoringSSL (which didn't define BORINGSSL_201509) or with the new
(which does).
Now that the new version has landed, this change removes that support.
Change-Id: I19e661419f830459d015bf14e7905af2ec41b735
Lorenzo Colitti [Fri, 25 Sep 2015 08:43:49 +0000 (17:43 +0900)]
Make tcp_nuke_addr_test pass when run more than once.
Change-Id: I4e235f57f4491d02d8a89966e88b528b8000e877
Lorenzo Colitti [Fri, 18 Sep 2015 06:12:39 +0000 (15:12 +0900)]
Add some Android-specific kernel options.
Change-Id: Ib5574bc3645e6073a20c0f828269b17c308f2bdb
Sami Tolvanen [Tue, 29 Sep 2015 13:12:20 +0000 (13:12 +0000)]
am
482fe9e3: Merge "fec: enable building on Mac"
* commit '
482fe9e37737e5d6c7d0a4e0fe303e7d097971aa':
fec: enable building on Mac
Sami Tolvanen [Tue, 29 Sep 2015 13:07:46 +0000 (13:07 +0000)]
Merge "fec: enable building on Mac"
Sami Tolvanen [Mon, 28 Sep 2015 16:05:11 +0000 (17:05 +0100)]
fec: enable building on Mac
Enable the host libfec and the fec tool to be built on Mac with the
help of <utils/Compat.h>.
Change-Id: I5e7c9fac11f4a00814bad92734e703ec8dc22dc9
Sami Tolvanen [Mon, 28 Sep 2015 16:19:36 +0000 (16:19 +0000)]
am
3625af96: Merge "Error correction: Add a tool for en/decoding files"
* commit '
3625af964efa97cc7163f88ff711e67fab57af23':
Error correction: Add a tool for en/decoding files
Sami Tolvanen [Mon, 28 Sep 2015 16:14:25 +0000 (16:14 +0000)]
Merge "Error correction: Add a tool for en/decoding files"
Sami Tolvanen [Mon, 28 Sep 2015 15:14:14 +0000 (15:14 +0000)]
am
c82ca9f7: Merge "libfec: fix Mac build"
* commit '
c82ca9f7c85aa86ce0e1c758e4abddae1e201a15':
libfec: fix Mac build
Sami Tolvanen [Mon, 28 Sep 2015 15:10:14 +0000 (15:10 +0000)]
Merge "libfec: fix Mac build"
Sami Tolvanen [Mon, 28 Sep 2015 14:54:42 +0000 (15:54 +0100)]
libfec: fix Mac build
Exclude the host library and executables on Mac.
Change-Id: Ie399b83f3678d16aac67ce9a4414344a93f90055
Sami Tolvanen [Mon, 28 Sep 2015 14:15:57 +0000 (14:15 +0000)]
am
13f25b1b: Merge "Error correction: Add libfec to read encoded data"
* commit '
13f25b1b7f337802d3d1ad9d4e57f25737a18045':
Error correction: Add libfec to read encoded data
Sami Tolvanen [Mon, 28 Sep 2015 14:09:01 +0000 (14:09 +0000)]
Merge "Error correction: Add libfec to read encoded data"
Yabin Cui [Fri, 25 Sep 2015 18:22:38 +0000 (18:22 +0000)]
am
af995fea: Merge "Simpleperf: support dwarf callgraph in report command."
* commit '
af995fea111f29215c6a46099f741ebd4566fd5d':
Simpleperf: support dwarf callgraph in report command.
Yabin Cui [Fri, 25 Sep 2015 18:16:11 +0000 (18:16 +0000)]
Merge "Simpleperf: support dwarf callgraph in report command."
Sami Tolvanen [Sat, 16 May 2015 14:14:14 +0000 (15:14 +0100)]
Error correction: Add a tool for en/decoding files
Add fec, a tool for generating error-correcting codes for files
and recovering them.
Bug:
21893453
Change-Id: I389c92e5cc7f825d632759b9f96045767e74120a
Sami Tolvanen [Fri, 26 Jun 2015 13:28:31 +0000 (14:28 +0100)]
Error correction: Add libfec to read encoded data
Add libfec to read files or partitions with error-correcting codes
appended to them. Uses verity metadata to speed up I/O and improve
error correction effectiveness.
Bug:
21893453
Change-Id: I94b95058b084418019fc96595bb6055df36e2c2b
Yabin Cui [Thu, 24 Sep 2015 22:05:10 +0000 (22:05 +0000)]
am
a3e9a836: Merge "Simpleperf: fix flaky workload unit tests."
* commit '
a3e9a836bf0d21dc5248622f16c60d8617f54080':
Simpleperf: fix flaky workload unit tests.
Yabin Cui [Thu, 24 Sep 2015 21:59:16 +0000 (21:59 +0000)]
Merge "Simpleperf: fix flaky workload unit tests."
Yabin Cui [Thu, 24 Sep 2015 19:37:27 +0000 (12:37 -0700)]
Simpleperf: fix flaky workload unit tests.
Move SIGABRT to SIGKILL to make sure the child process is terminated by a signal.
SIGABRT can't guarantee this because the child process can install signal handler for SIGABRT.
Add a final _exit(1) after ChildProcessFn in case execvp() fails.
Change-Id: I353720b10c6ea42826efcafce5ff2699fd246e22
Ying Wang [Thu, 24 Sep 2015 19:49:55 +0000 (19:49 +0000)]
am
c137c2ba: Merge "Fix multilib build warning."
* commit '
c137c2ba3a01c453c75fc0f635aba436cbf25581':
Fix multilib build warning.
Ying Wang [Thu, 24 Sep 2015 19:42:41 +0000 (19:42 +0000)]
Merge "Fix multilib build warning."
Ying Wang [Thu, 24 Sep 2015 19:31:50 +0000 (12:31 -0700)]
Fix multilib build warning.
Change-Id: I3816f7f5352f204795f45d782b8ec80493d78491
David Zeuthen [Thu, 24 Sep 2015 17:06:48 +0000 (17:06 +0000)]
am
133143c5: Merge "boot_control_copy: Fix getCurrentSlot()."
* commit '
133143c56f336eef6545ef99f4c874dba6637ea6':
boot_control_copy: Fix getCurrentSlot().
David Zeuthen [Thu, 24 Sep 2015 16:25:32 +0000 (16:25 +0000)]
Merge "boot_control_copy: Fix getCurrentSlot()."
Lorenzo Colitti [Thu, 24 Sep 2015 04:47:16 +0000 (04:47 +0000)]
am
8ed1c510: Merge "Add test to exercise the tcp_nuke_addr functionality"
* commit '
8ed1c5101b2081784dcece041cf47f765896ef58':
Add test to exercise the tcp_nuke_addr functionality
Lorenzo Colitti [Thu, 24 Sep 2015 04:39:16 +0000 (04:39 +0000)]
Merge "Add test to exercise the tcp_nuke_addr functionality"
Lorenzo Colitti [Thu, 24 Sep 2015 04:02:49 +0000 (04:02 +0000)]
am
95aef404: Merge "Add a crash test for tcp_nuke_addr."
* commit '
95aef404646b03e3b36a7afc8932ffdc8b8b5ba1':
Add a crash test for tcp_nuke_addr.
Lorenzo Colitti [Thu, 24 Sep 2015 03:58:37 +0000 (03:58 +0000)]
Merge "Add a crash test for tcp_nuke_addr."
Yabin Cui [Fri, 14 Aug 2015 03:30:20 +0000 (20:30 -0700)]
Simpleperf: support dwarf callgraph in report command.
Use libbacktrace for stack unwinding.
Bug:
22229391
Change-Id: Iab35cdb52936c65c4728e23423ded83050f1db76
Elliott Hughes [Wed, 23 Sep 2015 18:56:20 +0000 (18:56 +0000)]
am
260e7e2c: Merge "Remove the hack for including libpagemap\'s headers."
* commit '
260e7e2c07b1738581c7f0620be6e674ec1a66d1':
Remove the hack for including libpagemap's headers.
Elliott Hughes [Wed, 23 Sep 2015 18:48:51 +0000 (18:48 +0000)]
Merge "Remove the hack for including libpagemap's headers."