Commit Graph

7056 Commits

Author SHA1 Message Date
Nick Kralevich
aefe43b182 am 95c1abec: Merge "FORTIFY_SOURCE: don\'t define s?printf macros if already defined"
* commit '95c1abecc02b2a2f40b507e669b5bc17d4412bf9':
  FORTIFY_SOURCE: don't define s?printf macros if already defined
2014-03-22 18:06:03 +00:00
Nick Kralevich
95c1abecc0 Merge "FORTIFY_SOURCE: don't define s?printf macros if already defined" 2014-03-22 17:55:49 +00:00
Chad Brubaker
b9e1688cd9 am 1d3d0360: am 081db840: Allow overlap in resolv uid => DNS iface mapping
* commit '1d3d0360eee442c7c73006e2069acdc051575edb':
  Allow overlap in resolv uid => DNS iface mapping
2014-03-21 21:09:37 +00:00
Chad Brubaker
1d3d0360ee am 081db840: Allow overlap in resolv uid => DNS iface mapping
* commit '081db840befec895fb86e709ae95832ade2d065c':
  Allow overlap in resolv uid => DNS iface mapping
2014-03-21 21:02:40 +00:00
Mark Salyzyn
5b3c6fde09 am cce6c380: Merge "libc: Thread IDs missing from logcat -v thread"
* commit 'cce6c380d7c9574f823f5e038c28c793fdb55c58':
  libc: Thread IDs missing from logcat -v thread
2014-03-21 20:16:57 +00:00
Mark Salyzyn
cce6c380d7 Merge "libc: Thread IDs missing from logcat -v thread" 2014-03-21 20:09:32 +00:00
Christopher Ferris
e1b2537738 am 998d7b03: Merge "Fix deadlock in timer_delete."
* commit '998d7b030763e8da6ff04020eedab552857587d2':
  Fix deadlock in timer_delete.
2014-03-21 17:39:10 +00:00
Christopher Ferris
998d7b0307 Merge "Fix deadlock in timer_delete." 2014-03-21 17:26:58 +00:00
Christopher Ferris
753ad778bc Fix deadlock in timer_delete.
If the callback function for a timer did a timer_delete, the function
would never return. The problem was that the timer_delete function would try
to wait until the timer thread has finished. Waiting for yourself to finish
doesn't work very well.

Bug: 13397340
Change-Id: Ica123a5bafbc8660c8a4a909e5c2dead55ca429d
2014-03-20 20:47:45 -07:00
Mark Salyzyn
8664be583a libc: Thread IDs missing from logcat -v thread
- stuff caller's thread id into the packet.

Bug: 13568206
Change-Id: If8b318ef75c7dcdddb05da8ac3038860f0fda5ec
2014-03-20 16:35:18 -07:00
Calin Juravle
00fa0390df am 2cc58603: Merge "Added a test flag to bionic run-test targets."
* commit '2cc58603d5fd68ec582984318fb3c5f8865a186f':
  Added a test flag to bionic run-test targets.
2014-03-19 18:39:01 +00:00
Calin Juravle
2cc58603d5 Merge "Added a test flag to bionic run-test targets." 2014-03-19 18:31:26 +00:00
Calin Juravle
7227066726 Added a test flag to bionic run-test targets.
It makes it much easier to pass arguments to the tests.

Change-Id: Ia91eba4868627a3cea3f8d2c26ba01af4e860b12
2014-03-19 18:23:36 +00:00
Nick Kralevich
7eb28b59c7 FORTIFY_SOURCE: don't define s?printf macros if already defined
Clang specific: Don't #define sprintf and snprintf macros if they
are already defined.

Change-Id: I30fc507d898377e1b8a57a65a147926229e0f9e2
2014-03-18 17:03:38 -07:00
Christopher Ferris
6bde44a6a2 am 849e162d: Merge "Use the float/double assert macros."
* commit '849e162d3bedc5ca61bdf15486268b253b9f4e93':
  Use the float/double assert macros.
2014-03-17 23:57:41 +00:00
Christopher Ferris
849e162d3b Merge "Use the float/double assert macros." 2014-03-17 23:51:36 +00:00
Christopher Ferris
f171b34cf0 Use the float/double assert macros.
The normal ASSERT_EQ macros don't work quite right for float/double values,
and result in false failures. Use the correct macros instead.

