[v1.2] Deprecate malloc_(sg)et state.
Commit Message
On Mon, Mar 24, 2014 at 03:15:50PM -0700, Roland McGrath wrote:
> > As I want to move forward with this patch I deleted this testcase and
> > when plumbing will be available I will restore it from git history. Is
> > that ok?
>
> Nope. We're not going to reduce our test coverage for some unknown period
> waiting for work that nobody has volunteered to do. If deprecating this
> interface is a priority for you, then make the ability to test deprecated
> interfaces a priority for you or someone.
Here is new version. I simply used dlvsym to get these symbols.
* malloc/malloc.c: Make malloc_get_state and malloc_set_state
compatibility symbols.
* malloc/hooks.c: Likewise.
* malloc/tst-mallocstate.c (main): Use dynamic loader to get
malloc_get_state and malloc_set_state symbols.
* malloc/Makefile: Link tst-mallocstate with libdl.
Comments
On Mon, 28 Apr 2014, Ondrej Bilka wrote:
> + malloc_get_state = dlvsym (RTLD_NEXT, "malloc_get_state", "GLIBC_2.2.5");
> + malloc_set_state = dlvsym (RTLD_NEXT, "malloc_set_state", "GLIBC_2.2.5");
That's not correct. GLIBC_2.2.5 is what GLIBC_2.0 maps to on x86_64, but
on other architectures it maps to other versions; you need the correct
version depending on the architecture.
On Mon, Apr 28, 2014 at 02:55:18PM +0000, Joseph S. Myers wrote:
> On Mon, 28 Apr 2014, Ondrej Bilka wrote:
>
> > + malloc_get_state = dlvsym (RTLD_NEXT, "malloc_get_state", "GLIBC_2.2.5");
> > + malloc_set_state = dlvsym (RTLD_NEXT, "malloc_set_state", "GLIBC_2.2.5");
>
> That's not correct. GLIBC_2.2.5 is what GLIBC_2.0 maps to on x86_64, but
> on other architectures it maps to other versions; you need the correct
> version depending on the architecture.
>
Any macro for that?
On Mon, 28 Apr 2014, Ondrej Bilka wrote:
> On Mon, Apr 28, 2014 at 02:55:18PM +0000, Joseph S. Myers wrote:
> > On Mon, 28 Apr 2014, Ondrej Bilka wrote:
> >
> > > + malloc_get_state = dlvsym (RTLD_NEXT, "malloc_get_state", "GLIBC_2.2.5");
> > > + malloc_set_state = dlvsym (RTLD_NEXT, "malloc_set_state", "GLIBC_2.2.5");
> >
> > That's not correct. GLIBC_2.2.5 is what GLIBC_2.0 maps to on x86_64, but
> > on other architectures it maps to other versions; you need the correct
> > version depending on the architecture.
> >
> Any macro for that?
Try stringizing the expansion of VERSION_libc_GLIBC_2_0 from
abi-versions.h.
@@ -149,6 +149,7 @@ $(objpfx)memusage: memusage.sh
# The implementation uses `dlsym'
$(objpfx)libmemusage.so: $(common-objpfx)dlfcn/libdl.so
+$(objpfx)tst-mallocstate: $(common-objpfx)dlfcn/libdl.so
# Extra dependencies
$(foreach o,$(all-object-suffixes),$(objpfx)malloc$(o)): arena.c hooks.c
@@ -474,6 +474,8 @@ struct malloc_save_state
unsigned long narenas;
};
+#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_20)
+
void *
__malloc_get_state (void)
{
@@ -644,6 +646,7 @@ __malloc_set_state (void *msptr)
(void) mutex_unlock (&main_arena.mutex);
return 0;
}
+#endif
/*
* Local variables:
@@ -5181,9 +5181,16 @@ strong_alias (__libc_mallopt, __mallopt) weak_alias (__libc_mallopt, mallopt)
weak_alias (__malloc_stats, malloc_stats)
weak_alias (__malloc_usable_size, malloc_usable_size)
weak_alias (__malloc_trim, malloc_trim)
+
+#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_20)
+
weak_alias (__malloc_get_state, malloc_get_state)
weak_alias (__malloc_set_state, malloc_set_state)
+compat_symbol (libc, malloc_get_state, malloc_get_state, GLIBC_2_0);
+compat_symbol (libc, malloc_set_state, malloc_set_state, GLIBC_2_0);
+
+#endif
/* ------------------------------------------------------------
History:
@@ -16,6 +16,8 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#define _GNU_SOURCE
+#include <dlfcn.h>
#include <errno.h>
#include <stdio.h>
#include "malloc.h"
@@ -36,6 +38,12 @@ main (void)
void *save_state;
long i;
+ void *(*malloc_get_state)();
+ void *(*malloc_set_state)(void ());
+
+ malloc_get_state = dlvsym (RTLD_NEXT, "malloc_get_state", "GLIBC_2.2.5");
+ malloc_set_state = dlvsym (RTLD_NEXT, "malloc_set_state", "GLIBC_2.2.5");
+
errno = 0;
p1 = malloc (10);