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 /time | |
parent | e4d336f1ace7c7ca535f7f85485373752bc76ed5 (diff) | |
download | glibc-88677348b4de73874ca7d5a47451f42880f65f07.tar.gz glibc-88677348b4de73874ca7d5a47451f42880f65f07.tar.xz 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 'time')
-rw-r--r-- | time/tzfile.c | 5 | ||||
-rw-r--r-- | time/tzset.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/time/tzfile.c b/time/tzfile.c index 55508c154b..9e27eba4a7 100644 --- a/time/tzfile.c +++ b/time/tzfile.c @@ -26,6 +26,7 @@ #include <sys/stat.h> #include <stdint.h> #include <alloc_buffer.h> +#include <set-freeres.h> #include <timezone/tzfile.h> @@ -50,7 +51,7 @@ struct leap }; static size_t num_transitions; -libc_freeres_ptr (static __time64_t *transitions); +static __time64_t *transitions; static unsigned char *type_idxs; static size_t num_types; static struct ttinfo *types; @@ -780,3 +781,5 @@ __tzfile_compute (__time64_t timer, int use_localtime, } } } + +weak_alias (transitions, __libc_tzfile_freemem_ptr) diff --git a/time/tzset.c b/time/tzset.c index 3df62106d8..8c740a4e4d 100644 --- a/time/tzset.c +++ b/time/tzset.c @@ -610,7 +610,8 @@ __tz_convert (__time64_t timer, int use_localtime, struct tm *tp) } -libc_freeres_fn (free_mem) +void +__libc_tzset_freemem (void) { while (tzstring_list != NULL) { |