Bug: 13511379
Change-Id: Ic2feee7f3d3569f57b6453b8fa95222846c625cd
2014-03-17 16:40:26 -07:00
Chad Brubaker
081db840be Allow overlap in resolv uid => DNS iface mapping
When multiple rules exist covering a given uid the one added most
recently will be used.

This allows us to handle the simultaneous tuns case where a new tun is
coming online for an already running VPN.

_resolv_clear_iface_for_uid_range now also takes the iface and removes
only that matching (iface, uid range) entry.

Bug: 12134439
Change-Id: I9b9cfcfae2f38c409022a8c76ccadad7e2babd78
2014-03-15 15:29:01 -07:00
Calin Juravle
b10e18dda5 am f212bbf6: Merge "Update libm to the upstream head (2014.03.13)"
* commit 'f212bbf666b77777063a3a94a672bcae80b15253':
  Update libm to the upstream head (2014.03.13)
2014-03-14 11:03:42 +00:00
Calin Juravle
f212bbf666 Merge "Update libm to the upstream head (2014.03.13)" 2014-03-14 10:58:18 +00:00
Elliott Hughes
b689105d79 am 143df89f: Merge "Clean up reentrancy cruft."
* commit '143df89f729f39f4286f12daaf9cacf5c4501357':
  Clean up reentrancy cruft.
2014-03-14 09:13:14 +00:00
Elliott Hughes
143df89f72 Merge "Clean up reentrancy cruft." 2014-03-14 04:58:20 +00:00
Elliott Hughes
16b8b0e12c am d16100c1: Merge "Clean up <stdio.h> macros."
* commit 'd16100c1fb8a39215497243ecb12176e9688ef77':
  Clean up <stdio.h> macros.
2014-03-13 23:19:36 +00:00
Elliott Hughes
205c7887ad Clean up reentrancy cruft.
The DNS copy of reentrant.h was unused, so remove it.

The strtod implementation can use the upstream-netbsd reentrant.h and
get a little closer to what was then upstream. (It's since been replaced
by gdtoa, and we'll have to follow at some point, but for now this doesn't
make anything any worse.)

ANDROID_CHANGES is (now) only used in the DNS code, so push the -D
down.

The <locale.h> change prevents an LP32 hack from leaking into LP64.

Change-Id: Idf30b98a59d7ca8f7c6cd6d07020b512057911ef
2014-03-13 16:17:43 -07:00
Elliott Hughes
d16100c1fb Merge "Clean up <stdio.h> macros." 2014-03-13 23:13:58 +00:00
Elliott Hughes
f2cea021ab Clean up <stdio.h> macros.
Also neuter __isthreaded.

We should come back to try to hide struct FILE's internals for LP64.

Bug: 3453512
Bug: 3453550
Change-Id: I7e115329fb4579246a72fea367b9fc8cb6055d18
2014-03-13 14:54:53 -07:00
Elliott Hughes
5321a9e740 am 6ece7fc3: Merge "property: fix getting dirty serial value"
* commit '6ece7fc33a389ef9bcbe78a83a6633e4cb4e4743':
  property: fix getting dirty serial value
2014-03-13 20:21:05 +00:00
Elliott Hughes
6ece7fc33a Merge "property: fix getting dirty serial value" 2014-03-13 20:16:18 +00:00
jiaguo
879d330499 property: fix getting dirty serial value
__system_property_serial just returned serial value without
checking if it is dirty, so check and wait until serial
value is not dirty before return

Change-Id: If485b6251b5555b004912c66c7c2cb455a7fdbdc
Signed-off-by: jiaguo <jiaguo@marvell.com>
2014-03-13 12:42:52 -07:00
Calin Juravle
bd3155dc5d Update libm to the upstream head (2014.03.13)
The most relevant changes are the ones in s_erff.c which should improve
the overall speed of exececution and the maximum error in ULP.

Change-Id: I7bd867f902db418db67f02cd58578624357b1ee8
2014-03-13 16:20:36 +00:00
Elliott Hughes
8cd3638641 am 01cd7885: Merge "Upgrade to current upstream scanf implementation."
* commit '01cd78854afe5707f0d5b2b8418de07a55f8fde4':
  Upgrade to current upstream scanf implementation.
2014-03-13 00:55:56 +00:00
Elliott Hughes
01cd78854a Merge "Upgrade to current upstream scanf implementation." 2014-03-13 00:49:23 +00:00
Elliott Hughes
603332fc4c Upgrade to current upstream scanf implementation.
Also add a basic test.

