lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-08 17:42:12 +03:00
Code Activity

Run thread shutdown functions in an explicit order

Browse Source 
This removes the __libc_thread_subfreeres hook in favor of explict
calls.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Florian Weimer
2018-06-26 15:13:54 +02:00
parent 935d920e76
commit 124e025864
14 changed files with 70 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resolv/res-close.c
View File

@@ -126,8 +126,8 @@ res_nclose (res_state statp)
libc_hidden_def (__res_nclose)
/* This is called when a thread is exiting to free resources held in _res. */
static void __attribute__ ((section ("__libc_thread_freeres_fn")))
res_thread_freeres (void)
void
__res_thread_freeres (void)
{
__resolv_context_freeres ();
@@ -140,5 +140,4 @@ res_thread_freeres (void)
/* Make sure we do a full re-initialization the next time. */
_res.options = 0;
}
text_set_element (__libc_thread_subfreeres, res_thread_freeres);
text_set_element (__libc_subfreeres, res_thread_freeres);
text_set_element (__libc_subfreeres, __res_thread_freeres);

3
resolv/resolv-internal.h
View File

@@ -97,4 +97,7 @@ int __res_nopt (struct resolv_context *, int n0,
int __inet_pton_length (int af, const char *src, size_t srclen, void *);
libc_hidden_proto (__inet_pton_length)
/* Called as part of the thread shutdown sequence. */
void __res_thread_freeres (void) attribute_hidden;
#endif /* _RESOLV_INTERNAL_H */

4
resolv/resolv_conf.c
View File

@@ -673,8 +673,7 @@ __resolv_conf_detach (struct __res_state *resp)
}
/* Deallocate the global data. */
static void __attribute__ ((section ("__libc_thread_freeres_fn")))
freeres (void)
libc_freeres_fn (freeres)
{
/* No locking because this function is supposed to be called when
the process has turned single-threaded. */
@@ -698,4 +697,3 @@ freeres (void)
deallocated memory. */
global = NULL;
}
text_set_element (__libc_subfreeres, freeres);