Elliott Hughes
991ee7d895
Merge "Simplify pthread_create, using more public API."
2013-02-13 00:39:41 +00:00
Elliott Hughes
6d33918207
Simplify pthread_create, using more public API.
...
Change-Id: I08e65ba88ed01436223e4e528631c9e41ec0e7f4
2013-02-12 16:36:04 -08:00
Elliott Hughes
f4e258c22e
am 4912782c
: Merge "Really set errno if __pthread_clone fails."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '4912782c6af7169686acc9553fb0bb33251b0d0d':
Really set errno if __pthread_clone fails.
2013-02-12 16:23:25 -08:00
Elliott Hughes
78715fca0b
am 558a8b1d
: Merge "Revert "Revert "More pthreads cleanup."""
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '558a8b1d3b31300941af78232f2f7f4cb4e933b9':
Revert "Revert "More pthreads cleanup.""
2013-02-12 16:23:24 -08:00
Elliott Hughes
4912782c6a
Merge "Really set errno if __pthread_clone fails."
2013-02-13 00:12:42 +00:00
Elliott Hughes
9f878c2fca
Really set errno if __pthread_clone fails.
...
If r0 == 0, we're the child. If r0 > 0, we're the parent.
Otherwise set errno.
The __bionic_clone code I copy & pasted was wrong. This patch
fixes both.
Bug: 3461078
Change-Id: Ibb7d6cc7e54e666841f2f0dc59a141a0b31982e4
2013-02-12 16:07:06 -08:00
Elliott Hughes
558a8b1d3b
Merge "Revert "Revert "More pthreads cleanup."""
2013-02-13 00:05:24 +00:00
Elliott Hughes
3e898476c7
Revert "Revert "More pthreads cleanup.""
...
This reverts commit 6f94de3ca4
(Doesn't try to increase the number of TLS slots; that leads to
an inability to boot. Adds more tests.)
Change-Id: Ia7d25ba3995219ed6e686463dbba80c95cc831ca
2013-02-12 15:27:18 -08:00
Dima Zavin
ac480b422a
am 3fa67465
: Merge "add factory property file definition"
...
# By Andrew Boie
# Via Andrew Boie (1) and Gerrit Code Review (1)
* commit '3fa67465365baf87f751bea09847e32f01005788':
add factory property file definition
2013-02-12 11:12:49 -08:00
Dima Zavin
3fa6746536
Merge "add factory property file definition"
2013-02-12 18:33:26 +00:00
The Android Automerger
1bb43b02ad
merge in jb-mr2-release history after reset to master
2013-02-12 07:10:11 -08:00
Elliott Hughes
191f880bdf
am bfa199ab
: am fcaf4e9f
: Merge "Revert "More pthreads cleanup.""
...
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'bfa199ab4019a7de9b95cd3db86c4d7176438803':
Revert "More pthreads cleanup."
2013-02-11 22:20:39 -08:00
Elliott Hughes
bfa199ab40
am fcaf4e9f
: Merge "Revert "More pthreads cleanup.""
...
# Via Gerrit Code Review
* commit 'fcaf4e9f9b735e053469c7ecbf63584e10fd67a7':
Revert "More pthreads cleanup."
2013-02-11 22:16:56 -08:00
Elliott Hughes
fcaf4e9f9b
Merge "Revert "More pthreads cleanup.""
2013-02-12 06:07:32 +00:00
Elliott Hughes
6f94de3ca4
Revert "More pthreads cleanup."
...
This reverts commit 2a1bb4e646
Change-Id: Ia443d0748015c8e9fc3121e40e68258616767b51
2013-02-12 06:06:22 +00:00
Elliott Hughes
23731e841a
am a2a9817f
: am 85f491f9
: Merge "More pthreads cleanup."
...
# Via Android Git Automerger (1) and others
* commit 'a2a9817f4c08d1f56d90f02ed13f531e8093f8e8':
More pthreads cleanup.
2013-02-11 18:39:32 -08:00
Elliott Hughes
a2a9817f4c
am 85f491f9
: Merge "More pthreads cleanup."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '85f491f96da3b79d0d7cc5368bc1f649e1a82340':
More pthreads cleanup.
2013-02-11 18:35:56 -08:00
Elliott Hughes
85f491f96d
Merge "More pthreads cleanup."
2013-02-12 02:33:08 +00:00
Elliott Hughes
13478d856a
am 605cc293
: am 83bf28e6
: Merge "Fix MIPS build."
...
# Via Android Git Automerger (1) and others
* commit '605cc29358c9a6d575d097fd4b78a483c9dbf89e':
Fix MIPS build.
2013-02-11 18:23:17 -08:00
Elliott Hughes
605cc29358
am 83bf28e6
: Merge "Fix MIPS build."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '83bf28e6a38dbf28707147b50d29e81f4b555046':
Fix MIPS build.
2013-02-11 18:19:34 -08:00
Elliott Hughes
0f6882f43d
am 8e2b28cb
: am c56be54a
: Merge "Use ENTRY/END in ARM __get_sp."
...
# Via Android Git Automerger (1) and others
* commit '8e2b28cb6c16d8a5671ccb333965bb56b2990d7a':
Use ENTRY/END in ARM __get_sp.
2013-02-11 18:15:13 -08:00
Elliott Hughes
a2b8b833d2
am c440d244
: am cae7b2cf
: Merge "Fix __pthread_clone on ARM to set errno on failure."
...
# Via Android Git Automerger (1) and others
* commit 'c440d2442361b78196d2935469ecf78d5c3470e5':
Fix __pthread_clone on ARM to set errno on failure.
2013-02-11 18:15:07 -08:00
Elliott Hughes
b940711587
am 03798dd2
: am 1fea0f25
: Merge "Clean up ARM assembler files to use ENTRY/END."
...
# Via Android Git Automerger (1) and others
* commit '03798dd23cd3d1dc1ee4c4b0472c75369aa1e10f':
Clean up ARM assembler files to use ENTRY/END.
2013-02-11 18:15:04 -08:00
Elliott Hughes
83bf28e6a3
Merge "Fix MIPS build."
2013-02-12 02:08:05 +00:00
Elliott Hughes
ba342c11ad
Fix MIPS build.
...
Change-Id: I4863f21f3c2fd597ea36cb7096fc72db808643a3
2013-02-11 18:06:23 -08:00
Elliott Hughes
5bb4f54b4d
am 6b73d13f
: am 2d3e7233
: Merge "Revert "Revert "Pull the pthread_key_t functions out of pthread.c."""
...
# Via Android Git Automerger (1) and others
* commit '6b73d13fa414afeecba6718bf724e8ac922bac39':
Revert "Revert "Pull the pthread_key_t functions out of pthread.c.""
2013-02-11 17:34:32 -08:00
Elliott Hughes
1b21249d5a
am e4b08318
: am 8397cdba
: Merge "Revert "Pull the pthread_key_t functions out of pthread.c.""
...
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'e4b08318c13fac774b233a5459427563d2983f79':
Revert "Pull the pthread_key_t functions out of pthread.c."
2013-02-11 17:34:30 -08:00
Elliott Hughes
376bce0097
am 024246ec
: am 09e89c3c
: Merge "Pull the pthread_key_t functions out of pthread.c."
...
# Via Android Git Automerger (1) and others
* commit '024246ec274e30bb4a24468d8319620534e13b34':
Pull the pthread_key_t functions out of pthread.c.
2013-02-11 17:34:29 -08:00
Elliott Hughes
8e2b28cb6c
am c56be54a
: Merge "Use ENTRY/END in ARM __get_sp."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'c56be54a18eff7e1c35c9a19cfc8b84a80780b73':
Use ENTRY/END in ARM __get_sp.
2013-02-11 17:27:40 -08:00
Elliott Hughes
bdff26df27
Use ENTRY/END in custom x86 assembler too.
...
Change-Id: Ic2e482e5daff29c65d3b2ab0b2111c996bbc6226
2013-02-11 17:08:16 -08:00
Elliott Hughes
c56be54a18
Merge "Use ENTRY/END in ARM __get_sp."
2013-02-12 00:59:43 +00:00
Elliott Hughes
d7a3a403c1
Use ENTRY/END in ARM __get_sp.
...
Change-Id: If2f159b266f5fa4ad9d188a17d4cd318b605e446
2013-02-11 16:58:34 -08:00
Elliott Hughes
c440d24423
am cae7b2cf
: Merge "Fix __pthread_clone on ARM to set errno on failure."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'cae7b2cfb509e7d5d10a8085b1ec319daaef768f':
Fix __pthread_clone on ARM to set errno on failure.
2013-02-11 16:55:16 -08:00
Elliott Hughes
cae7b2cfb5
Merge "Fix __pthread_clone on ARM to set errno on failure."
2013-02-12 00:49:28 +00:00
Elliott Hughes
5e3fc43dde
Fix __pthread_clone on ARM to set errno on failure.
...
MIPS and x86 appear to have been correct already.
(Also fix unit tests that ASSERT_EQ with errno so that the
arguments are in the retarded junit order.)
Bug: 3461078
Change-Id: I2418ea98927b56e15b4ba9cfec97f5e7094c6291
2013-02-11 16:39:10 -08:00
Elliott Hughes
03798dd23c
am 1fea0f25
: Merge "Clean up ARM assembler files to use ENTRY/END."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '1fea0f258a45d918fe5ae8e9769f45c0348bd095':
Clean up ARM assembler files to use ENTRY/END.
2013-02-11 16:17:48 -08:00
Elliott Hughes
1fea0f258a
Merge "Clean up ARM assembler files to use ENTRY/END."
2013-02-12 00:05:27 +00:00
Elliott Hughes
f94fd3ccc6
Clean up ARM assembler files to use ENTRY/END.
...
We also don't need legacy syscall support (non-"swi 0").
Change-Id: Id1012e8ca18bf13f3f4e42200f39ba0e2e632cbf
2013-02-11 15:36:59 -08:00
Elliott Hughes
2a1bb4e646
More pthreads cleanup.
...
POSIX says pthread_create returns EAGAIN, not ENOMEM.
Also pull pthread_attr_t functions into their own file.
Also pull pthread_setname_np into its own file.
Also remove unnecessary #includes from pthread_key.cpp.
Also account for those pthread keys used internally by bionic,
so they don't count against the number of keys available to user
code. (They do with glibc, but glibc's limit is the much more
generous 1024.)
Also factor out the common errno-restoring idiom to reduce gotos.
Bug: 6702535
Change-Id: I555e66efffcf2c1b5a2873569e91489156efca42
2013-02-11 14:56:39 -08:00
Elliott Hughes
6b73d13fa4
am 2d3e7233
: Merge "Revert "Revert "Pull the pthread_key_t functions out of pthread.c."""
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '2d3e72336e76180fb00822386da4f14203d117ce':
Revert "Revert "Pull the pthread_key_t functions out of pthread.c.""
2013-02-11 12:38:30 -08:00
Elliott Hughes
2d3e72336e
Merge "Revert "Revert "Pull the pthread_key_t functions out of pthread.c."""
2013-02-11 20:21:59 +00:00
Elliott Hughes
e4b08318c1
am 8397cdba
: Merge "Revert "Pull the pthread_key_t functions out of pthread.c.""
...
# Via Gerrit Code Review
* commit '8397cdba9424febeaed4068829a5b0174ee1138c':
Revert "Pull the pthread_key_t functions out of pthread.c."
2013-02-11 12:21:50 -08:00
Elliott Hughes
44b53ad681
Revert "Revert "Pull the pthread_key_t functions out of pthread.c.""
...
This reverts commit 6260553d48
(Removing the accidental libm/Android.mk change.)
Change-Id: I6cddd9857c31facc05636e8221505b3d2344cb75
2013-02-11 12:20:33 -08:00
Elliott Hughes
8397cdba94
Merge "Revert "Pull the pthread_key_t functions out of pthread.c.""
2013-02-11 20:18:28 +00:00
Elliott Hughes
6260553d48
Revert "Pull the pthread_key_t functions out of pthread.c."
...
This reverts commit ad59322ae4
somehow my unfinished libm/Android.mk change got into here.
Change-Id: I46be626c5269d60fb1ced9862f2ebaa380b4e0af
2013-02-11 20:18:16 +00:00
Elliott Hughes
024246ec27
am 09e89c3c
: Merge "Pull the pthread_key_t functions out of pthread.c."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '09e89c3ced51d846e13c2508fbb6812bb61475cd':
Pull the pthread_key_t functions out of pthread.c.
2013-02-11 12:05:45 -08:00
Elliott Hughes
09e89c3ced
Merge "Pull the pthread_key_t functions out of pthread.c."
2013-02-11 20:02:29 +00:00
Elliott Hughes
ad59322ae4
Pull the pthread_key_t functions out of pthread.c.
...
This was originally motivated by noticing that we were setting the
wrong bits for the well-known tls entries. That was a harmless bug
because none of the well-known tls entries has a destructor, but
it's best not to leave land mines lying around.
Also add some missing POSIX constants, a new test, and fix
pthread_key_create's return value when we hit the limit.
Change-Id: Ife26ea2f4b40865308e8410ec803b20bcc3e0ed1
2013-02-11 12:00:48 -08:00
The Android Automerger
c087b7a80f
merge in jb-mr2-release history after reset to master
2013-02-11 07:10:25 -08:00
Elliott Hughes
63358ae068
am 8f509e8b
: am 9a9bb243
: Merge "Switch to using AT_RANDOM for the stack guards."
...
# Via Android Git Automerger (1) and others
* commit '8f509e8be11876023d4bcb3e827ca096f22fc0c5':
Switch to using AT_RANDOM for the stack guards.
2013-02-08 11:43:09 -08:00