Change-Id: Icc0e68a5716b9579244f6eb8bac1ab5a24eda85a
2014-03-12 17:10:41 -07:00
Elliott Hughes
f3d83fa955 am 0e79338d: Merge "Ensure we always have symbols for atof, strtof, strtold."
* commit '0e79338d12d1ca780efcd0720af92b0a70e55da8':
  Ensure we always have symbols for atof, strtof, strtold.
2014-03-12 23:36:54 +00:00
Elliott Hughes
0e79338d12 Merge "Ensure we always have symbols for atof, strtof, strtold." 2014-03-12 23:32:37 +00:00
Elliott Hughes
5a8173860d Ensure we always have symbols for atof, strtof, strtold.
We'll need a better implementation of strtold for LP64, but all our
long double functions are currently broken for LP64 anyway so this
isn't a regression.

Change-Id: I2bdebac11245d31521d5fa09a16331c03dc4339c
2014-03-12 16:12:57 -07:00
Mark Salyzyn
5b6759035b am 56e1eebd: Merge "logd: default user space logger"
* commit '56e1eebd39be4830f309603b38e4b1118c544fb3':
  logd: default user space logger
2014-03-12 21:07:06 +00:00
Mark Salyzyn
56e1eebd39 Merge "logd: default user space logger" 2014-03-12 21:02:46 +00:00
Elliott Hughes
6a250387c7 am eef2928f: Merge "Include what you use."
* commit 'eef2928f94ac6ff5659c6177785b47e6fcdd03a2':
  Include what you use.
2014-03-12 20:56:22 +00:00
Elliott Hughes
b51e4216e8 am 2282e16d: Merge "Use [u]int32_t instead of __[u]int32_t in sys/types.h"
* commit '2282e16d76c6691968bd62a4c4bb3ecefabc98ca':
  Use [u]int32_t instead of __[u]int32_t in sys/types.h
2014-03-12 20:52:56 +00:00
Elliott Hughes
eef2928f94 Merge "Include what you use." 2014-03-12 20:51:48 +00:00
Elliott Hughes
40488560c1 Include what you use.
Don't rely on transitive includes. (Even though that works fine in AOSP.)

Change-Id: Ifc06575e4aea383cfff24d6c5c14fc0a7aabdf2b
2014-03-12 13:50:38 -07:00
Elliott Hughes
2282e16d76 Merge "Use [u]int32_t instead of __[u]int32_t in sys/types.h" 2014-03-12 20:48:39 +00:00
Pavel Chupin
2725ca95b2 Use [u]int32_t instead of __[u]int32_t in sys/types.h
Avoid this error in -ffreestanding mode:
sys/types.h:45:1: error: unknown type name '__uint32_t'

Change-Id: I826b36873862d1d70b47401f31f4369a77666b8e
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2014-03-13 00:23:43 +04:00
Mark Salyzyn
c1005aaf8e logd: default user space logger
Change-Id: Id205b01537940051c72d79def28a3c1a8b169a21
2014-03-12 13:17:38 -07:00
Elliott Hughes
2e1f5f09d9 am ef43a6fb: Merge "Clean up our termios implementation."
* commit 'ef43a6fb0e0c5fb1debd8db83a5b57749e8331fa':
  Clean up our termios implementation.
2014-03-12 02:43:08 +00:00
Elliott Hughes
ef43a6fb0e Merge "Clean up our termios implementation." 2014-03-12 02:25:22 +00:00
Elliott Hughes
8d4b5849f2 Clean up our termios implementation.
It's safe to fix our constant definitions because we know we never
had symbols before, so can't be passing the bad old constants to the new
functions, or the correct new constants to the old inlines.

Change-Id: I858fc680df39bdd3ba471e867833bdfa71f6224e
2014-03-11 19:13:25 -07:00
Elliott Hughes
32378d584f am 76b4f1a3: Merge "More stdio cleanup."
* commit '76b4f1a33caef09891114bf37562968ab627059a':
  More stdio cleanup.
2014-03-11 23:23:02 +00:00
Elliott Hughes
10675a794d am 55f9710a: Merge "Reimplement clock(3) and switch to OpenBSD time(3)."
* commit '55f9710ac4843b4a5d2c8b03ade3d2bddd1fdf46':
  Reimplement clock(3) and switch to OpenBSD time(3).
2014-03-11 23:23:01 +00:00