OSDN Git Service
Elliott Hughes [Tue, 9 Jul 2013 20:44:57 +0000 (13:44 -0700)]
am
9d476716: Merge "Add <sys/statvfs.h>."
* commit '
9d476716c2bd7bc5a018a71e121257c35e965058':
Add <sys/statvfs.h>.
Elliott Hughes [Tue, 9 Jul 2013 20:43:13 +0000 (20:43 +0000)]
Merge "Add <sys/statvfs.h>."
Elliott Hughes [Tue, 9 Jul 2013 20:25:03 +0000 (13:25 -0700)]
Add <sys/statvfs.h>.
Bug:
2512019
Change-Id: I6e7fd3fa281977cc4bc270481a95416b5b2dc351
Elliott Hughes [Mon, 8 Jul 2013 22:09:07 +0000 (15:09 -0700)]
am
4fc8a0c1: Merge "Remove <netinet/icmp6.h> ni_* macros."
* commit '
4fc8a0c1165537b693c900ac3e2c61470bd7e484':
Remove <netinet/icmp6.h> ni_* macros.
Elliott Hughes [Mon, 8 Jul 2013 22:08:12 +0000 (22:08 +0000)]
Merge "Remove <netinet/icmp6.h> ni_* macros."
Elliott Hughes [Mon, 8 Jul 2013 22:05:50 +0000 (15:05 -0700)]
Remove <netinet/icmp6.h> ni_* macros.
glibc doesn't have these, and they prevent ping from building out of
the box because it assumes it can define them.
Bug:
9671560
Change-Id: I815f2a9c4fd96a0ea2952eb5a71ddf51e0763660
Elliott Hughes [Mon, 8 Jul 2013 21:55:41 +0000 (14:55 -0700)]
am
ff145277: Merge "Upgrade to tzdata2013d."
* commit '
ff145277da9b7fe3d48a27839fc1d6f2ed11604b':
Upgrade to tzdata2013d.
Elliott Hughes [Mon, 8 Jul 2013 21:53:02 +0000 (21:53 +0000)]
Merge "Upgrade to tzdata2013d."
Elliott Hughes [Mon, 8 Jul 2013 21:51:15 +0000 (14:51 -0700)]
Upgrade to tzdata2013d.
From the release notes:
Changes affecting future time stamps:
Morocco's midsummer transitions this year are July 7 and August 10,
not July 9 and August 8. (Thanks to Andrew Paprocki.)
Israel now falls back on the last Sunday of October.
(Thanks to Ephraim Silverberg.)
Changes affecting past time stamps:
Specify Jerusalem's location more precisely; this changes the pre-1880
times by 2 s.
Changing affecting metadata only:
Fix typos in the entries for country codes BQ and SX.
Change-Id: I87f992e4c406d4f254dc274f206536e9484024a2
Elliott Hughes [Mon, 8 Jul 2013 18:21:53 +0000 (11:21 -0700)]
am
e31c45c9: Merge "Make bionic\'s <netinet/icmp6.h> standalone, like glibc\'s."
* commit '
e31c45c9fa5e0d2853941282e619b753550b82ae':
Make bionic's <netinet/icmp6.h> standalone, like glibc's.
Elliott Hughes [Mon, 8 Jul 2013 18:17:57 +0000 (18:17 +0000)]
Merge "Make bionic's <netinet/icmp6.h> standalone, like glibc's."
Elliott Hughes [Mon, 8 Jul 2013 18:16:24 +0000 (11:16 -0700)]
Make bionic's <netinet/icmp6.h> standalone, like glibc's.
This removes the need for a bionic-specific hack in external/iproute2.
Bug:
9671560
Change-Id: I9f15be0711d26bca863bd66be9a39606500fb948
Elliott Hughes [Mon, 8 Jul 2013 17:34:41 +0000 (10:34 -0700)]
am
6b33f31b: Merge "Fix IPv6 filtering definitions in netinet/icmp6.h."
* commit '
6b33f31b0994b8132bed8936685522e2e01754d8':
Fix IPv6 filtering definitions in netinet/icmp6.h.
Elliott Hughes [Mon, 8 Jul 2013 17:32:17 +0000 (17:32 +0000)]
Merge "Fix IPv6 filtering definitions in netinet/icmp6.h."
Lorenzo Colitti [Wed, 3 Jul 2013 06:42:06 +0000 (15:42 +0900)]
Fix IPv6 filtering definitions in netinet/icmp6.h.
Linux and *BSD kernels use opposite values to indicate pass/block
in ICMPv6 filters, and assign a different value to the
ICMP6_FILTER sockopt.
Bug:
9671560
Bug:
9469682
Change-Id: Ic0f1fcd48891add992acf97632f60aebd172c1d7
Elliott Hughes [Mon, 8 Jul 2013 17:12:32 +0000 (10:12 -0700)]
am
e63ea6ac: Merge "Clean up <sys/mount.h>/<linux/fs.h> duplication."
* commit '
e63ea6aca7d01ba9219b877ed5fab6de5c6037fb':
Clean up <sys/mount.h>/<linux/fs.h> duplication.
Elliott Hughes [Mon, 8 Jul 2013 17:08:52 +0000 (17:08 +0000)]
Merge "Clean up <sys/mount.h>/<linux/fs.h> duplication."
Elliott Hughes [Wed, 3 Jul 2013 21:58:04 +0000 (14:58 -0700)]
Clean up <sys/mount.h>/<linux/fs.h> duplication.
Roll on uapi...
Bug:
6340120
Change-Id: Ic9521905683946e836574e4d768e34853ea777fa
Nick Kralevich [Wed, 3 Jul 2013 21:28:14 +0000 (14:28 -0700)]
am
84983592: Merge "bionic_atomic_arm.h: Remove < ARMv6 support"
* commit '
84983592ade3ec7d72d082262fb6646849979bfc':
bionic_atomic_arm.h: Remove < ARMv6 support
Nick Kralevich [Wed, 3 Jul 2013 21:25:35 +0000 (21:25 +0000)]
Merge "bionic_atomic_arm.h: Remove < ARMv6 support"
Nick Kralevich [Wed, 3 Jul 2013 21:14:06 +0000 (14:14 -0700)]
bionic_atomic_arm.h: Remove < ARMv6 support
This is dead code for most modern Android devices.
Bug:
9674955
Change-Id: Ic63a66b0331a0f07b9183f14a1d5e678c25e4b12
Elliott Hughes [Wed, 3 Jul 2013 20:39:16 +0000 (13:39 -0700)]
am
de2781d9: Merge changes I01345c23,I3b57517c
* commit '
de2781d906f27be4df3e03a8e5041dcc1aeb281d':
Include linux/termios.h from sys/ioctl.h.
Update linux/types.h to linux 2.6.20.
Elliott Hughes [Wed, 3 Jul 2013 20:37:28 +0000 (20:37 +0000)]
Merge changes I01345c23,I3b57517c
* changes:
Include linux/termios.h from sys/ioctl.h.
Update linux/types.h to linux 2.6.20.
Lorenzo Colitti [Wed, 3 Jul 2013 02:57:15 +0000 (11:57 +0900)]
Include linux/termios.h from sys/ioctl.h.
On NetBSD and glibc, including sys/ioctl.h provides some
terminal ioctl data structures such as struct winsize. For
compatibility, provide these via sys/ioctl.h in bionic as well.
bionic does not have its own definitions for these structures, so
get them from the Linux kernel definitions.
Change-Id: I01345c23c0bebd60b0a80fc33668e7c0ad7356c3
Lorenzo Colitti [Wed, 3 Jul 2013 04:21:35 +0000 (13:21 +0900)]
Update linux/types.h to linux 2.6.20.
This picks up the source kernel header change
I984154487c38f6fa827bd78234f7fc2e4e1c383f .
Bug:
9469682
Change-Id: I3b57517cc6442ba4d0b8003d7398617e8226233f
Elliott Hughes [Wed, 3 Jul 2013 17:23:41 +0000 (10:23 -0700)]
am
ebc8ce1d: Merge "libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings."
* commit '
ebc8ce1de68a83d772106af98c7cb98150bb5662':
libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings.
Elliott Hughes [Wed, 3 Jul 2013 17:21:47 +0000 (17:21 +0000)]
Merge "libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings."
Will Newton [Wed, 3 Jul 2013 08:44:30 +0000 (09:44 +0100)]
libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings.
This memcpy code uses NEON/VFP to achieve very good performance
on ARMv7-A processors. It is specifically tuned for A15 but should
provide good performance on A9 also. It is equivalent to the code
in cortex-strings rev 116.
This patch is a follow up the existing gerrit change:
I7f6f77995f3ca903ad9c66d14261441667a2a935
This version includes a tweak for performance on misaligned
buffers and splits the header comment into license and
documentation sections.
Change-Id: Ibd2e23c8d8e01357ba0247be1d05192de3ceba69
Signed-off-by: Will Newton <will.newton@linaro.org>
Elliott Hughes [Tue, 2 Jul 2013 23:02:30 +0000 (16:02 -0700)]
am
87b4286f: Merge "Expose dn_comp and dn_expand to system C code."
* commit '
87b4286f092094a2e8069a06e20ef5036a258172':
Expose dn_comp and dn_expand to system C code.
Elliott Hughes [Tue, 2 Jul 2013 23:00:37 +0000 (23:00 +0000)]
Merge "Expose dn_comp and dn_expand to system C code."
Lorenzo Colitti [Tue, 2 Jul 2013 08:44:00 +0000 (17:44 +0900)]
Expose dn_comp and dn_expand to system C code.
This is needed to compile open-source code that wants to
expand/compress domain names itself, such as ping6.
Bug:
9469682
Change-Id: I339c6538936d05c031bc6fb0a8793aaf1429dea4
Elliott Hughes [Tue, 2 Jul 2013 22:44:48 +0000 (15:44 -0700)]
am
feec97a7: Merge "Fix inttypes.h PRI?PTR and SCN?PTR macros."
* commit '
feec97a7c7fbd032174fb4870a02422c2acd891a':
Fix inttypes.h PRI?PTR and SCN?PTR macros.
Elliott Hughes [Tue, 2 Jul 2013 22:42:49 +0000 (22:42 +0000)]
Merge "Fix inttypes.h PRI?PTR and SCN?PTR macros."
Elliott Hughes [Tue, 2 Jul 2013 22:23:38 +0000 (15:23 -0700)]
Fix inttypes.h PRI?PTR and SCN?PTR macros.
Our intptr_t and uintptr_t aren't "long". Add a compilation test so we remember
to fix this to cope with 32- and 64-bit later.
Bug: http://code.google.com/p/android/issues/detail?id=57218
Change-Id: I2f816d339edb4f7d57e4418b818fb4c602093f38
Elliott Hughes [Tue, 2 Jul 2013 19:34:36 +0000 (12:34 -0700)]
am
1ba3a2c2: Merge "Update icmp6.h to current NetBSD."
* commit '
1ba3a2c26937c68a4a0bd4fdffe95f5162077997':
Update icmp6.h to current NetBSD.
Elliott Hughes [Tue, 2 Jul 2013 16:40:42 +0000 (16:40 +0000)]
Merge "Update icmp6.h to current NetBSD."
Lorenzo Colitti [Mon, 1 Jul 2013 08:07:03 +0000 (17:07 +0900)]
Update icmp6.h to current NetBSD.
This adds a few bits we need such as RFC 6106 support and the
definition of MLD_LISTENER_REDUCTION.
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/netinet/icmp6.h?rev=1.47
Bug:
9469682
Change-Id: I97a4c2f0893012ce315334367c055097d0f8bb10
Christopher Ferris [Mon, 1 Jul 2013 17:32:17 +0000 (10:32 -0700)]
am
7c14d67b: Merge "libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings."
* commit '
7c14d67bc1cc2679365a784e68518bf602b81dc7':
libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings.
Christopher Ferris [Mon, 1 Jul 2013 17:29:07 +0000 (17:29 +0000)]
Merge "libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings."
Nick Kralevich [Mon, 1 Jul 2013 17:00:09 +0000 (10:00 -0700)]
am
413eef71: Merge "More FORTIFY_SOURCE functions under clang"
* commit '
413eef716f822d5eb4f57618f6780c6af5036460':
More FORTIFY_SOURCE functions under clang
Nick Kralevich [Mon, 1 Jul 2013 16:57:04 +0000 (16:57 +0000)]
Merge "More FORTIFY_SOURCE functions under clang"
Will Newton [Mon, 1 Jul 2013 10:15:27 +0000 (11:15 +0100)]
libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings.
This memcpy code uses NEON/VFP to achieve very good performance
on ARMv7-A processors. It is specifically tuned for A15 but should
provide good performance on A9 also. It is equivalent to the code
in cortex-strings rev 116.
This patch is a follow up the existing gerrit change:
I7f6f77995f3ca903ad9c66d14261441667a2a935
But this version includes a tweak for performance on misaligned
buffers.
Change-Id: I285abac0068f8ae29a1cbf7862ea8590aadaf0a7
Signed-off-by: Will Newton <will.newton@linaro.org>
Nick Kralevich [Sat, 29 Jun 2013 15:15:25 +0000 (08:15 -0700)]
More FORTIFY_SOURCE functions under clang
* bzero
* umask
* strlcat
Change-Id: I65065208e0b8b37e10f6a266d5305de8fa9e59fc
Nick Kralevich [Fri, 28 Jun 2013 20:32:43 +0000 (13:32 -0700)]
am
227b47a4: Merge "resolv_private.h: remove #define b64_ntop and b64_pton"
* commit '
227b47a461b27d746b373feb66001cdddc9ba1db':
resolv_private.h: remove #define b64_ntop and b64_pton
Nick Kralevich [Fri, 28 Jun 2013 20:31:11 +0000 (20:31 +0000)]
Merge "resolv_private.h: remove #define b64_ntop and b64_pton"
Nick Kralevich [Fri, 28 Jun 2013 20:18:32 +0000 (13:18 -0700)]
resolv_private.h: remove #define b64_ntop and b64_pton
This was gated off of "#ifndef ADNROID_CHANGES" (note mispelling)
and is unconditionally defined in libc/include/resolv.h
(which this file includes). No need for duplicate definitions.
Change-Id: I00719bcf39eaa26eb96ab4274f171f3d2b5bae61
Nick Kralevich [Fri, 28 Jun 2013 20:11:14 +0000 (13:11 -0700)]
am
394df35e: Merge "Reorganize FORTIFY_SOURCE tests."
* commit '
394df35e641816a3b9f0e065840b673dec9c73e5':
Reorganize FORTIFY_SOURCE tests.
Nick Kralevich [Fri, 28 Jun 2013 20:05:57 +0000 (20:05 +0000)]
Merge "Reorganize FORTIFY_SOURCE tests."
Nick Kralevich [Fri, 28 Jun 2013 17:34:09 +0000 (10:34 -0700)]
Reorganize FORTIFY_SOURCE tests.
Get rid of a lot of the duplication in the various FORTIFY_SOURCE
tests. Instead, we build 4 separate static libraries, with
4 different compile time options, and link them into the final test
binary.
Change-Id: Idb0b7cccc8dd837adb037bf4ddfe8942ae138230
Nick Kralevich [Thu, 27 Jun 2013 17:15:31 +0000 (10:15 -0700)]
am
78a7bf99: Merge "stdio.h: enable vs?printf clang FORTIFY_SOURCE"
* commit '
78a7bf998d2d29592504984fcf419cd2701c6c54':
stdio.h: enable vs?printf clang FORTIFY_SOURCE
Nick Kralevich [Thu, 27 Jun 2013 17:13:25 +0000 (17:13 +0000)]
Merge "stdio.h: enable vs?printf clang FORTIFY_SOURCE"
Nick Kralevich [Thu, 27 Jun 2013 15:58:14 +0000 (08:58 -0700)]
stdio.h: enable vs?printf clang FORTIFY_SOURCE
Enable FORTIFY_SOURCE protections under clang for the following
functions:
* vsprintf
* vsnprintf
and add unittests.
Change-Id: I90f8a27f7b202c78b5dd8ebf53050bf9e33496f7
Colin Cross [Wed, 26 Jun 2013 00:08:48 +0000 (17:08 -0700)]
am
fbec57d4: Merge changes Ib496e818,I074204e9
* commit '
fbec57d46c42460b2381484d1610ff21922d162e':
bionic: add compatibility mode for properties
bionic: use the size of the file to determine property area size
Colin Cross [Wed, 26 Jun 2013 00:03:24 +0000 (00:03 +0000)]
Merge changes Ib496e818,I074204e9
* changes:
bionic: add compatibility mode for properties
bionic: use the size of the file to determine property area size
Colin Cross [Tue, 25 Jun 2013 01:36:39 +0000 (18:36 -0700)]
bionic: add compatibility mode for properties
Allow a new bionic to work with an old init property area by supporting
the old format.
(cherry picked from commit
ad76c85b9ca587084089d086f954158bc0eae905)
Change-Id: Ib496e818a62a5834d40c71eb4745783d998be893
Colin Cross [Tue, 25 Jun 2013 01:42:21 +0000 (18:42 -0700)]
bionic: use the size of the file to determine property area size
On the reader size, don't assume that the property size is PA_SIZE,
read it from the size of the file. Allows init to use a different
property size without recompiling statically linked executables.
(cherry picked from commit
285b42a04cbe8e627a75c9bfb3c7cb3f7b539267)
Change-Id: I074204e9e6591b35faf7c1c58fb11ec162aff7bf
Elliott Hughes [Tue, 25 Jun 2013 22:58:53 +0000 (15:58 -0700)]
am
b116bf76: Merge "Switch to current upstream getopt_long."
* commit '
b116bf76286178a7d552c4d0a72b79212c8c93d1':
Switch to current upstream getopt_long.
Elliott Hughes [Tue, 25 Jun 2013 22:56:59 +0000 (22:56 +0000)]
Merge "Switch to current upstream getopt_long."
Rom Lemarchand [Tue, 25 Jun 2013 22:28:21 +0000 (15:28 -0700)]
am
995f17e6: Merge "libc: add swapon and swapoff syscalls"
* commit '
995f17e6a9a9903f03f542192da9a83b1cabc684':
libc: add swapon and swapoff syscalls
Rom Lemarchand [Tue, 25 Jun 2013 22:25:30 +0000 (22:25 +0000)]
Merge "libc: add swapon and swapoff syscalls"
Elliott Hughes [Tue, 25 Jun 2013 21:48:10 +0000 (14:48 -0700)]
Switch to current upstream getopt_long.
Change-Id: I4c646dcb8be9e88dd54d069a03bbc5fbfd92de03
Elliott Hughes [Tue, 25 Jun 2013 21:22:14 +0000 (14:22 -0700)]
am
c76550b3: Merge "Update x86 machine/endian.h from upstream"
* commit '
c76550b3377f50a2bc53536e2713e14edc8dbeac':
Update x86 machine/endian.h from upstream
Elliott Hughes [Tue, 25 Jun 2013 21:20:18 +0000 (21:20 +0000)]
Merge "Update x86 machine/endian.h from upstream"
Pavel Chupin [Fri, 19 Apr 2013 09:09:25 +0000 (13:09 +0400)]
Update x86 machine/endian.h from upstream
After download new version from upstream (OpenBSD 1.17) did the
following:
* changed all u_int* types to uint*
* add #include <sys/types.h>
All these changes are Android-specific and had been done before for
previous version (1.14).
Bug: http://code.google.com/p/android/issues/detail?id=54465
Change-Id: Ieb44e7fce4e794d997bb00ee0dd417fb61521720
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Rom Lemarchand [Thu, 6 Jun 2013 21:29:40 +0000 (14:29 -0700)]
libc: add swapon and swapoff syscalls
Change-Id: Ie79dc8e3f2ff1cd427dd6d95e3850920c4b407b0
Signed-off-by: Rom Lemarchand <romlem@google.com>
Elliott Hughes [Tue, 25 Jun 2013 20:17:37 +0000 (13:17 -0700)]
am
7d624e9a: Merge "Kernel dso support for \'dl_iterate_phdr\' function"
* commit '
7d624e9aff4c6addea7f2275fe58ff0815d95c70':
Kernel dso support for 'dl_iterate_phdr' function
Elliott Hughes [Tue, 25 Jun 2013 20:15:29 +0000 (20:15 +0000)]
Merge "Kernel dso support for 'dl_iterate_phdr' function"
Sergey Melnikov [Fri, 25 Jan 2013 12:40:13 +0000 (16:40 +0400)]
Kernel dso support for 'dl_iterate_phdr' function
Kernel provides virtual DSO for stack unwinding/exception handlind info for
signal usage case. Stack unwinding routines use 'dl_iterate_phdr' function
for additional DWARF info gathering from DSOs. Patch enables virtual DSO
enumeration via dl_iterate_phdr function.
Signed-off-by: Sergey Melnikov <sergey.melnikov@intel.com>
Change-Id: Ic2882b28f40b456a088bc1e63c50cbfda7e4a102
Nick Kralevich [Tue, 25 Jun 2013 17:34:20 +0000 (10:34 -0700)]
am
bfacb603: Merge "libc: enable FORTIFY_SOURCE snprintf under clang"
* commit '
bfacb603e417c1e2c25ce8482b5c6e31b4db8c9b':
libc: enable FORTIFY_SOURCE snprintf under clang
Nick Kralevich [Tue, 25 Jun 2013 17:26:20 +0000 (17:26 +0000)]
Merge "libc: enable FORTIFY_SOURCE snprintf under clang"
Nick Kralevich [Tue, 25 Jun 2013 17:02:35 +0000 (10:02 -0700)]
libc: enable FORTIFY_SOURCE snprintf under clang
Change-Id: I8b8059782a720104722b0841994b38f873ed02aa
Colin Cross [Tue, 25 Jun 2013 00:10:16 +0000 (17:10 -0700)]
am
1642edb5: Merge changes Ib074192d,I6df3afed,I69070455,Icbe31908,Id3fa4526,I038d451f
* commit '
1642edb5208fe02ef64d5734fffaf7c4a724fd2f':
bionic: store property names as variable-length strings
bionic: prevent root processes from calling __system_property_add
bionic: revert to a single (larger) property area
bionic: reimplement property area as hybrid trie/binary tree
bionic: add missing memory barriers to system properties
bionic: make property area expandable
Colin Cross [Tue, 25 Jun 2013 00:07:53 +0000 (00:07 +0000)]
Merge changes Ib074192d,I6df3afed,I69070455,Icbe31908,Id3fa4526,I038d451f
* changes:
bionic: store property names as variable-length strings
bionic: prevent root processes from calling __system_property_add
bionic: revert to a single (larger) property area
bionic: reimplement property area as hybrid trie/binary tree
bionic: add missing memory barriers to system properties
bionic: make property area expandable
Greg Hackmann [Fri, 21 Jun 2013 20:02:38 +0000 (13:02 -0700)]
bionic: store property names as variable-length strings
Names are immutable, so the fixed-sized arrays can be replaced with
variable-length ones to save memory (especially on internal tree nodes).
Signed-off-by: Greg Hackmann <ghackmann@google.com>
(cherry picked from commit
492ce95d9f6149137cb5b63c55cf2b3cdbe51e5e)
Change-Id: Ib074192d1b71150233d78c58e9ffcf7ecf688b6b
Colin Cross [Sun, 16 Jun 2013 17:19:16 +0000 (10:19 -0700)]
bionic: prevent root processes from calling __system_property_add
If a root process other than init calls __system_property_add, which
it should never do, it will break the design assumption that there is
only one mutator.
Pass O_EXCL to open() in map_prop_region_rw to ensure that only one
process ever has the property pages open for write.
(cherry picked from commit
fb9b7b436f3ef94385f1b0c55ab81f246f0d96b8)
Change-Id: I6df3afedbfb5d07891b095aa24b78278381a5aaf
Greg Hackmann [Wed, 19 Jun 2013 20:31:21 +0000 (13:31 -0700)]
bionic: revert to a single (larger) property area
d329697 is too complicated. Change the multiple property pages back to
a single 128K property area that's mapped in entirely at initialization
(the memory will not get allocated until the pages are touched).
d329697 has other changes useful for testing (moving property area
initialization inside bionic and adding __system_property_set_filename)
so undo the change manually rather than with git revert.
Signed-off-by: Greg Hackmann <ghackmann@google.com>
(cherry picked from commit
5f05348c18286a2cea46eae8acf94ed5b7932fac)
Change-Id: I690704552afc07a4dd410277893ca9c40bc13e5f
Greg Hackmann [Thu, 20 Jun 2013 18:27:56 +0000 (11:27 -0700)]
bionic: reimplement property area as hybrid trie/binary tree
See the comments for an explanation of how properties are stored.
The trie structure is designed to scale better than the previous
array-based implementation. Searching an array with n properties
required average O(n) string compares of the entire key; searching the
trie requires average O(log n) string compares of each token (substrings
between '.' characters).
Signed-off-by: Greg Hackmann <ghackmann@google.com>
(cherry picked from commit
6ac8e6a46d71a51bec16938efa89f275fa89cf7d)
Change-Id: Icbe31908572f33b4d9b85d5b62ac837cbd0f85e0
Greg Hackmann [Thu, 20 Jun 2013 17:33:28 +0000 (10:33 -0700)]
bionic: add missing memory barriers to system properties
1) Reading the value must finish before checking whether it's intact
2) Setting the serial's dirty bit must visible before modifying the
value
3) The modified value must be visible before clearing the serial's dirty
bit
4) New properties and their TOC entries must be visible before updating
the property count
Signed-off-by: Greg Hackmann <ghackmann@google.com>
(cherry picked from commit
5bfa3ee8b37ef162154559575193018a6235acba)
Change-Id: Id3fa45261fc2df2ae493ab5194bc2b6bff04e966
Greg Hackmann [Wed, 13 Feb 2013 22:41:48 +0000 (14:41 -0800)]
bionic: make property area expandable
The property area is initially one 4K region, automatically expanding as
needed up to 64 regions.
To avoid duplicating code, __system_property_area_init() now allocates
and initializes the first region (previously it was allocated in init's
init_property_area() and initialized in bionic). For testing purposes,
__system_property_set_filename() may be used to override the file used
to map in regions.
Signed-off-by: Greg Hackmann <ghackmann@google.com>
(cherry picked from commit
d32969701be070c0161c2643ee3c3df16066bbb8)
Change-Id: I038d451fe8849b0c4863663eec6f57f6521bf4a7
Nick Kralevich [Mon, 24 Jun 2013 22:20:39 +0000 (15:20 -0700)]
am
0ea1d5c0: Merge "libc: enable sprintf FORTIFY_SOURCE under clang"
* commit '
0ea1d5c0ae94ee581c72451b20813c028f51090c':
libc: enable sprintf FORTIFY_SOURCE under clang
Nick Kralevich [Mon, 24 Jun 2013 22:15:12 +0000 (22:15 +0000)]
Merge "libc: enable sprintf FORTIFY_SOURCE under clang"
Nick Kralevich [Mon, 24 Jun 2013 18:44:00 +0000 (11:44 -0700)]
libc: enable sprintf FORTIFY_SOURCE under clang
clang doesn't support __builtin_va_arg_pack(), so we have
to use #define instead.
Change-Id: I2ee75e6267d60cdf997fee6b9b0547bf68f062a1
Nick Kralevich [Fri, 21 Jun 2013 22:39:21 +0000 (15:39 -0700)]
am
53ddcc90: Merge "linker: Emit a warning on text relocations"
* commit '
53ddcc90701d86c7d809a84cf4710c651066e3c7':
linker: Emit a warning on text relocations
Nick Kralevich [Fri, 21 Jun 2013 22:36:50 +0000 (22:36 +0000)]
Merge "linker: Emit a warning on text relocations"
Nick Kralevich [Fri, 21 Jun 2013 19:31:33 +0000 (12:31 -0700)]
linker: Emit a warning on text relocations
Text relocations unnecessarily mark pages as dirty, preventing them
from being swapped out, wasting memory. Also, text relocations
prevent the code from running on certain hardened systems.
Print a message in logcat and stderr when we see a text relocation,
to encourage developers to fix their code.
Change-Id: I6051a7463911e090ae5727a355397d539669d5b9
Nick Kralevich [Fri, 21 Jun 2013 21:33:48 +0000 (14:33 -0700)]
am
68197731: Merge "libc_logging: don\'t keep file descriptors open forever"
* commit '
6819773103495a6fd81f024dc6711771320ae4ec':
libc_logging: don't keep file descriptors open forever
Nick Kralevich [Fri, 21 Jun 2013 21:26:09 +0000 (21:26 +0000)]
Merge "libc_logging: don't keep file descriptors open forever"
Nick Kralevich [Fri, 21 Jun 2013 20:28:42 +0000 (13:28 -0700)]
libc_logging: don't keep file descriptors open forever
Avoid keeping unnecessary file descriptors around when they're not
needed. Libc doesn't log so much that opening / closing overhead
matters.
Change-Id: I590ec5c27562db9bac025f781c48ec9a7724ce77
Nick Kralevich [Thu, 20 Jun 2013 19:29:38 +0000 (12:29 -0700)]
am
0ce28d20: Merge "libc: enable FORTIFY_SOURCE clang strlcpy"
* commit '
0ce28d20ea5fde250576f355004dbcd741b0b884':
libc: enable FORTIFY_SOURCE clang strlcpy
Nick Kralevich [Thu, 20 Jun 2013 19:27:47 +0000 (19:27 +0000)]
Merge "libc: enable FORTIFY_SOURCE clang strlcpy"
Nick Kralevich [Thu, 20 Jun 2013 19:17:44 +0000 (12:17 -0700)]
libc: enable FORTIFY_SOURCE clang strlcpy
Change-Id: Idcfe08f5afc3dde592416df9eba83f64e130c7c2
Elliott Hughes [Wed, 19 Jun 2013 19:46:40 +0000 (12:46 -0700)]
am
4eed6509: Merge "stdint.h header is not fully compatible with C99(ISO9899:1999)"
* commit '
4eed65090b1f0d0d087f26bd7367da90a0cca92d':
stdint.h header is not fully compatible with C99(ISO9899:1999)
Elliott Hughes [Wed, 19 Jun 2013 19:45:09 +0000 (19:45 +0000)]
Merge "stdint.h header is not fully compatible with C99(ISO9899:1999)"
Nick Kralevich [Wed, 19 Jun 2013 17:36:55 +0000 (10:36 -0700)]
am
02ca0e31: Merge "Fix FORTIFY_SOURCE unittests."
* commit '
02ca0e314219a4c7205a180a414c509651043f13':
Fix FORTIFY_SOURCE unittests.
Nick Kralevich [Wed, 19 Jun 2013 17:33:57 +0000 (17:33 +0000)]
Merge "Fix FORTIFY_SOURCE unittests."
Colin Cross [Wed, 19 Jun 2013 17:27:23 +0000 (10:27 -0700)]
am
3225f498: Merge "bionic: add __system_property_foreach"
* commit '
3225f4984837c4d9e6e9495d2154f2d9987cf457':
bionic: add __system_property_foreach
Colin Cross [Wed, 19 Jun 2013 17:26:17 +0000 (17:26 +0000)]
Merge "bionic: add __system_property_foreach"
Nick Kralevich [Wed, 19 Jun 2013 17:25:44 +0000 (10:25 -0700)]
Fix FORTIFY_SOURCE unittests.
The compiler is too damn smart.
Change-Id: Ibef3ef41ec99f8cd9c06f1dbca535819f9a08197
Sergey Melnikov [Thu, 22 Nov 2012 11:23:48 +0000 (15:23 +0400)]
stdint.h header is not fully compatible with C99(ISO9899:1999)
stdint.h provides macros with incorrect type:
* UINT8_C
* UINT16_C
* UINT8_MAX
* UINT16_MAX
Signed-off-by: Sergey Melnikov <sergey.melnikov@intel.com>
Change-Id: I2d130c782d4485bf6c9e9f068de0bdaa4ba7303f
Greg Hackmann [Wed, 13 Feb 2013 00:39:31 +0000 (16:39 -0800)]
bionic: add __system_property_foreach
find_nth() will be inefficient on a trie. Since find_nth() is only used
internally and only for enumerating properties, we can add a foreach()
function to do this directly.
Signed-off-by: Greg Hackmann <ghackmann@google.com>
(cherry picked from commit
577418403d68e663fb33c7b0c8a90d862d9c00cf)
Change-Id: Iaca97d1182ce2c28863ba85241cbb5cf6185eb2f