[or-cvs] r14058: Partial backport of r14010: When using a nonstandard malloc, (tor/branches/tor-0_2_0-patches)

[nickm at seul.org]

Author: nickm
Date: 2008-03-16 22:48:17 -0400 (Sun, 16 Mar 2008)
New Revision: 14058

Modified:
   tor/branches/tor-0_2_0-patches/
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/configure.in
Log:
 r18848 at catbus:  nickm | 2008-03-16 22:26:44 -0400
 Partial backport of r14010: When using a nonstandard malloc, do not check the regular libc for malloc_good_size, malloc_usable_size, or mallinfo.



Property changes on: tor/branches/tor-0_2_0-patches
___________________________________________________________________
 svk:merge ticket from /tor/020 [r18848] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-03-17 02:47:49 UTC (rev 14057)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-03-17 02:48:17 UTC (rev 14058)
@@ -25,6 +25,8 @@
       Fixes bug 625.  Bugfix on 0.2.0.x.
     - Logging functions now check that the passed severity is sane.
     - Use proper log levels in the testsuite call of get_interface_address6().
+    - When using a nonstandard malloc, do not use the platform values for
+      HAVE_MALLOC_GOOD_SIZE or HAVE_MALLOC_USABLE_SIZE.
 
 
 Changes in version 0.2.0.21-rc - 2008-03-02

Modified: tor/branches/tor-0_2_0-patches/configure.in
===================================================================
--- tor/branches/tor-0_2_0-patches/configure.in	2008-03-17 02:47:49 UTC (rev 14057)
+++ tor/branches/tor-0_2_0-patches/configure.in	2008-03-17 02:48:17 UTC (rev 14058)
@@ -183,8 +183,19 @@
 dnl Check for functions before libevent, since libevent-1.2 apparently
 dnl exports strlcpy without defining it in a header.
 
-AC_CHECK_FUNCS(gettimeofday ftime socketpair uname inet_aton strptime getrlimit strlcat strlcpy strtoull ftello getaddrinfo localtime_r gmtime_r memmem strtok_r inet_pton inet_ntop mallinfo malloc_good_size malloc_usable_size)
+AC_CHECK_FUNCS(gettimeofday ftime socketpair uname inet_aton strptime getrlimit strlcat strlcpy strtoull ftello getaddrinfo localtime_r gmtime_r memmem strtok_r inet_pton inet_ntop)
 
+using_custom_malloc=no
+if test x$enable_openbsd_malloc = xyes ; then
+   using_custom_malloc=yes
+fi
+if test x$tcmalloc = xyes ; then
+   using_custom_malloc=yes
+fi                                                                             
+if test $using_custom_malloc = no ; then
+   AC_CHECK_FUNCS(mallinfo malloc_good_size malloc_usable_size)
+fi
+
 if test "$enable_threads" = "yes"; then
   AC_CHECK_HEADERS(pthread.h)
   AC_CHECK_FUNCS(pthread_create)