diff options
Diffstat (limited to 'elf/dl-close.c')
| -rw-r--r-- | elf/dl-close.c | 158 |
1 files changed, 55 insertions, 103 deletions
diff --git a/elf/dl-close.c b/elf/dl-close.c index 5cd8b9be2d..df968fe649 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -1,5 +1,5 @@ /* Close a shared object opened by `_dl_open'. - Copyright (C) 1996-2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1996-2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -31,7 +31,6 @@ #include <sys/types.h> #include <sys/mman.h> #include <sysdep-cancel.h> -#include <tls.h> /* Type of the constructor functions. */ @@ -42,7 +41,6 @@ typedef void (*fini_t) (void); #define IDX_STILL_USED -1 -#ifdef USE_TLS /* Returns true we an non-empty was found. */ static bool remove_slotinfo (size_t idx, struct dtv_slotinfo_list *listp, size_t disp, @@ -104,12 +102,13 @@ remove_slotinfo (size_t idx, struct dtv_slotinfo_list *listp, size_t disp, /* No non-entry in this list element. */ return false; } -#endif void _dl_close_worker (struct link_map *map) { + Lmid_t ns = map->l_ns; + /* One less direct use. */ --map->l_direct_opencount; @@ -132,16 +131,11 @@ _dl_close_worker (struct link_map *map) return; } - Lmid_t nsid = map->l_ns; - struct link_namespaces *ns = &GL(dl_ns)[nsid]; - retry: dl_close_state = pending; -#ifdef USE_TLS bool any_tls = false; -#endif - const unsigned int nloaded = ns->_ns_nloaded; + const unsigned int nloaded = GL(dl_ns)[ns]._ns_nloaded; char used[nloaded]; char done[nloaded]; struct link_map *maps[nloaded]; @@ -149,7 +143,7 @@ _dl_close_worker (struct link_map *map) /* Run over the list and assign indexes to the link maps and enter them into the MAPS array. */ int idx = 0; - for (struct link_map *l = ns->_ns_loaded; l != NULL; l = l->l_next) + for (struct link_map *l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next) { l->l_idx = idx; maps[idx] = l; @@ -226,22 +220,20 @@ _dl_close_worker (struct link_map *map) } /* Sort the entries. */ - _dl_sort_fini (ns->_ns_loaded, maps, nloaded, used, nsid); + _dl_sort_fini (GL(dl_ns)[ns]._ns_loaded, maps, nloaded, used, ns); /* Call all termination functions at once. */ #ifdef SHARED - bool do_audit = GLRO(dl_naudit) > 0 && !ns->_ns_loaded->l_auditing; + bool do_audit = GLRO(dl_naudit) > 0 && !GL(dl_ns)[ns]._ns_loaded->l_auditing; #endif bool unload_any = false; - bool scope_mem_left = false; - unsigned int unload_global = 0; unsigned int first_loaded = ~0; for (unsigned int i = 0; i < nloaded; ++i) { struct link_map *imap = maps[i]; /* All elements must be in the same namespace. */ - assert (imap->l_ns == nsid); + assert (imap->l_ns == ns); if (!used[i]) { @@ -256,7 +248,7 @@ _dl_close_worker (struct link_map *map) if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS, 0)) _dl_debug_printf ("\ncalling fini: %s [%lu]\n\n", - imap->l_name, nsid); + imap->l_name, ns); if (imap->l_info[DT_FINI_ARRAY] != NULL) { @@ -299,9 +291,6 @@ _dl_close_worker (struct link_map *map) /* We indeed have an object to remove. */ unload_any = true; - if (imap->l_global) - ++unload_global; - /* Remember where the first dynamically loaded object is. */ if (i < first_loaded) first_loaded = i; @@ -345,7 +334,7 @@ _dl_close_worker (struct link_map *map) struct link_map *tmap = (struct link_map *) ((char *) imap->l_scope[cnt] - offsetof (struct link_map, l_searchlist)); - assert (tmap->l_ns == nsid); + assert (tmap->l_ns == ns); if (tmap->l_idx == IDX_STILL_USED) ++remain; else @@ -410,18 +399,18 @@ _dl_close_worker (struct link_map *map) struct r_scope_elem **old = imap->l_scope; - imap->l_scope = newp; + if (RTLD_SINGLE_THREAD_P) + imap->l_scope = newp; + else + { + __rtld_mrlock_change (imap->l_scope_lock); + imap->l_scope = newp; + __rtld_mrlock_done (imap->l_scope_lock); + } /* No user anymore, we can free it now. */ if (old != imap->l_scope_mem) - { - if (_dl_scope_free (old)) - /* If _dl_scope_free used THREAD_GSCOPE_WAIT (), - no need to repeat it. */ - scope_mem_left = false; - } - else - scope_mem_left = true; + free (old); imap->l_scope_max = new_size; } @@ -446,7 +435,7 @@ _dl_close_worker (struct link_map *map) /* Auditing checkpoint: we will start deleting objects. */ if (__builtin_expect (do_audit, 0)) { - struct link_map *head = ns->_ns_loaded; + struct link_map *head = GL(dl_ns)[ns]._ns_loaded; struct audit_ifaces *afct = GLRO(dl_audit); /* Do not call the functions for any auditing object. */ if (head->l_auditing == 0) @@ -463,55 +452,13 @@ _dl_close_worker (struct link_map *map) #endif /* Notify the debugger we are about to remove some loaded objects. */ - struct r_debug *r = _dl_debug_initialize (0, nsid); + struct r_debug *r = _dl_debug_initialize (0, ns); r->r_state = RT_DELETE; _dl_debug_state (); - if (unload_global) - { - /* Some objects are in the global scope list. Remove them. */ - struct r_scope_elem *ns_msl = ns->_ns_main_searchlist; - unsigned int i; - unsigned int j = 0; - unsigned int cnt = ns_msl->r_nlist; - - while (cnt > 0 && ns_msl->r_list[cnt - 1]->l_removed) - --cnt; - - if (cnt + unload_global == ns_msl->r_nlist) - /* Speed up removing most recently added objects. */ - j = cnt; - else - for (i = 0; i < cnt; i++) - if (ns_msl->r_list[i]->l_removed == 0) - { - if (i != j) - ns_msl->r_list[j] = ns_msl->r_list[i]; - j++; - } - ns_msl->r_nlist = j; - } - - if (!RTLD_SINGLE_THREAD_P - && (unload_global - || scope_mem_left - || (GL(dl_scope_free_list) != NULL - && GL(dl_scope_free_list)->count))) - { - struct dl_scope_free_list *fsl; - - THREAD_GSCOPE_WAIT (); - /* Now we can free any queued old scopes. */ - if ((fsl = GL(dl_scope_free_list)) != NULL) - while (fsl->count > 0) - free (fsl->list[--fsl->count]); - } - -#ifdef USE_TLS size_t tls_free_start; size_t tls_free_end; tls_free_start = tls_free_end = NO_TLS_OFFSET; -#endif /* Check each element of the search list to see if all references to it are gone. */ @@ -524,8 +471,24 @@ _dl_close_worker (struct link_map *map) /* That was the last reference, and this was a dlopen-loaded object. We can unmap it. */ + if (__builtin_expect (imap->l_global, 0)) + { + /* This object is in the global scope list. Remove it. */ + unsigned int cnt = GL(dl_ns)[ns]._ns_main_searchlist->r_nlist; + + do + --cnt; + while (GL(dl_ns)[ns]._ns_main_searchlist->r_list[cnt] != imap); + + /* The object was already correctly registered. */ + while (++cnt + < GL(dl_ns)[ns]._ns_main_searchlist->r_nlist) + GL(dl_ns)[ns]._ns_main_searchlist->r_list[cnt - 1] + = GL(dl_ns)[ns]._ns_main_searchlist->r_list[cnt]; + + --GL(dl_ns)[ns]._ns_main_searchlist->r_nlist; + } -#ifdef USE_TLS /* Remove the object from the dtv slotinfo array if it uses TLS. */ if (__builtin_expect (imap->l_tls_blocksize > 0, 0)) { @@ -544,7 +507,7 @@ _dl_close_worker (struct link_map *map) this search list, going in either direction. When the whole chunk is at the end of the used area then we can reclaim it. */ -# if TLS_TCB_AT_TP +#if TLS_TCB_AT_TP if (tls_free_start == NO_TLS_OFFSET || (size_t) imap->l_tls_offset == tls_free_start) { @@ -584,7 +547,7 @@ _dl_close_worker (struct link_map *map) = tls_free_end - imap->l_tls_blocksize; } } -# elif TLS_DTV_AT_TP +#elif TLS_DTV_AT_TP if ((size_t) imap->l_tls_offset == tls_free_end) /* Extend the contiguous chunk being reclaimed. */ tls_free_end -= imap->l_tls_blocksize; @@ -601,12 +564,11 @@ _dl_close_worker (struct link_map *map) tls_free_start = imap->l_tls_offset; tls_free_end = tls_free_start + imap->l_tls_blocksize; } -# else -# error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined" -# endif +#else +# error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined" +#endif } } -#endif /* We can unmap all the maps at once. We determined the start address and length when we loaded the object and @@ -619,12 +581,12 @@ _dl_close_worker (struct link_map *map) else { #ifdef SHARED - assert (nsid != LM_ID_BASE); + assert (ns != LM_ID_BASE); #endif - ns->_ns_loaded = imap->l_next; + GL(dl_ns)[ns]._ns_loaded = imap->l_next; } - --ns->_ns_nloaded; + --GL(dl_ns)[ns]._ns_nloaded; if (imap->l_next != NULL) imap->l_next->l_prev = imap->l_prev; @@ -672,7 +634,6 @@ _dl_close_worker (struct link_map *map) } } -#ifdef USE_TLS /* If we removed any object which uses TLS bump the generation counter. */ if (any_tls) { @@ -682,13 +643,12 @@ _dl_close_worker (struct link_map *map) if (tls_free_end == GL(dl_tls_static_used)) GL(dl_tls_static_used) = tls_free_start; } -#endif #ifdef SHARED /* Auditing checkpoint: we have deleted all objects. */ if (__builtin_expect (do_audit, 0)) { - struct link_map *head = ns->_ns_loaded; + struct link_map *head = GL(dl_ns)[ns]._ns_loaded; /* Do not call the functions for any auditing object. */ if (head->l_auditing == 0) { @@ -742,7 +702,6 @@ _dl_close (void *_map) } -#ifdef USE_TLS static bool __libc_freeres_fn_section free_slotinfo (struct dtv_slotinfo_list **elemp) { @@ -769,52 +728,45 @@ free_slotinfo (struct dtv_slotinfo_list **elemp) return true; } -#endif libc_freeres_fn (free_mem) { - for (Lmid_t nsid = 0; nsid < DL_NNS; ++nsid) - if (__builtin_expect (GL(dl_ns)[nsid]._ns_global_scope_alloc, 0) != 0 - && (GL(dl_ns)[nsid]._ns_main_searchlist->r_nlist + for (Lmid_t ns = 0; ns < DL_NNS; ++ns) + if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 + && (GL(dl_ns)[ns]._ns_main_searchlist->r_nlist // XXX Check whether we need NS-specific initial_searchlist == GLRO(dl_initial_searchlist).r_nlist)) { /* All object dynamically loaded by the program are unloaded. Free the memory allocated for the global scope variable. */ - struct link_map **old = GL(dl_ns)[nsid]._ns_main_searchlist->r_list; + struct link_map **old = GL(dl_ns)[ns]._ns_main_searchlist->r_list; /* Put the old map in. */ - GL(dl_ns)[nsid]._ns_main_searchlist->r_list + GL(dl_ns)[ns]._ns_main_searchlist->r_list // XXX Check whether we need NS-specific initial_searchlist = GLRO(dl_initial_searchlist).r_list; /* Signal that the original map is used. */ - GL(dl_ns)[nsid]._ns_global_scope_alloc = 0; + GL(dl_ns)[ns]._ns_global_scope_alloc = 0; /* Now free the old map. */ free (old); } -#ifdef USE_TLS if (USE___THREAD || GL(dl_tls_dtv_slotinfo_list) != NULL) { /* Free the memory allocated for the dtv slotinfo array. We can do this only if all modules which used this memory are unloaded. */ -# ifdef SHARED +#ifdef SHARED if (GL(dl_initial_dtv) == NULL) /* There was no initial TLS setup, it was set up later when it used the normal malloc. */ free_slotinfo (&GL(dl_tls_dtv_slotinfo_list)); else -# endif +#endif /* The first element of the list does not have to be deallocated. It was allocated in the dynamic linker (i.e., with a different malloc), and in the static library it's in .bss space. */ free_slotinfo (&GL(dl_tls_dtv_slotinfo_list)->next); } -#endif - - void *scope_free_list = GL(dl_scope_free_list); - GL(dl_scope_free_list) = NULL; - free (scope_free_list); } |