OSDN Git Service
Colin Cross [Tue, 18 Jun 2013 20:27:29 +0000 (13:27 -0700)]
am
e421bd71: am
02002443: Merge "bionic: fix deleting property arrays in property benchmark"
* commit '
e421bd71c32e35b8f39f2e51f2d534d2f21f139f':
bionic: fix deleting property arrays in property benchmark
Colin Cross [Tue, 18 Jun 2013 20:23:51 +0000 (13:23 -0700)]
am
02002443: Merge "bionic: fix deleting property arrays in property benchmark"
* commit '
02002443d4b17de78418d51fc303b4c976ad071a':
bionic: fix deleting property arrays in property benchmark
Colin Cross [Tue, 18 Jun 2013 20:22:25 +0000 (20:22 +0000)]
Merge "bionic: fix deleting property arrays in property benchmark"
Nick Kralevich [Tue, 18 Jun 2013 20:21:00 +0000 (13:21 -0700)]
am
ba6c021a: am
e2fb05b4: Merge "libc: Introduce __errordecl()"
* commit '
ba6c021a53376c75993cc9866deb7c7ff6e1750d':
libc: Introduce __errordecl()
Nick Kralevich [Tue, 18 Jun 2013 20:17:35 +0000 (13:17 -0700)]
am
e2fb05b4: Merge "libc: Introduce __errordecl()"
* commit '
e2fb05b45b9af7b9af8df0ea15bfec63d331d882':
libc: Introduce __errordecl()
Nick Kralevich [Tue, 18 Jun 2013 20:15:33 +0000 (20:15 +0000)]
Merge "libc: Introduce __errordecl()"
Colin Cross [Tue, 18 Jun 2013 20:08:28 +0000 (13:08 -0700)]
bionic: fix deleting property arrays in property benchmark
Use delete[] to delete arrays allocated with new []
Change-Id: Icc2a6b23df09049c008f7f1f50ed93a277174308
Colin Cross [Tue, 18 Jun 2013 20:07:58 +0000 (13:07 -0700)]
am
1a38e063: am
0005b354: Merge "bionic: change properties benchmarks to read a single property"
* commit '
1a38e063830924efb8a6d9d7a6135ef54460cb9b':
bionic: change properties benchmarks to read a single property
Colin Cross [Tue, 18 Jun 2013 20:04:10 +0000 (13:04 -0700)]
am
0005b354: Merge "bionic: change properties benchmarks to read a single property"
* commit '
0005b3544be345e697592b4dc199ebaa37048559':
bionic: change properties benchmarks to read a single property
Colin Cross [Tue, 18 Jun 2013 20:01:04 +0000 (20:01 +0000)]
Merge "bionic: change properties benchmarks to read a single property"
Colin Cross [Tue, 18 Jun 2013 19:47:38 +0000 (12:47 -0700)]
bionic: change properties benchmarks to read a single property
The properties benchmarks were reading n properties from a property
area with n properties in it, which was making it hard to compare
the time between runs of different sizes. Change the benchmark
to read a random property per iteration so the numbers between
runs are comparable.
Change-Id: Ib1648ce0948d9038fce76d209608427376cfb8da
Nick Kralevich [Tue, 18 Jun 2013 17:46:02 +0000 (10:46 -0700)]
libc: Introduce __errordecl()
Define __errordecl and replace __attribute__((__error__("foo")))
with __errordecl. Make sure __errordecl is a no-op on clang, as it
generates a compile time warning.
Change-Id: Ifa1a2d3afd6881de9d479fc2adac6737871a2949
Colin Cross [Tue, 18 Jun 2013 01:33:50 +0000 (18:33 -0700)]
am
f6e6e5e7: am
977a3313: Merge changes Iac00ce10,I192d3825
* commit '
f6e6e5e72774e302c461767ca0c194f25502108e':
bionic: add tests for properties
bionic: move system property writing from init to bionic
Colin Cross [Tue, 18 Jun 2013 01:21:37 +0000 (18:21 -0700)]
am
977a3313: Merge changes Iac00ce10,I192d3825
* commit '
977a33137d2be0093f474055f839cf665b82b588':
bionic: add tests for properties
bionic: move system property writing from init to bionic
Colin Cross [Tue, 18 Jun 2013 01:11:58 +0000 (01:11 +0000)]
Merge changes Iac00ce10,I192d3825
* changes:
bionic: add tests for properties
bionic: move system property writing from init to bionic
Colin Cross [Tue, 29 Jan 2013 01:19:43 +0000 (17:19 -0800)]
bionic: add tests for properties
(cherry picked from commit
37d9f75dde881a0ba1c1b3253b1be19d4096963d)
Change-Id: Iac00ce10a4272032a1cbdbc4204277d6876e3365
Colin Cross [Thu, 24 Jan 2013 07:07:06 +0000 (23:07 -0800)]
bionic: move system property writing from init to bionic
Move the implementation of writing to the system property area
from init to bionic, next to the reader implementation. This
will allow full property testing to be added to bionic tests.
Add new accessor and waiting functions to hide the implementation
from watchprops and various bionic users.
Also hide some of the implementation details of the property area
from init by moving them into _system_properties.h, and other details
from everybody by moving them into system_properties.h.
(cherry picked from commit
dc1038b7900acb664e99643d2974e1a0f4703781)
Change-Id: I192d3825ee276c5047bc751039fe6cfe226a7cca
Elliott Hughes [Mon, 17 Jun 2013 21:56:04 +0000 (14:56 -0700)]
am
d2dbf163: am
5995bf88: Merge "don\'t hardcode register r0/v1 when reading the TLS"
* commit '
d2dbf16358bee4777a3e4937cf316fa8bb905559':
don't hardcode register r0/v1 when reading the TLS
Elliott Hughes [Mon, 17 Jun 2013 21:53:12 +0000 (14:53 -0700)]
am
5995bf88: Merge "don\'t hardcode register r0/v1 when reading the TLS"
* commit '
5995bf880e2a7fac249382f0a929b7271c843122':
don't hardcode register r0/v1 when reading the TLS
Elliott Hughes [Mon, 17 Jun 2013 21:51:49 +0000 (21:51 +0000)]
Merge "don't hardcode register r0/v1 when reading the TLS"
Mathias Agopian [Sat, 15 Jun 2013 02:00:03 +0000 (19:00 -0700)]
don't hardcode register r0/v1 when reading the TLS
this leads to much improved code when calling __get_tls()
Change-Id: I21d870fb33c33a921ca55c4e100772e0f7a8d1e4
Colin Cross [Tue, 29 Jan 2013 01:19:43 +0000 (17:19 -0800)]
bionic: add tests for properties
Change-Id: I09b212966f1c9624631653ef2c7a71de78bbbec1
Colin Cross [Thu, 24 Jan 2013 07:07:06 +0000 (23:07 -0800)]
bionic: move system property writing from init to bionic
Move the implementation of writing to the system property area
from init to bionic, next to the reader implementation. This
will allow full property testing to be added to bionic tests.
Add new accessor and waiting functions to hide the implementation
from watchprops and various bionic users.
Also hide some of the implementation details of the property area
from init by moving them into _system_properties.h, and other details
from everybody by moving them into system_properties.h.
Change-Id: I9026e604109e30546b2849b60cab2e7e5ff00ba5
Elliott Hughes [Mon, 17 Jun 2013 18:22:01 +0000 (11:22 -0700)]
am
afd4e299: am
657d0da7: Merge "Slight script cleanup; make gensyscalls work from any directory."
* commit '
afd4e2999c3e726498c407fcaf9cccdcd4d24637':
Slight script cleanup; make gensyscalls work from any directory.
Elliott Hughes [Mon, 17 Jun 2013 18:18:58 +0000 (11:18 -0700)]
am
657d0da7: Merge "Slight script cleanup; make gensyscalls work from any directory."
* commit '
657d0da7513e01b0eb104c8a8a522c28fdbc807d':
Slight script cleanup; make gensyscalls work from any directory.
Elliott Hughes [Mon, 17 Jun 2013 18:16:36 +0000 (18:16 +0000)]
Merge "Slight script cleanup; make gensyscalls work from any directory."
Elliott Hughes [Mon, 17 Jun 2013 17:26:10 +0000 (10:26 -0700)]
Slight script cleanup; make gensyscalls work from any directory.
Also remove a ton of dead code.
Change-Id: I1315623695a004f643b155f121cbafe24b715b8a
Elliott Hughes [Fri, 14 Jun 2013 01:04:19 +0000 (18:04 -0700)]
am
c1e4183c: am
560e9f7e: Merge "Ensure that <stdint.h> defines SIZE_MAX and friends."
* commit '
c1e4183c7ad6943f9cc44fe0b769884370a739cd':
Ensure that <stdint.h> defines SIZE_MAX and friends.
Elliott Hughes [Thu, 13 Jun 2013 23:21:55 +0000 (16:21 -0700)]
am
560e9f7e: Merge "Ensure that <stdint.h> defines SIZE_MAX and friends."
* commit '
560e9f7e7a39e02aca96709043ca06f562f75d58':
Ensure that <stdint.h> defines SIZE_MAX and friends.
Elliott Hughes [Thu, 13 Jun 2013 23:19:09 +0000 (23:19 +0000)]
Merge "Ensure that <stdint.h> defines SIZE_MAX and friends."
Elliott Hughes [Thu, 13 Jun 2013 23:02:53 +0000 (16:02 -0700)]
Ensure that <stdint.h> defines SIZE_MAX and friends.
We were missing SIG_ATOMIC_MAX, SIG_ATOMIC_MIN, SIZE_MAX,
WCHAR_MAX, WCHAR_MIN, WINT_MAX, and WINT_MIN.
Change-Id: I2535f36bc220fbaea009b483599b7af811c4cb5c
Elliott Hughes [Thu, 13 Jun 2013 00:51:25 +0000 (17:51 -0700)]
am
af975b07: am
c843a3e7: Merge "Fix the qsort copyright notice (fixed upstream this afternoon)."
* commit '
af975b076f79b35cb115c0f77fc8fc0e5d3dba67':
Fix the qsort copyright notice (fixed upstream this afternoon).
Elliott Hughes [Thu, 13 Jun 2013 00:46:57 +0000 (17:46 -0700)]
am
c843a3e7: Merge "Fix the qsort copyright notice (fixed upstream this afternoon)."
* commit '
c843a3e7b215bca5e896e1d56c2fa6332770ea83':
Fix the qsort copyright notice (fixed upstream this afternoon).
Elliott Hughes [Thu, 13 Jun 2013 00:44:05 +0000 (00:44 +0000)]
Merge "Fix the qsort copyright notice (fixed upstream this afternoon)."
Elliott Hughes [Thu, 13 Jun 2013 00:42:43 +0000 (17:42 -0700)]
Fix the qsort copyright notice (fixed upstream this afternoon).
Change-Id: I786feb42719bceaa7da91565e350c1333b0d301f
Elliott Hughes [Thu, 13 Jun 2013 00:38:26 +0000 (17:38 -0700)]
am
ddbf561e: am
c843d766: Merge "Handles spurious wake-ups in pthread_join()"
* commit '
ddbf561e5ee8f16fc15d26b085d19ce6abf7e4e0':
Handles spurious wake-ups in pthread_join()
Elliott Hughes [Thu, 13 Jun 2013 00:35:02 +0000 (17:35 -0700)]
am
7ae23868: am
92e841d0: Merge "Take upstream libm changes."
* commit '
7ae23868b4741f9b1af874ebbb13ec3ba930d679':
Take upstream libm changes.
Elliott Hughes [Thu, 13 Jun 2013 00:34:17 +0000 (17:34 -0700)]
am
c843d766: Merge "Handles spurious wake-ups in pthread_join()"
* commit '
c843d7667ada205ecbaf773531067076ed4ad271':
Handles spurious wake-ups in pthread_join()
Elliott Hughes [Thu, 13 Jun 2013 00:31:49 +0000 (00:31 +0000)]
Merge "Handles spurious wake-ups in pthread_join()"
Elliott Hughes [Thu, 13 Jun 2013 00:30:59 +0000 (17:30 -0700)]
am
92e841d0: Merge "Take upstream libm changes."
* commit '
92e841d0aa8d118882a74e3c3fc4b6a6062dcc09':
Take upstream libm changes.
msg555 [Thu, 6 Jun 2013 18:59:28 +0000 (14:59 -0400)]
Handles spurious wake-ups in pthread_join()
Removed 'join_count' from pthread_internal_t and switched to using the flag
PTHREAD_ATTR_FLAG_JOINED to indicate if a thread is being joined. Combined with
a switch to a while loop in pthread_join, this fixes spurious wake-ups but
prevents a thread from being joined multiple times. This is fine for
two reasons:
1) The pthread_join specification allows for undefined behavior when multiple
threads try to join a single thread.
2) There is no thread safe way to allow multiple threads to join a single
thread with the pthread interface. The second thread calling pthread_join
could be pre-empted until the thread is destroyed and its handle reused for
a different thread. Therefore multi-join is always an error.
Bug: https://code.google.com/p/android/issues/detail?id=52255
Change-Id: I8b6784d47620ffdcdbfb14524e7402e21d46c5f7
Elliott Hughes [Thu, 13 Jun 2013 00:29:21 +0000 (00:29 +0000)]
Merge "Take upstream libm changes."
Elliott Hughes [Wed, 12 Jun 2013 23:37:58 +0000 (16:37 -0700)]
Take upstream libm changes.
Mostly workarounds for GCC and Clang bugs.
Change-Id: I4ef428a42d4ac6d622659053711a8cc416925727
Elliott Hughes [Wed, 12 Jun 2013 23:23:33 +0000 (16:23 -0700)]
am
5065eef8: am
6a44d227: Merge "Take some fixed upstream copyright headers and regenerate NOTICE."
* commit '
5065eef801aa78a8a64a016fcf644a6ca91a8133':
Take some fixed upstream copyright headers and regenerate NOTICE.
Elliott Hughes [Wed, 12 Jun 2013 23:16:09 +0000 (16:16 -0700)]
am
6a44d227: Merge "Take some fixed upstream copyright headers and regenerate NOTICE."
* commit '
6a44d2271f372d0c65b05a5d3377bd00ce92824e':
Take some fixed upstream copyright headers and regenerate NOTICE.
Elliott Hughes [Wed, 12 Jun 2013 23:13:34 +0000 (23:13 +0000)]
Merge "Take some fixed upstream copyright headers and regenerate NOTICE."
Elliott Hughes [Wed, 12 Jun 2013 23:03:49 +0000 (16:03 -0700)]
am
5f4d2df2: am
55189a0f: Merge "Switch to current upstream stdio makebuf.c and setvbuf.c."
* commit '
5f4d2df2fcddfe62f9e08d1607a8c4e029f01b3d':
Switch to current upstream stdio makebuf.c and setvbuf.c.
Elliott Hughes [Wed, 12 Jun 2013 23:00:41 +0000 (16:00 -0700)]
Take some fixed upstream copyright headers and regenerate NOTICE.
Change-Id: Ifff41d69c13322dbc6f928ce7d4c65f76fe36772
Elliott Hughes [Wed, 12 Jun 2013 22:58:41 +0000 (15:58 -0700)]
am
55189a0f: Merge "Switch to current upstream stdio makebuf.c and setvbuf.c."
* commit '
55189a0fbd26cfd84939d9d3a42a1800a63bd2c5':
Switch to current upstream stdio makebuf.c and setvbuf.c.
Elliott Hughes [Wed, 12 Jun 2013 22:56:20 +0000 (22:56 +0000)]
Merge "Switch to current upstream stdio makebuf.c and setvbuf.c."
Elliott Hughes [Wed, 12 Jun 2013 22:26:46 +0000 (15:26 -0700)]
am
dc5f5f85: am
f1867d47: Merge "Revert "Add SIZE_MAX to <stdint.h> in a way that might actually work.""
* commit '
dc5f5f857c7bf218d33212044539eb73b3fab5f1':
Revert "Add SIZE_MAX to <stdint.h> in a way that might actually work."
Elliott Hughes [Wed, 12 Jun 2013 22:24:15 +0000 (15:24 -0700)]
Switch to current upstream stdio makebuf.c and setvbuf.c.
Change-Id: I4761b5e94459815520f01062eef39abf62af621f
Elliott Hughes [Wed, 12 Jun 2013 22:22:04 +0000 (15:22 -0700)]
am
f1867d47: Merge "Revert "Add SIZE_MAX to <stdint.h> in a way that might actually work.""
* commit '
f1867d47cbce4225d712a2684da67031f7350909':
Revert "Add SIZE_MAX to <stdint.h> in a way that might actually work."
Elliott Hughes [Wed, 12 Jun 2013 22:19:03 +0000 (22:19 +0000)]
Merge "Revert "Add SIZE_MAX to <stdint.h> in a way that might actually work.""
Elliott Hughes [Wed, 12 Jun 2013 22:18:47 +0000 (22:18 +0000)]
Revert "Add SIZE_MAX to <stdint.h> in a way that might actually work."
This reverts commit
d8627af159c6b1bc40296fb29297c61b30a5a8e2 which caused build breakage:
In file included from bionic/libc/include/limits.h:86:0,
from bionic/libc/include/stdint.h:33,
from bionic/libc/arch-arm/bionic/crtbegin.c:31:
bionic/libc/include/sys/limits.h:30:26: fatal error: linux/limits.h: No such file or directory
compilation terminated.
make: *** [out/target/product/generic/obj/lib/crtbegin_dynamic1.o] Error 1
Change-Id: I128095ecb99df92626e1f57e34c61e08c98a4078
Elliott Hughes [Wed, 12 Jun 2013 22:11:12 +0000 (15:11 -0700)]
am
b0a2262c: am
55c5ec64: Merge "Add SIZE_MAX to <stdint.h> in a way that might actually work."
* commit '
b0a2262c3f91085e79c3fd491379e45821254427':
Add SIZE_MAX to <stdint.h> in a way that might actually work.
Elliott Hughes [Wed, 12 Jun 2013 22:06:51 +0000 (15:06 -0700)]
am
55c5ec64: Merge "Add SIZE_MAX to <stdint.h> in a way that might actually work."
* commit '
55c5ec64bd26d92bd1882a9a4c91445de73ebfa2':
Add SIZE_MAX to <stdint.h> in a way that might actually work.
Elliott Hughes [Wed, 12 Jun 2013 22:05:09 +0000 (22:05 +0000)]
Merge "Add SIZE_MAX to <stdint.h> in a way that might actually work."
Elliott Hughes [Wed, 12 Jun 2013 22:02:34 +0000 (15:02 -0700)]
am
3da47942: am
944ea1a3: Merge "Clean up abort."
* commit '
3da47942d3fdeb6f39cf84b03c75cfeb69f91449':
Clean up abort.
Elliott Hughes [Wed, 12 Jun 2013 21:58:32 +0000 (14:58 -0700)]
am
944ea1a3: Merge "Clean up abort."
* commit '
944ea1a32018c44d6cb55c9454e670b0e152da6d':
Clean up abort.
Elliott Hughes [Wed, 12 Jun 2013 21:54:16 +0000 (14:54 -0700)]
Add SIZE_MAX to <stdint.h> in a way that might actually work.
Take two.
Change-Id: I7d08b6d14c82a171312a7f5898270b4441d5cfa2
Elliott Hughes [Wed, 12 Jun 2013 21:53:57 +0000 (21:53 +0000)]
Merge "Clean up abort."
Elliott Hughes [Wed, 12 Jun 2013 21:05:46 +0000 (14:05 -0700)]
Clean up abort.
* A dlmalloc usage error shouldn't call abort(3) because we want to
cause a SIGSEGV by writing the address dlmalloc didn't like to an
address the kernel won't like, so that debuggerd will dump the
memory around the address that upset dlmalloc.
* Switch to the simpler FreeBSD/NetBSD style of registering stdio
cleanup. Hopefully this will let us simplify more of the stdio
implementation.
* Clear the stdio cleanup handler before we abort because of a dlmalloc
corruption error. This fixes the reported bug, where we'd hang inside
dlmalloc because the stdio cleanup reentered dlmalloc.
Bug:
9301265
Change-Id: Ief31b389455d6876e5a68f0f5429567d37277dbc
Elliott Hughes [Wed, 12 Jun 2013 18:05:18 +0000 (11:05 -0700)]
am
834f83de: am
5cde15eb: Merge "<stdint.h> should expose SIZE_MAX."
* commit '
834f83de3f3363090385963eef1cd9a053a51a71':
<stdint.h> should expose SIZE_MAX.
Elliott Hughes [Wed, 12 Jun 2013 17:58:23 +0000 (10:58 -0700)]
am
5cde15eb: Merge "<stdint.h> should expose SIZE_MAX."
* commit '
5cde15eb17f4ddc0949c0cbd38a46e6c0bad7019':
<stdint.h> should expose SIZE_MAX.
Elliott Hughes [Wed, 12 Jun 2013 17:56:23 +0000 (17:56 +0000)]
Merge "<stdint.h> should expose SIZE_MAX."
Elliott Hughes [Wed, 12 Jun 2013 17:28:26 +0000 (10:28 -0700)]
<stdint.h> should expose SIZE_MAX.
Change-Id: Id27222c24955c83f29ad953933cbdc48b6f1e900
Nick Kralevich [Tue, 11 Jun 2013 23:03:32 +0000 (16:03 -0700)]
am
26cc1d68: am
b6e88020: Merge "fix unittests."
* commit '
26cc1d6838c0c4fd18abbf6ea5a38d24aea93893':
fix unittests.
Nick Kralevich [Tue, 11 Jun 2013 22:56:42 +0000 (15:56 -0700)]
am
b6e88020: Merge "fix unittests."
* commit '
b6e880200d1690c00cb843e59c6849a275dbfbb7':
fix unittests.
Nick Kralevich [Tue, 11 Jun 2013 22:52:54 +0000 (22:52 +0000)]
Merge "fix unittests."
Nick Kralevich [Tue, 11 Jun 2013 22:45:23 +0000 (15:45 -0700)]
fix unittests.
7e6ce1a3c52d8533fed92c143419fedb0c93988a fixed abort() to raise
SIGABRT rather than causing SIGSEGV. However, the unittests were
not updated.
Fix unittests.
Change-Id: I73db194127b9b9e9440358aa94273863765a736b
Ben Cheng [Tue, 11 Jun 2013 00:28:46 +0000 (17:28 -0700)]
am
77f90de7: am
fc104f89: Merge "Fix abort(3) to raise SIGABRT rather than causing SIGSEGV."
* commit '
77f90de728b9fa60b83b7f12a45c1113f3189cb2':
Fix abort(3) to raise SIGABRT rather than causing SIGSEGV.
Ben Cheng [Tue, 11 Jun 2013 00:25:31 +0000 (17:25 -0700)]
am
fc104f89: Merge "Fix abort(3) to raise SIGABRT rather than causing SIGSEGV."
* commit '
fc104f899d47916f76c91127caf9aeaf7b69d4ef':
Fix abort(3) to raise SIGABRT rather than causing SIGSEGV.
Ben Cheng [Tue, 11 Jun 2013 00:22:14 +0000 (00:22 +0000)]
Merge "Fix abort(3) to raise SIGABRT rather than causing SIGSEGV."
Ben Cheng [Tue, 11 Jun 2013 00:01:41 +0000 (17:01 -0700)]
Fix abort(3) to raise SIGABRT rather than causing SIGSEGV.
tgkill() needs the .save stack unwinding directive to get the complete
stack trace.
BUG: https://code.google.com/p/android/issues/detail?id=16672
Change-Id: Ifb447dca2147a592c48baf32769dfc175d8aea72
Brian Carlstrom [Mon, 10 Jun 2013 22:44:13 +0000 (15:44 -0700)]
am
d978d21d: am
8252b8e4: Merge "Honor p_vaddr if set"
* commit '
d978d21d195976fa3f257b8d17ec2fe18fb436a7':
Honor p_vaddr if set
Brian Carlstrom [Mon, 10 Jun 2013 22:41:19 +0000 (15:41 -0700)]
am
8252b8e4: Merge "Honor p_vaddr if set"
* commit '
8252b8e4b730b13623f31dc66396e000586d1c58':
Honor p_vaddr if set
Brian Carlstrom [Mon, 10 Jun 2013 22:39:06 +0000 (22:39 +0000)]
Merge "Honor p_vaddr if set"
Geremy Condra [Mon, 10 Jun 2013 18:45:01 +0000 (18:45 +0000)]
Merge "Add clearing of resolv uid and pid interface maps"
Elliott Hughes [Sat, 8 Jun 2013 00:52:16 +0000 (17:52 -0700)]
am
6bcf71c9: am
2fbc9dda: Merge "bionic/x86: Optimization for string routines"
* commit '
6bcf71c9ac8395038ca243160d4367759be8dd80':
bionic/x86: Optimization for string routines
Elliott Hughes [Sat, 8 Jun 2013 00:48:53 +0000 (17:48 -0700)]
am
fc6f5a08: am
157c4299: Merge "Revert "libc x86: Remove strcat.S""
* commit '
fc6f5a086557f81fce2542b7015268bff697d10c':
Revert "libc x86: Remove strcat.S"
Elliott Hughes [Sat, 8 Jun 2013 00:47:33 +0000 (17:47 -0700)]
am
2fbc9dda: Merge "bionic/x86: Optimization for string routines"
* commit '
2fbc9dda345486005569be4ec586c6aae9d51650':
bionic/x86: Optimization for string routines
Elliott Hughes [Sat, 8 Jun 2013 00:45:07 +0000 (00:45 +0000)]
Merge "bionic/x86: Optimization for string routines"
Elliott Hughes [Sat, 8 Jun 2013 00:44:20 +0000 (17:44 -0700)]
am
157c4299: Merge "Revert "libc x86: Remove strcat.S""
* commit '
157c42997b7aa31b36cca63ad03dbb5a601ce347':
Revert "libc x86: Remove strcat.S"
Elliott Hughes [Sat, 8 Jun 2013 00:42:44 +0000 (00:42 +0000)]
Merge "Revert "libc x86: Remove strcat.S""
Elliott Hughes [Sat, 8 Jun 2013 00:42:35 +0000 (00:42 +0000)]
Revert "libc x86: Remove strcat.S"
This reverts commit
4fe461b3a67148a2f557605e10a34deff9c8773a
Change-Id: Ibeb76e24f054abd7c96ad6899366c2f9bfc2a5ad
Christopher Ferris [Sat, 8 Jun 2013 00:36:50 +0000 (17:36 -0700)]
am
83245ba4: am
9647f797: Merge "Implement malloc_usable_size for debug impls."
* commit '
83245ba45facf0caff3beb18a27e6604df9094ba':
Implement malloc_usable_size for debug impls.
Christopher Ferris [Fri, 7 Jun 2013 22:16:30 +0000 (15:16 -0700)]
am
9647f797: Merge "Implement malloc_usable_size for debug impls."
* commit '
9647f797d59222cd91507d4554bf62166ba88e0a':
Implement malloc_usable_size for debug impls.
Christopher Ferris [Fri, 7 Jun 2013 22:15:33 +0000 (22:15 +0000)]
Merge "Implement malloc_usable_size for debug impls."
Christopher Ferris [Wed, 22 May 2013 00:48:01 +0000 (17:48 -0700)]
Implement malloc_usable_size for debug impls.
- Implemented chk_memalign.
- Fixed a few bugs in leak_memalign.
- Implemented {leak,fill,check,qemu}_malloc_usable_size.
- Make malloc_usable_size update at run time.
- Add malloc_test.cpp as a small set of tests for the
malloc debug routines.
- Fix the qemu routines since it's been broken since it moved to C++.
- Add support for the %u format to the out_vformat in libc_logging.cpp.
This is used by the emulator code.
Tested using the bionic-unit-tests with setprop libc.debug.malloc
set to 1, 5, and 10.
I tested as much as possible on the emulator, but tracing doesn't appear
to be working properly.
Bug:
6143477
Merge change from internal master.
(cherry-picked from commit
3d594c258045783fc9e1956ce7a4d91e302f011e)
Change-Id: I4ae00fffba82315a8c283f35893fd554460722fb
Chad Brubaker [Thu, 6 Jun 2013 22:23:33 +0000 (15:23 -0700)]
Add clearing of resolv uid and pid interface maps
Cleanup uid interface map variable names
Change-Id: I712dd83276bb23b149af4180515ef33a1bade5ea
Christopher Ferris [Wed, 22 May 2013 00:48:01 +0000 (17:48 -0700)]
Implement malloc_usable_size for debug impls.
- Implemented chk_memalign.
- Fixed a few bugs in leak_memalign.
- Implemented {leak,fill,check,qemu}_malloc_usable_size.
- Make malloc_usable_size update at run time.
- Add malloc_test.cpp as a small set of tests for the
malloc debug routines.
- Fix the qemu routines since it's been broken since it moved to C++.
- Add support for the %u format to the out_vformat in libc_logging.cpp.
This is used by the emulator code.
Tested using the bionic-unit-tests with setprop libc.debug.malloc
set to 1, 5, and 10.
I tested as much as possible on the emulator, but tracing doesn't appear
to be working properly.
Bug:
6143477
Change-Id: Ieba99b58c2228c88d80afd264501004a4dadd212
Brian Carlstrom [Fri, 11 Jan 2013 00:39:58 +0000 (16:39 -0800)]
Honor p_vaddr if set
(cherry picked from commit
88ff15c2c279d2bbe3569101b36cd2aa0931a0a9)
Change-Id: I4aabbe911d30aea8ace69e29bb6e980a4e89de90
Geremy Condra [Thu, 6 Jun 2013 20:48:44 +0000 (20:48 +0000)]
Merge "Add per UID interface support to resolv cache"
Chad Brubaker [Thu, 30 May 2013 20:37:02 +0000 (13:37 -0700)]
Add per UID interface support to resolv cache
Add methods to attach/detach UID ranges to a specific dns cache/interface.
This mirrors the already existing code for attaching specific processes to
specific interfaces but will be used to push all processes from a given
user to a specific cache/interface.
Change-Id: Ic24391e92d3ca46fcb46cc4fc53e13984dec40b3
Elliott Hughes [Thu, 6 Jun 2013 01:14:30 +0000 (18:14 -0700)]
am
e84cfbef: am
b7b4f5b8: Merge "update signal.h to be C90 compatable"
* commit '
e84cfbefd82f552490c580d35a54db4f53b6e5fb':
update signal.h to be C90 compatable
Elliott Hughes [Thu, 6 Jun 2013 01:11:05 +0000 (18:11 -0700)]
am
5a6a0a94: am
18af4503: Merge "Ensure header files using __BEGIN_DECLS include sys/cdefs.h."
* commit '
5a6a0a9445d80bf2bd847088921f6d1d99315552':
Ensure header files using __BEGIN_DECLS include sys/cdefs.h.
Elliott Hughes [Thu, 6 Jun 2013 01:09:17 +0000 (18:09 -0700)]
am
b7b4f5b8: Merge "update signal.h to be C90 compatable"
* commit '
b7b4f5b838cd41407c734af74e8211f5c7da0036':
update signal.h to be C90 compatable
Elliott Hughes [Thu, 6 Jun 2013 01:06:40 +0000 (01:06 +0000)]
Merge "update signal.h to be C90 compatable"
Elliott Hughes [Thu, 6 Jun 2013 01:06:04 +0000 (18:06 -0700)]
am
18af4503: Merge "Ensure header files using __BEGIN_DECLS include sys/cdefs.h."
* commit '
18af450393b005b4ead896d82cda750e6876fd33':
Ensure header files using __BEGIN_DECLS include sys/cdefs.h.