diff options
| author | Adhemerval Zanella Netto <adhemerval.zanella@linaro.org> | 2022-12-27 18:11:42 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2023-03-27 13:57:55 -0300 |
| commit | 88677348b4de73874ca7d5a47451f42880f65f07 (patch) | |
| tree | 9ebe22b88c2487331521737dfdf089f9e3e2439f /libio | |
| parent | e4d336f1ace7c7ca535f7f85485373752bc76ed5 (diff) | |
| download | glibc-88677348b4de73874ca7d5a47451f42880f65f07.tar glibc-88677348b4de73874ca7d5a47451f42880f65f07.tar.gz glibc-88677348b4de73874ca7d5a47451f42880f65f07.tar.bz2 glibc-88677348b4de73874ca7d5a47451f42880f65f07.zip | |
Move libc_freeres_ptrs and libc_subfreeres to hidden/weak functions
They are both used by __libc_freeres to free all library malloc
allocated resources to help tooling like mtrace or valgrind with
memory leak tracking.
The current scheme uses assembly markers and linker script entries
to consolidate the free routine function pointers in the RELRO segment
and to be freed buffers in BSS.
This patch changes it to use specific free functions for
libc_freeres_ptrs buffers and call the function pointer array directly
with call_function_static_weak.
It allows the removal of both the internal macros and the linker
script sections.
Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/fcloseall.c | 1 | ||||
| -rw-r--r-- | libio/genops.c | 8 | ||||
| -rw-r--r-- | libio/libioP.h | 1 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libio/fcloseall.c b/libio/fcloseall.c index e1e06d497b..415da65c76 100644 --- a/libio/fcloseall.c +++ b/libio/fcloseall.c @@ -26,6 +26,7 @@ #include "libioP.h" #include <stdio.h> +#include <set-freeres.h> int __fcloseall (void) diff --git a/libio/genops.c b/libio/genops.c index 7c45052aa2..7131312704 100644 --- a/libio/genops.c +++ b/libio/genops.c @@ -765,8 +765,8 @@ weak_alias (_IO_flush_all_linebuffered, _flushlbf) actual buffer because this will happen anyway once the program terminated. If we do want to look for memory leaks we have to free the buffers. Whether something is freed is determined by the - function sin the libc_freeres section. Those are called as part of - the atexit routine, just like _IO_cleanup. The problem is we do + function called by __libc_freeres (those are not called as part of + the atexit routine, different from _IO_cleanup). The problem is we do not know whether the freeres code is called first or _IO_cleanup. if the former is the case, we set the DEALLOC_BUFFER variable to true and _IO_unbuffer_all will take care of the rest. If @@ -844,8 +844,8 @@ _IO_unbuffer_all (void) #endif } - -libc_freeres_fn (buffer_free) +void +__libio_freemem (void) { dealloc_buffers = true; diff --git a/libio/libioP.h b/libio/libioP.h index 38507388fd..80941b763f 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -491,7 +491,6 @@ libc_hidden_proto (_IO_wdo_write) extern int _IO_flush_all_lockp (int); extern int _IO_flush_all (void); libc_hidden_proto (_IO_flush_all) -extern int _IO_cleanup (void); extern void _IO_flush_all_linebuffered (void); libc_hidden_proto (_IO_flush_all_linebuffered) extern int _IO_new_fgetpos (FILE *, __fpos_t *); |