path: root/malloc
diff options
authorFlorian Weimer <fweimer@redhat.com>2018-06-26 15:13:54 +0200
committerFlorian Weimer <fweimer@redhat.com>2018-06-26 15:27:12 +0200
commit124e025864bb39732c71fc60c1443d5680881a0a (patch)
tree2af69c84acc461764f9b8873089b3277b22725c0 /malloc
parent935d920e763626dbcbbf655117285d1d270791a1 (diff)
Run thread shutdown functions in an explicit order
This removes the __libc_thread_subfreeres hook in favor of explict calls. Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'malloc')
3 files changed, 21 insertions, 11 deletions
diff --git a/malloc/arena.c b/malloc/arena.c
index 37183cfb6ab..497ae475e7a 100644
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -941,8 +941,8 @@ arena_get_retry (mstate ar_ptr, size_t bytes)
return ar_ptr;
-static void __attribute__ ((section ("__libc_thread_freeres_fn")))
-arena_thread_freeres (void)
+__malloc_arena_thread_freeres (void)
/* Shut down the thread cache first. This could deallocate data for
the thread arena, so do this before we put the arena on the free
@@ -966,7 +966,6 @@ arena_thread_freeres (void)
__libc_lock_unlock (free_list_lock);
-text_set_element (__libc_thread_subfreeres, arena_thread_freeres);
* Local variables:
diff --git a/malloc/malloc-internal.h b/malloc/malloc-internal.h
index ad054508ee4..9cee0fb2d7e 100644
--- a/malloc/malloc-internal.h
+++ b/malloc/malloc-internal.h
@@ -71,6 +71,9 @@ void __malloc_fork_unlock_parent (void) attribute_hidden;
/* Called in the child process after a fork. */
void __malloc_fork_unlock_child (void) attribute_hidden;
+/* Called as part of the thread shutdown sequence. */
+void __malloc_arena_thread_freeres (void) attribute_hidden;
/* Set *RESULT to LEFT * RIGHT. Return true if the multiplication
overflowed. */
static inline bool
diff --git a/malloc/thread-freeres.c b/malloc/thread-freeres.c
index 53ce41bb785..8902c845bcf 100644
--- a/malloc/thread-freeres.c
+++ b/malloc/thread-freeres.c
@@ -16,16 +16,24 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <stdlib.h>
#include <libc-internal.h>
-#include <set-hooks.h>
+#include <malloc-internal.h>
+#include <resolv/resolv-internal.h>
+#include <rpc/rpc.h>
+#include <string.h>
-DEFINE_HOOK (__libc_thread_subfreeres, (void));
-void __attribute__ ((section ("__libc_thread_freeres_fn")))
+/* Thread shutdown function. Note that this function must be called
+ for threads during shutdown for correctness reasons. Unlike
+ __libc_subfreeres, skipping calls to it is not a valid
+ optimization. */
__libc_thread_freeres (void)
- RUN_HOOK (__libc_thread_subfreeres, ());
+ call_function_static_weak (__rpc_thread_destroy);
+ call_function_static_weak (__res_thread_freeres);
+ call_function_static_weak (__strerror_thread_freeres);
+ /* This should come last because it shuts down malloc for this
+ thread and the other shutdown functions might well call free. */
+ call_function_static_weak (__malloc_arena_thread_freeres);