[Valgrind-developers] valgrind: r12498: Android's libc includes advertise a "malloc_usable_size", but the

[<sv...@va...>]

sewardj	2012-04-11 09:46:53 +0100 (Wed, 11 Apr 2012)

  New Revision: 12498

  Log:
    Android's libc includes advertise a "malloc_usable_size", but the
    libc.so contains no such symbol; rather a "dlmalloc_usable_size"
    (great, huh :-) So intercept that too, on Android.

  Modified files:
    trunk/coregrind/m_replacemalloc/vg_replace_malloc.c


  Modified: trunk/coregrind/m_replacemalloc/vg_replace_malloc.c (+3 -0)
===================================================================
--- trunk/coregrind/m_replacemalloc/vg_replace_malloc.c	2012-04-11 08:12:32 +01:00 (rev 12497)
+++ trunk/coregrind/m_replacemalloc/vg_replace_malloc.c	2012-04-11 09:46:53 +01:00 (rev 12498)
@@ -863,6 +863,9 @@
 #if defined(VGO_linux)
  MALLOC_USABLE_SIZE(VG_Z_LIBC_SONAME, malloc_usable_size);
  MALLOC_USABLE_SIZE(VG_Z_LIBC_SONAME, malloc_size);
+# if defined(VGPV_arm_linux_android)
+  MALLOC_USABLE_SIZE(VG_Z_LIBC_SONAME, dlmalloc_usable_size);
+# endif
 
 #elif defined(VGO_darwin)
  //MALLOC_USABLE_SIZE(VG_Z_LIBC_SONAME, malloc_usable_size);