/* Close a shared object opened by `_dl_open'.
- Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999 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
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <assert.h>
#include <dlfcn.h>
#include <stdlib.h>
#include <string.h>
_dl_close (struct link_map *map)
{
struct link_map **list;
+ unsigned nsearchlist;
unsigned int i;
if (map->l_opencount == 0)
return;
}
- list = map->l_searchlist;
+ list = map->l_searchlist.r_list;
+ nsearchlist = map->l_searchlist.r_nlist;
/* Call all termination functions at once. */
- for (i = 0; i < map->l_nsearchlist; ++i)
+ for (i = 0; i < nsearchlist; ++i)
{
struct link_map *imap = list[i];
- if (imap->l_opencount == 1 && imap->l_type == lt_loaded)
+ if (imap->l_opencount == 1 && imap->l_type == lt_loaded
+ && imap->l_info[DT_FINI]
+ /* Skip any half-cooked objects that were never initialized. */
+ && imap->l_init_called)
{
- if (imap->l_info[DT_FINI])
- /* Call its termination function. */
- (*(void (*) (void)) ((void *) imap->l_addr
- + imap->l_info[DT_FINI]->d_un.d_ptr)) ();
+ /* When debugging print a message first. */
+ if (_dl_debug_impcalls)
+ _dl_debug_message (1, "\ncalling fini: ", imap->l_name,
+ "\n\n", NULL);
+ /* Call its termination function. */
+ (*(void (*) (void)) ((void *) imap->l_addr
+ + imap->l_info[DT_FINI]->d_un.d_ptr)) ();
}
}
/* The search list contains a counted reference to each object it
points to, the 0th elt being MAP itself. Decrement the reference
counts on all the objects MAP depends on. */
- for (i = 0; i < map->l_nsearchlist; ++i)
+ for (i = 0; i < nsearchlist; ++i)
--list[i]->l_opencount;
/* Check each element of the search list to see if all references to
it are gone. */
- for (i = 0; i < map->l_nsearchlist; ++i)
+ for (i = 0; i < nsearchlist; ++i)
{
struct link_map *imap = list[i];
if (imap->l_opencount == 0 && imap->l_type == lt_loaded)
{
+ struct libname_list *lnp;
+
/* That was the last reference, and this was a dlopen-loaded
object. We can unmap it. */
- const ElfW(Phdr) *ph;
- const ElfW(Phdr) *first, *last;
- ElfW(Addr) mapstart, mapend;
-
if (imap->l_global)
{
/* This object is in the global scope list. Remove it. */
- struct link_map **tail = _dl_global_scope_end;
+ int cnt = _dl_main_searchlist->r_nlist;
+
do
- --tail;
- while (*tail != imap);
- while (tail < _dl_global_scope_end)
- {
- tail[0] = tail[1];
- ++tail;
- }
- --_dl_global_scope_end;
+ --cnt;
+ while (_dl_main_searchlist->r_list[cnt] != imap);
+
+ /* The object was already correctly registered. */
+ while (++cnt < _dl_main_searchlist->r_nlist)
+ _dl_main_searchlist->r_list[cnt - 1]
+ = _dl_main_searchlist->r_list[cnt];
+
+ --_dl_main_searchlist->r_nlist;
}
- /* We can unmap all the maps at once. We just have to determine
- the length and the `munmap' call does the rest. */
- first = last = NULL;
- for (ph = imap->l_phdr; ph < imap->l_phdr + imap->l_phnum; ++ph)
- if (ph->p_type == PT_LOAD)
- {
- if (first == NULL)
- first = ph;
- last = ph;
- }
-
- /* Now we have all the information we need for the unmapping.
- See the method used in `_dl_map_object_from_fd'. */
- mapstart = first->p_vaddr & ~(first->p_align - 1);
- mapend = last->p_vaddr + last->p_memsz;
- __munmap ((caddr_t) (imap->l_addr + mapstart), mapend - mapstart);
+ /* We can unmap all the maps at once. We determined the
+ start address and length when we loaded the object and
+ the `munmap' call does the rest. */
+ __munmap ((void *) imap->l_map_start,
+ imap->l_map_end - imap->l_map_start);
/* Finally, unlink the data structure and free it. */
- if (imap->l_prev)
+#ifdef PIC
+ /* We will unlink the first object only if this is a statically
+ linked program. */
+ assert (imap->l_prev != NULL);
+ imap->l_prev->l_next = imap->l_next;
+#else
+ if (imap->l_prev != NULL)
imap->l_prev->l_next = imap->l_next;
+ else
+ _dl_loaded = imap->l_next;
+#endif
if (imap->l_next)
imap->l_next->l_prev = imap->l_prev;
- if (imap->l_searchlist && imap->l_searchlist != list)
- free (imap->l_searchlist);
+
+ if (imap->l_versions != NULL)
+ free (imap->l_versions);
+ if (imap->l_origin != NULL && imap->l_origin != (char *) -1)
+ free ((char *) imap->l_origin);
+
+ /* This name always is allocated. */
+ free (imap->l_name);
+ /* Remove the list with all the names of the shared object. */
+ lnp = imap->l_libname;
+ do
+ {
+ struct libname_list *this = lnp;
+ lnp = lnp->next;
+ free (this);
+ }
+ while (lnp != NULL);
+
+ /* Remove the searchlists. */
+ if (imap->l_searchlist.r_duplist != imap->l_searchlist.r_list)
+ {
+ /* If a r_list exists there always also is a r_duplist. */
+ assert (imap->l_searchlist.r_list != NULL);
+ free (imap->l_searchlist.r_duplist);
+ }
+ if (imap != map && imap->l_searchlist.r_list != NULL)
+ free (imap->l_searchlist.r_list);
+
+ if (imap->l_phdr_allocated)
+ free ((void *) imap->l_phdr);
+
free (imap);
}
}
free (list);
+ if (_dl_global_scope_alloc != 0
+ && _dl_main_searchlist->r_nlist == _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 = _dl_main_searchlist->r_list;
+
+ /* Put the old map in. */
+ _dl_main_searchlist->r_list = _dl_initial_searchlist.r_list;
+ /* Signal that the original map is used. */
+ _dl_global_scope_alloc = 0;
+
+ /* Now free the old map. */
+ free (old);
+ }
+
/* Notify the debugger those objects are finalized and gone. */
_r_debug.r_state = RT_CONSISTENT;
_dl_debug_state ();
projects / kopensolaris-gnu / glibc.git / blobdiff