diff options
| author | Florian Weimer <fweimer@redhat.com> | 2018-06-26 15:13:54 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2018-06-26 15:27:12 +0200 |
| commit | 124e025864bb39732c71fc60c1443d5680881a0a (patch) | |
| tree | 2af69c84acc461764f9b8873089b3277b22725c0 /resolv | |
| parent | 935d920e763626dbcbbf655117285d1d270791a1 (diff) | |
| download | glibc-124e025864bb39732c71fc60c1443d5680881a0a.tar.gz | |
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 'resolv')
| -rw-r--r-- | resolv/res-close.c | 7 | ||||
| -rw-r--r-- | resolv/resolv-internal.h | 3 | ||||
| -rw-r--r-- | resolv/resolv_conf.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/resolv/res-close.c b/resolv/res-close.c index e02f5afa15..38572b1d2f 100644 --- a/resolv/res-close.c +++ b/resolv/res-close.c @@ -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); diff --git a/resolv/resolv-internal.h b/resolv/resolv-internal.h index ac6e495927..b8e447c726 100644 --- a/resolv/resolv-internal.h +++ b/resolv/resolv-internal.h @@ -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 */ diff --git a/resolv/resolv_conf.c b/resolv/resolv_conf.c index ab4e5dc82c..b4021ab735 100644 --- a/resolv/resolv_conf.c +++ b/resolv/resolv_conf.c @@ -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); |