OSDN Git Service
Elliott Hughes [Thu, 13 Sep 2012 22:33:56 +0000 (15:33 -0700)]
am
d4623e56: am
b338ea30: Merge "Upgrade to tzdata2012f."
* commit '
d4623e56fb61b38e2c436f214a1282252908b93b':
Upgrade to tzdata2012f.
Elliott Hughes [Thu, 13 Sep 2012 22:30:33 +0000 (15:30 -0700)]
am
b338ea30: Merge "Upgrade to tzdata2012f."
* commit '
b338ea30b299099a2b26a4e8a6b2ccd7bfac631a':
Upgrade to tzdata2012f.
Elliott Hughes [Thu, 13 Sep 2012 22:15:08 +0000 (15:15 -0700)]
Merge "Upgrade to tzdata2012f."
Elliott Hughes [Thu, 13 Sep 2012 21:54:51 +0000 (14:54 -0700)]
Upgrade to tzdata2012f.
This release reflects the following change circulated on the tz
mailing list:
* australasia (Pacific/Fiji): Fiji DST is October 21 through January
20 this year. (Thanks to Steffen Thorsen.)
Change-Id: Ie21ea791ff5191264967aff685cbfa5c73f1fa5c
Elliott Hughes [Thu, 13 Sep 2012 18:11:54 +0000 (11:11 -0700)]
am
8db4b91b: am
d2236e2c: Merge "Fix Mac build."
* commit '
8db4b91bd2a069b2afb377f7e5190f625c3002cf':
Fix Mac build.
Elliott Hughes [Thu, 13 Sep 2012 18:09:49 +0000 (11:09 -0700)]
am
d2236e2c: Merge "Fix Mac build."
* commit '
d2236e2c0717818e150215b4eee7af58cd3540d8':
Fix Mac build.
Elliott Hughes [Thu, 13 Sep 2012 18:02:22 +0000 (11:02 -0700)]
Merge "Fix Mac build."
Elliott Hughes [Thu, 13 Sep 2012 18:01:46 +0000 (11:01 -0700)]
Fix Mac build.
Change-Id: Id625806fab0f2f7f90f9508c5fce649afe970414
Elliott Hughes [Thu, 13 Sep 2012 16:52:38 +0000 (09:52 -0700)]
am
b2550dd4: am
4a9b7c69: Merge "Add libdl into libc_malloc_debug_leak build"
* commit '
b2550dd4c85845974bf61d3e4071b2b957fbcf09':
Add libdl into libc_malloc_debug_leak build
Elliott Hughes [Thu, 13 Sep 2012 16:52:37 +0000 (09:52 -0700)]
am
58d15966: am
af4d630e: Merge "Added new test for dlopen which is failing for MIPS."
* commit '
58d15966c8f95998f82a90a5b24e23d56ba6254f':
Added new test for dlopen which is failing for MIPS.
Elliott Hughes [Thu, 13 Sep 2012 16:47:52 +0000 (09:47 -0700)]
am
4a9b7c69: Merge "Add libdl into libc_malloc_debug_leak build"
* commit '
4a9b7c694a8312160d3cd953a8227c23a1624868':
Add libdl into libc_malloc_debug_leak build
Elliott Hughes [Thu, 13 Sep 2012 16:47:51 +0000 (09:47 -0700)]
am
af4d630e: Merge "Added new test for dlopen which is failing for MIPS."
* commit '
af4d630e4d87dca38cc2026b992bb50c49911db9':
Added new test for dlopen which is failing for MIPS.
Elliott Hughes [Thu, 13 Sep 2012 16:46:30 +0000 (09:46 -0700)]
Merge "Add libdl into libc_malloc_debug_leak build"
Elliott Hughes [Thu, 13 Sep 2012 16:42:49 +0000 (09:42 -0700)]
Merge "Added new test for dlopen which is failing for MIPS."
Pavel Chupin [Mon, 10 Sep 2012 15:35:25 +0000 (19:35 +0400)]
Add libdl into libc_malloc_debug_leak build
Otherwise libc_malloc_debug_leak.so is failed to load runtime in x86
case
Change-Id: I8207ce06d1ec17b233f4e4fcfdd2b161673b4fa8
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
jeffhao [Thu, 13 Sep 2012 00:25:30 +0000 (17:25 -0700)]
Added new test for dlopen which is failing for MIPS.
Change-Id: I2240faefb387a11647f49b1a15699907a40f98c1
Elliott Hughes [Wed, 12 Sep 2012 23:08:14 +0000 (16:08 -0700)]
resolved conflicts for merge of
47bda0c2 to jb-mr1-dev
Change-Id: Ia1969c79111c006bde709920254a515646c20aa7
Elliott Hughes [Wed, 12 Sep 2012 22:59:29 +0000 (15:59 -0700)]
am
7593fa8e: Merge "Update the kernel headers to match external/kernel-headers."
* commit '
7593fa8eb7d8c3950a069e5edd244fb68872ec17':
Update the kernel headers to match external/kernel-headers.
Elliott Hughes [Wed, 12 Sep 2012 22:56:10 +0000 (15:56 -0700)]
Merge "Update the kernel headers to match external/kernel-headers."
Elliott Hughes [Wed, 12 Sep 2012 02:03:02 +0000 (19:03 -0700)]
Update the kernel headers to match external/kernel-headers.
Note that the Linux kernel handed over responsibility for most of the
socket constants to glibc some time ago. Someone had updated our
external/kernel-headers file but not regenerated the bionic headers,
so this change copies the missing stuff from the old bionic <linux/socket.h>
into <sys/socket.h>. This is what glibc does.
I've hacked a few of the other files to #include <sys/socket.h> for
backward compatibility, but even so this requires numerous other
changes to switch people over from direct inclusion of <linux/...> headers.
Change-Id: I0e4af64e631d3cef911a31d90f2f806e058278a0
Elliott Hughes [Wed, 12 Sep 2012 18:07:12 +0000 (11:07 -0700)]
am
90ae787b: am
666d06fe: Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
* commit '
90ae787b30890dc7d0f5d95b67ea5578d53bd61e':
Backwards and forwards compatibility for an upcoming <sys/socket.h> change.
Elliott Hughes [Wed, 12 Sep 2012 18:03:24 +0000 (11:03 -0700)]
am
666d06fe: Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
* commit '
666d06fee9e1d2e1401a4b42d94d01e8f38ad1a5':
Backwards and forwards compatibility for an upcoming <sys/socket.h> change.
Elliott Hughes [Wed, 12 Sep 2012 17:51:48 +0000 (10:51 -0700)]
Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
Elliott Hughes [Wed, 12 Sep 2012 17:51:05 +0000 (10:51 -0700)]
Backwards and forwards compatibility for an upcoming <sys/socket.h> change.
Change-Id: Iba58077a1f057a968eb2283ebba259975925ff4c
Elliott Hughes [Tue, 11 Sep 2012 23:47:25 +0000 (16:47 -0700)]
am
7f798147: am
cc8668f2: Merge "[MIPS] Check error status from pipe system call"
* commit '
7f798147980798718ac893229ae20dba9e3a26c7':
[MIPS] Check error status from pipe system call
Elliott Hughes [Tue, 11 Sep 2012 23:43:39 +0000 (16:43 -0700)]
am
cc8668f2: Merge "[MIPS] Check error status from pipe system call"
* commit '
cc8668f261ae5d0ed38961f357e33c026502ed0d':
[MIPS] Check error status from pipe system call
Elliott Hughes [Tue, 11 Sep 2012 23:38:43 +0000 (16:38 -0700)]
Merge "[MIPS] Check error status from pipe system call"
KwongYuan Wong [Tue, 27 Mar 2012 18:13:13 +0000 (11:13 -0700)]
[MIPS] Check error status from pipe system call
Change-Id: Iaaea0e826c2678aa7f6fad9d46b16302a4d3b876
Elliott Hughes [Mon, 10 Sep 2012 19:04:28 +0000 (12:04 -0700)]
am
e8b4d67a: am
59726bed: Merge "Rename crtstart variables as crtbegin, to match reality."
* commit '
e8b4d67a37e27ffc34086562ad13dcd9316a8249':
Rename crtstart variables as crtbegin, to match reality.
Elliott Hughes [Mon, 10 Sep 2012 19:01:04 +0000 (12:01 -0700)]
am
59726bed: Merge "Rename crtstart variables as crtbegin, to match reality."
* commit '
59726beda5bec7e3db9d0c403a0ef11d0a7f182f':
Rename crtstart variables as crtbegin, to match reality.
Elliott Hughes [Mon, 10 Sep 2012 18:52:11 +0000 (11:52 -0700)]
Merge "Rename crtstart variables as crtbegin, to match reality."
Elliott Hughes [Mon, 10 Sep 2012 18:16:12 +0000 (11:16 -0700)]
Rename crtstart variables as crtbegin, to match reality.
No functional change, but it's confusing that the variable
names don't match the filenames.
Change-Id: I7109f917797be2f056e69fddb92e4a7306281813
Ying Wang [Mon, 10 Sep 2012 17:07:17 +0000 (10:07 -0700)]
am
f9920563: am
67546bf2: Merge "Generate header dependency makefiles for the crt*.o"
* commit '
f9920563dabc21a5c741ef630e6ca8fe66fbbe5b':
Generate header dependency makefiles for the crt*.o
Ying Wang [Mon, 10 Sep 2012 17:05:14 +0000 (10:05 -0700)]
am
67546bf2: Merge "Generate header dependency makefiles for the crt*.o"
* commit '
67546bf209b2c5480aa4811b2bb3c42e7862af62':
Generate header dependency makefiles for the crt*.o
Ying Wang [Mon, 10 Sep 2012 16:48:45 +0000 (09:48 -0700)]
Merge "Generate header dependency makefiles for the crt*.o"
Elliott Hughes [Sat, 8 Sep 2012 03:35:01 +0000 (20:35 -0700)]
am
56ba6336: am
f1d57e16: Merge "Add more pthreads tests."
* commit '
56ba6336d9c07cdfb5af2324aaa52da0c8d00ef2':
Add more pthreads tests.
Elliott Hughes [Sat, 8 Sep 2012 01:38:41 +0000 (18:38 -0700)]
am
f1d57e16: Merge "Add more pthreads tests."
* commit '
f1d57e16686153b69a27c1eb9e339c77232c0edd':
Add more pthreads tests.
Elliott Hughes [Sat, 8 Sep 2012 01:30:17 +0000 (18:30 -0700)]
Merge "Add more pthreads tests."
Ying Wang [Sat, 8 Sep 2012 00:06:56 +0000 (17:06 -0700)]
Generate header dependency makefiles for the crt*.o
Bug:
7127743
Change-Id: I606e5f7cd2b513f855a1fefd2b001abd365fc854
Elliott Hughes [Fri, 7 Sep 2012 23:47:54 +0000 (16:47 -0700)]
Add more pthreads tests.
Someone reported a bug if pthread_detach is called while a pthread_join is
already in progress, but I'm unable to reproduce it. Keep the tests I wrote,
though.
Change-Id: I3d71450bbbb5345f2cb213dc56310ec020d528cc
Elliott Hughes [Fri, 7 Sep 2012 18:09:23 +0000 (11:09 -0700)]
am
7c7a7f8e: am
d10309c3: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
* commit '
7c7a7f8e526518f37eae3ce2a785344316f263e0':
Rename __dso_handle_so.c to __dso_handle_so.h
Elliott Hughes [Fri, 7 Sep 2012 18:09:23 +0000 (11:09 -0700)]
am
72fcdbe9: am
691ef3c8: Merge "Add mlockall and munlockall for Google TV."
* commit '
72fcdbe9025b0405251c17eb391f326e03bf92ef':
Add mlockall and munlockall for Google TV.
Elliott Hughes [Fri, 7 Sep 2012 18:07:13 +0000 (11:07 -0700)]
am
d10309c3: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
* commit '
d10309c36b93176a473baeeddef6f3fba8bf0678':
Rename __dso_handle_so.c to __dso_handle_so.h
Elliott Hughes [Fri, 7 Sep 2012 18:07:10 +0000 (11:07 -0700)]
am
691ef3c8: Merge "Add mlockall and munlockall for Google TV."
* commit '
691ef3c80b4af278aa90d6e005ba42de1e52c140':
Add mlockall and munlockall for Google TV.
Elliott Hughes [Fri, 7 Sep 2012 17:59:20 +0000 (10:59 -0700)]
Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
Elliott Hughes [Fri, 7 Sep 2012 17:51:49 +0000 (10:51 -0700)]
Merge "Add mlockall and munlockall for Google TV."
Andrew Hsieh [Wed, 5 Sep 2012 11:00:43 +0000 (19:00 +0800)]
Rename __dso_handle_so.c to __dso_handle_so.h
Also chang libc/arch-arm/bionic/crtbegin_so.c to include it
as a header.
Change-Id: Ib91b0b8caf5c8b936425aa8a4fc1a229b2b27929
Ian Rogers [Thu, 6 Sep 2012 18:50:22 +0000 (11:50 -0700)]
am
77039d34: am
e8f81547: Merge "Fix build warning of initialization but no use."
* commit '
77039d34449e369b9425a36eaed38d41b9d20884':
Fix build warning of initialization but no use.
Ian Rogers [Thu, 6 Sep 2012 18:45:54 +0000 (11:45 -0700)]
am
e8f81547: Merge "Fix build warning of initialization but no use."
* commit '
e8f815473ba463b875cea757bc0a52fc32f10748':
Fix build warning of initialization but no use.
Ian Rogers [Thu, 6 Sep 2012 18:41:52 +0000 (11:41 -0700)]
Merge "Fix build warning of initialization but no use."
Elliott Hughes [Thu, 6 Sep 2012 18:24:45 +0000 (11:24 -0700)]
Add mlockall and munlockall for Google TV.
Change-Id: I10e961d701e74aab07211ec7975f61167e387853
Elliott Hughes [Thu, 6 Sep 2012 17:44:13 +0000 (10:44 -0700)]
am
41ff8b98: am
6e3b0f2d: Merge "Don\'t corrupt the thread list in static executables."
* commit '
41ff8b98044de19d6ea5228452c2d555c4224da7':
Don't corrupt the thread list in static executables.
Elliott Hughes [Thu, 6 Sep 2012 17:40:43 +0000 (10:40 -0700)]
am
6e3b0f2d: Merge "Don\'t corrupt the thread list in static executables."
* commit '
6e3b0f2d2e89a8f3bbfc5d26dcdc13233c1111ba':
Don't corrupt the thread list in static executables.
Elliott Hughes [Thu, 6 Sep 2012 17:31:52 +0000 (10:31 -0700)]
Merge "Don't corrupt the thread list in static executables."
Ian Rogers [Thu, 6 Sep 2012 16:55:36 +0000 (09:55 -0700)]
Fix build warning of initialization but no use.
first_run is only used with LOCK_AT_FORK, however, care needs to be
taken with the #if to avoid compiler warnings when LOCK_AT_FORK isn't
being used.
Change-Id: I6bcfac2ab8732c91607f4a1bcd7c0019f29c2eec
Ajay Dudani [Wed, 29 Aug 2012 17:26:04 +0000 (10:26 -0700)]
Update msm_ion.h ioctls so they dont conflict with ion.h
Change-Id: Ib6ffcc147e39b3f9f2eb9a8ed403b74d99bc755f
Signed-off-by: Iliyan Malchev <malchev@google.com>
Ajay Dudani [Wed, 29 Aug 2012 16:55:51 +0000 (09:55 -0700)]
Revert "msm_ion: switch to using legacy_ion.h"
This reverts commit
66edcd9dad6a10622015f6350ea9bc11a358801a.
Ajay Dudani [Wed, 29 Aug 2012 16:55:42 +0000 (09:55 -0700)]
Revert "add legacy_ion.h"
This reverts commit
5f1d206de357684365a98c53b505491e18b6694a.
Elliott Hughes [Thu, 6 Sep 2012 00:47:37 +0000 (17:47 -0700)]
Don't corrupt the thread list in static executables.
Several previous changes conspired to make a mess of the thread list
in static binaries. This was most obvious when trying to call
pthread_key_delete(3) on the main thread.
Bug: http://code.google.com/p/android/issues/detail?id=36893
Change-Id: I2a2f553114d8fb40533c481252b410c10656da2e
Elliott Hughes [Wed, 5 Sep 2012 21:55:45 +0000 (14:55 -0700)]
am
008f4df5: am
ff4608ae: Merge "Add missing dependencies."
* commit '
008f4df5ba52ff502651da957ad8dbe149ff2ed6':
Add missing dependencies.
Elliott Hughes [Wed, 5 Sep 2012 21:51:30 +0000 (14:51 -0700)]
am
ff4608ae: Merge "Add missing dependencies."
* commit '
ff4608ae0cb78caa05b83e109fc2633682958089':
Add missing dependencies.
Elliott Hughes [Wed, 5 Sep 2012 21:46:14 +0000 (14:46 -0700)]
Merge "Add missing dependencies."
Elliott Hughes [Wed, 5 Sep 2012 21:27:17 +0000 (14:27 -0700)]
Add missing dependencies.
Change-Id: I53c1cfb59ac7a89952a8d6b906b2b9e16a66624f
Elliott Hughes [Wed, 5 Sep 2012 17:32:25 +0000 (10:32 -0700)]
am
2fc3e1ef: am
b2c5bd54: Merge "ARM: warn about atexit() calls from legacy shared libraries"
* commit '
2fc3e1efda003d9eb110c3fc08bb32f29c6e8a4b':
ARM: warn about atexit() calls from legacy shared libraries
Elliott Hughes [Wed, 5 Sep 2012 17:29:23 +0000 (10:29 -0700)]
am
b2c5bd54: Merge "ARM: warn about atexit() calls from legacy shared libraries"
* commit '
b2c5bd543dcbbc1b2cbf7afd8b124256ce2c128e':
ARM: warn about atexit() calls from legacy shared libraries
Elliott Hughes [Wed, 5 Sep 2012 17:18:43 +0000 (10:18 -0700)]
Merge "ARM: warn about atexit() calls from legacy shared libraries"
Elliott Hughes [Wed, 5 Sep 2012 17:01:48 +0000 (10:01 -0700)]
am
a76f2eca: am
26f2e4a1: Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
* commit '
a76f2ecaa203bd8b5cc2ca157f06c0d2de66a52f':
ARM: make CRT_LEGACY_WORKAROUND work as intended
Elliott Hughes [Wed, 5 Sep 2012 16:57:15 +0000 (09:57 -0700)]
am
26f2e4a1: Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
* commit '
26f2e4a1639a959513c4ff5981b4eb52757e8012':
ARM: make CRT_LEGACY_WORKAROUND work as intended
Elliott Hughes [Wed, 5 Sep 2012 16:43:35 +0000 (09:43 -0700)]
Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
Ian Rogers [Wed, 5 Sep 2012 14:52:12 +0000 (07:52 -0700)]
am
7310a1c4: am
82978cae: Merge "Avoid malloc lock while calling pthread_atfork."
* commit '
7310a1c4326bc875aeea2ce091a4b6558d183b2d':
Avoid malloc lock while calling pthread_atfork.
Ian Rogers [Wed, 5 Sep 2012 14:48:14 +0000 (07:48 -0700)]
am
82978cae: Merge "Avoid malloc lock while calling pthread_atfork."
* commit '
82978cae4eec238a9d631d2b61b8985daa02516e':
Avoid malloc lock while calling pthread_atfork.
Ian Rogers [Wed, 5 Sep 2012 14:41:31 +0000 (07:41 -0700)]
Merge "Avoid malloc lock while calling pthread_atfork."
Elliott Hughes [Wed, 5 Sep 2012 01:13:50 +0000 (18:13 -0700)]
am
b9f0a6eb: am
be19a367: Merge "termios: add tcdrain"
* commit '
b9f0a6eb75aa8f1eec95fb5718d84cef1d0f61b8':
termios: add tcdrain
Elliott Hughes [Wed, 5 Sep 2012 01:10:07 +0000 (18:10 -0700)]
am
be19a367: Merge "termios: add tcdrain"
* commit '
be19a3671709879ccc0156b94f7ef7540027dc37':
termios: add tcdrain
Elliott Hughes [Wed, 5 Sep 2012 00:52:39 +0000 (17:52 -0700)]
Merge "termios: add tcdrain"
Elliott Hughes [Tue, 4 Sep 2012 23:47:44 +0000 (16:47 -0700)]
am
bc374078: am
5ff23471: Merge "Add getsid system call to bionic"
* commit '
bc3740787ac4108c2e0e247bc7ca2ea66329c5ab':
Add getsid system call to bionic
Elliott Hughes [Tue, 4 Sep 2012 23:44:54 +0000 (16:44 -0700)]
am
5ff23471: Merge "Add getsid system call to bionic"
* commit '
5ff23471303a1b99ddc1e1751662aa45f34b5e21':
Add getsid system call to bionic
Elliott Hughes [Tue, 4 Sep 2012 23:36:26 +0000 (16:36 -0700)]
Merge "Add getsid system call to bionic"
Elliott Hughes [Tue, 4 Sep 2012 23:00:20 +0000 (16:00 -0700)]
am
507bcabb: am
e03ab936: Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
* commit '
507bcabb3565d20541242ad61f987bc1a6483ba1':
Add missing MALLOC_FAILURE_ACTION calls to dlmalloc.
Elliott Hughes [Tue, 4 Sep 2012 22:56:12 +0000 (15:56 -0700)]
am
e03ab936: Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
* commit '
e03ab936996a1a46d461cdad463d7f5bca10b051':
Add missing MALLOC_FAILURE_ACTION calls to dlmalloc.
Elliott Hughes [Tue, 4 Sep 2012 22:51:55 +0000 (15:51 -0700)]
Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
Elliott Hughes [Tue, 4 Sep 2012 22:42:23 +0000 (15:42 -0700)]
Add missing MALLOC_FAILURE_ACTION calls to dlmalloc.
Without these, sometimes malloc(3) returns NULL without setting errno.
Change-Id: I4708c3f675bf2c878ddcaf012fde7848b255826b
Elliott Hughes [Tue, 4 Sep 2012 20:49:41 +0000 (13:49 -0700)]
am
b438c54d: am
1db615b4: Merge "bionic: Fix TINY_ANDROID build"
* commit '
b438c54d02b722a93a72ff6e834ab78053ca3add':
bionic: Fix TINY_ANDROID build
Elliott Hughes [Tue, 4 Sep 2012 20:46:46 +0000 (13:46 -0700)]
am
1db615b4: Merge "bionic: Fix TINY_ANDROID build"
* commit '
1db615b4ae469c9f33dc1d88b24924ca8efc10ef':
bionic: Fix TINY_ANDROID build
Elliott Hughes [Tue, 4 Sep 2012 20:42:57 +0000 (13:42 -0700)]
Merge "bionic: Fix TINY_ANDROID build"
Benoit Goby [Sat, 1 Sep 2012 02:52:15 +0000 (19:52 -0700)]
bionic: Fix TINY_ANDROID build
(cherry-pick of
545d5dbbcb0dc9e44323c4f2e687a3aace75a483.)
Change-Id: Ifc91e84ffed5a3a287accabd7f08b02752688db6
Vitaly Wool [Tue, 4 Sep 2012 12:11:28 +0000 (14:11 +0200)]
termios: add tcdrain
Change-Id: I05c0007f7bcc6ef5295c32f86fafbf1ad31e07fa
Irina Tirdea [Wed, 29 Aug 2012 08:48:35 +0000 (11:48 +0300)]
Add getsid system call to bionic
Add getsid() system call to bionic for
all architectures. This is needed for various tools
(e.g. perf).
Adding the getsid system call was done in 3 steps:
() add getsid system call (function name and syscall
number) to libc/SYSCALLS.TXT
() generate all necessary headers by calling
libc/tools/gensyscalls.py. This patch is adding
the generated files since the build system
does not call gensyscalls.py.
() add the system call signature to libc/include/unistd.h
Change-Id: Id69a257e13ec02e1a44085a6b217a3f19ab025b1
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Kirill Artamonov [Fri, 31 Aug 2012 16:19:16 +0000 (09:19 -0700)]
Avoid malloc lock while calling pthread_atfork.
Expecting the memory in a forked child process to be sane wrt threading
is a bad idea. An example of a problem is when the parent process has
the malloc lock and a child process is forked. The malloc lock in the
child will appear locked by a thread that doesn't exist.
This change aims to make bionic more compatible with glibc by reseting
the malloc lock in the child forked process, as well as holding it
during the fork. This is a feature in dlmalloc 2.8.6 called
LOCK_AT_FORK. In general this feature isn't necessary as a forked
process will then exec. Some bad applications rely on being able to use
features like malloc before the exec and having multiple threads running
in the parent program. This isn't a problem with glibc and this patch
makes it not a problem for bionic.
Unfortunately for use in bionic, LOCK_AT_FORK has an issue as internally
it uses pthread_atfork that in bionic uses malloc. This leads to the
LOCK_AT_FORK initialization deadlocking with pthread_atfork's call to
malloc due to the malloc lock. This change moves the pthread_atfork logic
in LOCK_AT_FORK to be called without the malloc lock held.
Change-Id: Id68175a564a6abb936ee4488b44d9479f7311f69
Ian Rogers [Fri, 31 Aug 2012 15:58:33 +0000 (08:58 -0700)]
am
6abab301: am
6fe901ef: Merge "Upgrade to dlmalloc 2.8.6."
* commit '
6abab301db84af7c98a4873fbf49997078aa19cc':
Upgrade to dlmalloc 2.8.6.
Ian Rogers [Fri, 31 Aug 2012 15:55:41 +0000 (08:55 -0700)]
am
6fe901ef: Merge "Upgrade to dlmalloc 2.8.6."
* commit '
6fe901ef38898d9cb6007720940e915f7180fc11':
Upgrade to dlmalloc 2.8.6.
Ian Rogers [Fri, 31 Aug 2012 15:42:40 +0000 (08:42 -0700)]
Merge "Upgrade to dlmalloc 2.8.6."
Ian Rogers [Wed, 29 Aug 2012 21:04:53 +0000 (14:04 -0700)]
Upgrade to dlmalloc 2.8.6.
This fixes a bug and enables the use of MORECORE_CONTIGUOUS.
Change-Id: Ia7c5d32bdc46e99b3ecb92ee94d1f702c4385d5d
Elliott Hughes [Wed, 29 Aug 2012 21:06:58 +0000 (14:06 -0700)]
am
dde94f4c: am
8b4e8a93: Merge "Improve the dynamic linker diagnostics."
* commit '
dde94f4c1664c6908d9a2944aff84e8667557d02':
Improve the dynamic linker diagnostics.
Nick Kralevich [Wed, 29 Aug 2012 21:06:57 +0000 (14:06 -0700)]
am
92133ca4: am
17d9be8a: Merge "disable _FORTIFY_SOURCE under clang"
* commit '
92133ca427b9c697d5afb59b74cb2cff50840c8e':
disable _FORTIFY_SOURCE under clang
Elliott Hughes [Wed, 29 Aug 2012 21:04:25 +0000 (14:04 -0700)]
am
8b4e8a93: Merge "Improve the dynamic linker diagnostics."
* commit '
8b4e8a937be2e7ac94e52d596813095ef16c9ec8':
Improve the dynamic linker diagnostics.
Nick Kralevich [Wed, 29 Aug 2012 21:04:24 +0000 (14:04 -0700)]
am
17d9be8a: Merge "disable _FORTIFY_SOURCE under clang"
* commit '
17d9be8ad73170275f25ffe8795a0d04b3e2cd8b':
disable _FORTIFY_SOURCE under clang
Elliott Hughes [Wed, 29 Aug 2012 20:56:40 +0000 (13:56 -0700)]
Merge "Improve the dynamic linker diagnostics."
Nick Kralevich [Wed, 29 Aug 2012 20:54:49 +0000 (13:54 -0700)]
Merge "disable _FORTIFY_SOURCE under clang"
Elliott Hughes [Wed, 29 Aug 2012 20:19:58 +0000 (13:19 -0700)]
am
e5b85f45: am
0d7177c0: Merge "Clean up warnings in the malloc_debug_* files."
* commit '
e5b85f45f9b23b4adbea5a9bb0bc29099880ed69':
Clean up warnings in the malloc_debug_* files.