The Android Automerger
a39362de4f
merge in master-release history after reset to master
2014-03-05 08:04:45 -08:00
Elliott Hughes
636bcf0f69
am 614f7626
: am bef50164
: Merge "Remove dead NULL checks from pthread code."
...
* commit '614f7626fc5dcf5c0cff2c49799f2659524d3ad3':
Remove dead NULL checks from pthread code.
2014-03-04 19:16:08 +00:00
Elliott Hughes
614f7626fc
am bef50164
: Merge "Remove dead NULL checks from pthread code."
...
* commit 'bef5016491eed41521f514d5c5528e2274689948':
Remove dead NULL checks from pthread code.
2014-03-04 19:10:24 +00:00
Elliott Hughes
bef5016491
Merge "Remove dead NULL checks from pthread code."
2014-03-04 19:04:19 +00:00
Elliott Hughes
39b644a0e2
Remove dead NULL checks from pthread code.
...
GCC is removing these checks anyway because it knows the arguments
must be non-null, so leaving this code around is just confusing.
We know from experience that people were shipping code with locking
bugs because they weren't checking for error returns. Failing hard
like glibc does seems the better choice. (And it's what the checked
in code was already doing; this patch doesn't change that. It just
makes it more obvious that that's what's going on.)
Change-Id: I167c6d7c0a296822baf0cb9b43b97821eba7ab35
2014-03-04 10:55:39 -08:00
Elliott Hughes
43b9169ffb
am 17ef5653
: am a0bf9bde
: Merge "Implement POSIX pthread_mutex_timedlock."
...
* commit '17ef5653dd8aa92176e90964c95a02ccf4809695':
Implement POSIX pthread_mutex_timedlock.
2014-03-04 18:50:35 +00:00
Elliott Hughes
17ef5653dd
am a0bf9bde
: Merge "Implement POSIX pthread_mutex_timedlock."
...
* commit 'a0bf9bdea24164db96ec1d5dfa2cd327942671b6':
Implement POSIX pthread_mutex_timedlock.
2014-03-04 18:45:18 +00:00
Elliott Hughes
a0bf9bdea2
Merge "Implement POSIX pthread_mutex_timedlock."
2014-03-04 18:39:08 +00:00
Elliott Hughes
29309d30ed
am a934a901
: am e365f284
: am f27cc051
: am 806f3bd7
: Upgrade to tzdata2013i.
...
* commit 'a934a9019efeb2630bfac92ad186c3db4a525735':
Upgrade to tzdata2013i.
2014-03-04 18:35:33 +00:00
Elliott Hughes
a934a9019e
am e365f284
: am f27cc051
: am 806f3bd7
: Upgrade to tzdata2013i.
...
* commit 'e365f2840f20bb6b7fdd044c9515018b2d4cd309':
Upgrade to tzdata2013i.
2014-03-04 18:29:22 +00:00
Elliott Hughes
0e714a5b41
Implement POSIX pthread_mutex_timedlock.
...
This replaces the non-standard pthread_mutex_lock_timeout_np, which we have
to keep around on LP32 for binary compatibility.
Change-Id: I098dc7cd38369f0c1bec1fac35687fbd27392e00
2014-03-04 10:27:58 -08:00
Elliott Hughes
e365f2840f
am f27cc051
: am 806f3bd7
: Upgrade to tzdata2013i.
...
* commit 'f27cc051ec36809a64f8cc6a17fd39eca3516d1d':
Upgrade to tzdata2013i.
2014-03-04 18:26:11 +00:00
Elliott Hughes
f27cc051ec
am 806f3bd7
: Upgrade to tzdata2013i.
...
* commit '806f3bd7aaec5b7444b1b218b69b3952386cb92f':
Upgrade to tzdata2013i.
2014-03-04 18:22:45 +00:00
Calin Juravle
631d309268
am 0c8d3b35
: am 8e541b12
: Merge "Moved nameser.h and namser_compat.h to public include dir"
...
* commit '0c8d3b35c6eb07384b0176ab3d1d462bad996e06':
Moved nameser.h and namser_compat.h to public include dir
2014-03-04 18:04:44 +00:00
Calin Juravle
0c8d3b35c6
am 8e541b12
: Merge "Moved nameser.h and namser_compat.h to public include dir"
...
* commit '8e541b12237f597c186820b9e18b059b620bef54':
Moved nameser.h and namser_compat.h to public include dir
2014-03-04 17:58:52 +00:00
Calin Juravle
3f6229cf32
am cc0948d8
: am 4a46a689
: Merge "Moved private dns header to their own dir."
...
* commit 'cc0948d86a50a1b2441552cd0f357ca040855928':
Moved private dns header to their own dir.
2014-03-04 17:55:59 +00:00
Calin Juravle
ff4dfd26a8
am 8121d264
: am 9f2d1bcd
: Merge "Renamed the misleading libc/netbsd directory to libc/dns."
...
* commit '8121d264bc58c6d97edae23981d2646b05fcdf83':
Renamed the misleading libc/netbsd directory to libc/dns.
2014-03-04 17:55:58 +00:00
Calin Juravle
8e541b1223
Merge "Moved nameser.h and namser_compat.h to public include dir"
2014-03-04 17:53:19 +00:00
Calin Juravle
cc0948d86a
am 4a46a689
: Merge "Moved private dns header to their own dir."
...
* commit '4a46a68942d180e28c3e87f08359351245b220b7':
Moved private dns header to their own dir.
2014-03-04 17:19:13 +00:00
Calin Juravle
8121d264bc
am 9f2d1bcd
: Merge "Renamed the misleading libc/netbsd directory to libc/dns."
...
* commit '9f2d1bcd176cb4a6f2bc0cae3f3c786444383476':
Renamed the misleading libc/netbsd directory to libc/dns.
2014-03-04 17:19:13 +00:00
Narayan Kamath
b863c9574e
am 3f985d31
: am caaae7f2
: Merge "Implement pthread_condattr_{get,set}clock."
...
* commit '3f985d31b6fc3fd61f76b71aa05c3c69d853452a':
Implement pthread_condattr_{get,set}clock.
2014-03-04 16:05:46 +00:00
Calin Juravle
569fb9887d
Moved nameser.h and namser_compat.h to public include dir
...
This is part of the upstream sync (Net/Open/Free BSDs expose the
nameser.h in their public headers).
Change-Id: Ib063d4e50586748cc70201a8296cd90d2e48bbcf
2014-03-04 15:07:07 +00:00
Calin Juravle
4a46a68942
Merge "Moved private dns header to their own dir."
2014-03-04 14:25:51 +00:00
Calin Juravle
9f2d1bcd17
Merge "Renamed the misleading libc/netbsd directory to libc/dns."
2014-03-04 14:25:30 +00:00
The Android Automerger
c6ff1951af
merge in master-release history after reset to master
2014-03-04 05:49:18 -08:00
Narayan Kamath
3f985d31b6
am caaae7f2
: Merge "Implement pthread_condattr_{get,set}clock."
...
* commit 'caaae7f2e9a89df1514ba06d13e9eb5a0f04e94c':
Implement pthread_condattr_{get,set}clock.
2014-03-04 13:41:52 +00:00
Narayan Kamath
caaae7f2e9
Merge "Implement pthread_condattr_{get,set}clock."
2014-03-04 13:37:07 +00:00
Narayan Kamath
51e6cb33e3
Implement pthread_condattr_{get,set}clock.
...
We only support CLOCK_REALTIME and CLOCK_MONOTONIC for now,
so we us a single bit from pthread_cond_t->value to denote
the clock type. Note that this reduces the width of the counter
to 30 bits, but this should be large enough for all practical
purposes.
bug: 13232338
Change-Id: I857e7da64b3ecbb23eeac7c9f3fbd460f60231bd
2014-03-04 11:17:13 +00:00
Elliott Hughes
010d090241
am fea778b3
: am 2c7c79e6
: Merge "Switch to upstream alarm(3)."
...
* commit 'fea778b308be2dd0d75bd757129c3ef62ace3a61':
Switch to upstream alarm(3).
2014-03-04 01:11:01 +00:00
Elliott Hughes
fea778b308
am 2c7c79e6
: Merge "Switch to upstream alarm(3)."
...
* commit '2c7c79e6e5e730553281b6d42e734ee2c532a660':
Switch to upstream alarm(3).
2014-03-04 01:04:22 +00:00
Elliott Hughes
2c7c79e6e5
Merge "Switch to upstream alarm(3)."
2014-03-04 00:58:53 +00:00
Elliott Hughes
aedb00d04e
Switch to upstream alarm(3).
...
The only way the setitimer call can fail is if the unsigned number of seconds is
too large to fit in the kernel's signed number of seconds. If you schedule a
68-year alarm, glibc will fail by returning 0 and BSD will fail by returning -1.
Change-Id: Ic3721b01428f5402d99f31fd7f2ba2cc58805607
2014-03-04 00:58:31 +00:00
Mark Salyzyn
4fc7758e6f
am 337815ff
: am f33df6a6
: Merge "libc: Make calls to new user-space logger (revisit)"
...
* commit '337815ffa2d4c899bf3c2b9798cb90665b497cea':
libc: Make calls to new user-space logger (revisit)
2014-03-03 21:18:08 +00:00
Mark Salyzyn
337815ffa2
am f33df6a6
: Merge "libc: Make calls to new user-space logger (revisit)"
...
* commit 'f33df6a662934cd72a79195773d2745ae8f937d4':
libc: Make calls to new user-space logger (revisit)
2014-03-03 21:12:03 +00:00
Mark Salyzyn
f33df6a662
Merge "libc: Make calls to new user-space logger (revisit)"
2014-03-03 21:05:19 +00:00
Elliott Hughes
1eb606df0a
am 46215a8b
: am dfeb42ed
: Merge "If the kernel doesn\'t have MADV_MERGEABLE, stop asking for it."
...
* commit '46215a8b53e149de3fc28600c2b2eebe66d36716':
If the kernel doesn't have MADV_MERGEABLE, stop asking for it.
2014-03-03 20:55:35 +00:00
Elliott Hughes
29264f4eda
am f6ce4490
: am 15e71cd7
: Merge "Remove deprecated and unused constants from <sys/klog.h>."
...
* commit 'f6ce44900e5b94c18a026ac4ce4d5fd2c51663d4':
Remove deprecated and unused constants from <sys/klog.h>.
2014-03-03 20:55:35 +00:00
Calin Juravle
cecc036970
Moved private dns header to their own dir.
...
Bug: 13219633
Change-Id: I3435ef7564b9ad3c7b54188a0809440993b36c9e
2014-03-03 20:40:41 +00:00
Elliott Hughes
46215a8b53
am dfeb42ed
: Merge "If the kernel doesn\'t have MADV_MERGEABLE, stop asking for it."
...
* commit 'dfeb42ede69a0dbea5735aed5fddaee3f810801d':
If the kernel doesn't have MADV_MERGEABLE, stop asking for it.
2014-03-03 20:31:39 +00:00
Mark Salyzyn
f38292862b
libc: Make calls to new user-space logger (revisit)
...
* TARGET_USES_LOGD is true or false, yes is not valid
* was supposed to be in the libc_bionic definition
Change-Id: I7f15d0fe61205641f7310ba9762df885e6c959d0
2014-03-03 12:30:24 -08:00
Elliott Hughes
dfeb42ede6
Merge "If the kernel doesn't have MADV_MERGEABLE, stop asking for it."
2014-03-03 20:26:12 +00:00
Elliott Hughes
f6ce44900e
am 15e71cd7
: Merge "Remove deprecated and unused constants from <sys/klog.h>."
...
* commit '15e71cd760c35a4eab09b850904581ebbdc9bee3':
Remove deprecated and unused constants from <sys/klog.h>.
2014-03-03 20:21:25 +00:00
Elliott Hughes
9bd9b7dd20
If the kernel doesn't have MADV_MERGEABLE, stop asking for it.
...
Note that a dynamically-linked binary will still probably see two attempts ---
one by the dynamic linker (which will set its copy of the flag so it won't try
again) and then one by the executable itself (which gets a new uninitialized
copy of the flag).
Change-Id: Id6b7e47780f0f24d2ca0384a75373f4824fa8f12
2014-03-03 11:54:21 -08:00
Elliott Hughes
15e71cd760
Merge "Remove deprecated and unused constants from <sys/klog.h>."
2014-03-03 19:01:50 +00:00
Elliott Hughes
e4ab19c67d
Remove deprecated and unused constants from <sys/klog.h>.
...
Change-Id: I23d54b5eaf918859480f927534a3f9e3af602311
2014-03-03 10:57:28 -08:00
The Android Automerger
eb25e220bc
merge in master-release history after reset to master
2014-03-01 05:49:47 -08:00
Elliott Hughes
019cff957e
am 3c42b739
: am ddad384d
: Merge "Fix build."
...
* commit '3c42b73985817da87c32c2d97a58e5e4f21d48a6':
Fix build.
2014-03-01 02:12:59 +00:00
Elliott Hughes
3c42b73985
am ddad384d
: Merge "Fix build."
...
* commit 'ddad384dbf802bf258e19a8d18f5d9e9fba8f97b':
Fix build.
2014-03-01 02:05:38 +00:00
Elliott Hughes
ddad384dbf
Merge "Fix build."
2014-03-01 01:59:55 +00:00
Elliott Hughes
a8b1eb3fcf
Fix build.
...
Change-Id: I71cde79263d5f5a8382865b8151f65c5c05ea17b
2014-02-28 17:59:29 -08:00