lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Remove __after_morecore_hook

Browse Source 
Remove __after_morecore_hook from the API and finalize the symbol so
that it can no longer be used in new applications.  Old applications
using __after_morecore_hook will find that their hook is no longer
called.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Siddhesh Poyarekar
2021-07-22 18:37:54 +05:30
parent 0075c4f39d
commit 57b07bede1
3 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
malloc/hooks.c
View File

@ -17,6 +17,11 @@
License along with the GNU C Library; see the file COPYING.LIB. If License along with the GNU C Library; see the file COPYING.LIB. If
not, see <https://www.gnu.org/licenses/>. */ not, see <https://www.gnu.org/licenses/>. */
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_34)
void weak_variable (*__after_morecore_hook) (void) = NULL;
compat_symbol (libc, __after_morecore_hook, __after_morecore_hook, GLIBC_2_0);
#endif
/* Hooks for debugging versions. The initial hooks just call the /* Hooks for debugging versions. The initial hooks just call the
initialization routine, then do the normal work. */ initialization routine, then do the normal work. */

22
malloc/malloc.c
View File

@ -2041,8 +2041,6 @@ void *weak_variable (*__realloc_hook)
void *weak_variable (*__memalign_hook) void *weak_variable (*__memalign_hook)
(size_t __alignment, size_t __size, const void *) (size_t __alignment, size_t __size, const void *)
= memalign_hook_ini; = memalign_hook_ini;
void weak_variable (*__after_morecore_hook) (void) = NULL;
/* This function is called from the arena shutdown hook, to free the /* This function is called from the arena shutdown hook, to free the
thread cache (if it exists). */ thread cache (if it exists). */
static void tcache_thread_shutdown (void); static void tcache_thread_shutdown (void);
@ -2668,14 +2666,7 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av)
LIBC_PROBE (memory_sbrk_more, 2, brk, size); LIBC_PROBE (memory_sbrk_more, 2, brk, size);
} }
if (brk != (char *) (MORECORE_FAILURE)) if (brk == (char *) (MORECORE_FAILURE))
{
/* Call the `morecore' hook if necessary. */
void (*hook) (void) = atomic_forced_read (__after_morecore_hook);
if (__builtin_expect (hook != NULL, 0))
(*hook)();
}
else
{ {
/* /*
If have mmap, try using it as a backup when MORECORE fails or If have mmap, try using it as a backup when MORECORE fails or
@ -2814,13 +2805,6 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av)
correction = 0; correction = 0;
snd_brk = (char *) (MORECORE (0)); snd_brk = (char *) (MORECORE (0));
} }
else
{
/* Call the `morecore' hook if necessary. */
void (*hook) (void) = atomic_forced_read (__after_morecore_hook);
if (__builtin_expect (hook != NULL, 0))
(*hook)();
}
} }
/* handle non-contiguous cases */ /* handle non-contiguous cases */
@ -2979,10 +2963,6 @@ systrim (size_t pad, mstate av)
*/ */
MORECORE (-extra); MORECORE (-extra);
/* Call the `morecore' hook if necessary. */
void (*hook) (void) = atomic_forced_read (__after_morecore_hook);
if (__builtin_expect (hook != NULL, 0))
(*hook)();
new_brk = (char *) (MORECORE (0)); new_brk = (char *) (MORECORE (0));
LIBC_PROBE (memory_sbrk_less, 2, new_brk, extra); LIBC_PROBE (memory_sbrk_less, 2, new_brk, extra);

3
malloc/malloc.h
View File

@ -179,9 +179,6 @@ extern void *(*__MALLOC_HOOK_VOLATILE __memalign_hook)(size_t __alignment,
size_t __size, size_t __size,
const void *) const void *)
__MALLOC_DEPRECATED; __MALLOC_DEPRECATED;
extern void (*__MALLOC_HOOK_VOLATILE __after_morecore_hook) (void)
__MALLOC_DEPRECATED;
__END_DECLS __END_DECLS
#endif /* malloc.h */ #endif /* malloc.h */