lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-05 19:35:52 +03:00
Code Activity

Update.

Browse Source 
* include/link.h (struct link_map): Add l_soname_added bitfield.
	* elf/dl-load.c (_dl_map_object): Remember when we added the
	SONAME to the l_libname list and don't try it again.
This commit is contained in:
Ulrich Drepper
2000-10-21 06:32:16 +00:00
parent 8699e7b1da
commit c91bc73e3e
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2000-10-20 Ulrich Drepper <drepper@redhat.com> 2000-10-20 Ulrich Drepper <drepper@redhat.com>
* include/link.h (struct link_map): Add l_soname_added bitfield.
* elf/dl-load.c (_dl_map_object): Remember when we added the
SONAME to the l_libname list and don't try it again.
* elf/dl-close.c: Decrement opencount for all dependencies which can * elf/dl-close.c: Decrement opencount for all dependencies which can
be removed even if the object is not yet unloaded. be removed even if the object is not yet unloaded.
* elf/dl-deps.c (_dl_map_object_deps): If dependency is already in * elf/dl-deps.c (_dl_map_object_deps): If dependency is already in

4
elf/dl-load.c
View File

@@ -1413,7 +1413,8 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
{ {
const char *soname; const char *soname;
if (l->l_info[DT_SONAME] == NULL) if (__builtin_expect (l->l_soname_added, 1)
|| l->l_info[DT_SONAME] == NULL)
continue; continue;
soname = ((const char *) D_PTR (l, l_info[DT_STRTAB]) soname = ((const char *) D_PTR (l, l_info[DT_STRTAB])
@@ -1423,6 +1424,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
/* We have a match on a new name -- cache it. */ /* We have a match on a new name -- cache it. */
add_name_to_object (l, soname); add_name_to_object (l, soname);
l->l_soname_added = 1;
} }
/* We have a match -- bump the reference count and return it. */ /* We have a match -- bump the reference count and return it. */

2
include/link.h
View File

@@ -178,6 +178,8 @@ struct link_map
unsigned int l_reserved:2; /* Reserved for internal use. */ unsigned int l_reserved:2; /* Reserved for internal use. */
unsigned int l_phdr_allocated:1; /* Nonzero if the data structure pointed unsigned int l_phdr_allocated:1; /* Nonzero if the data structure pointed
to by `l_phdr' is allocated. */ to by `l_phdr' is allocated. */
unsigned int l_soname_added:1; /* Nonzero if the SONAME is for sure in
the l_libname list. */
/* Array with version names. */ /* Array with version names. */
unsigned int l_nversions; unsigned int l_nversions;