diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-08-16 16:11:03 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-08-16 16:11:03 -0400 |
| commit | 174baab3f9c3dfff4e16fd5b9eb2e5fb5c27db74 (patch) | |
| tree | 4cfa35b5e9979f511aa6a57b9f69dc49d5ecc568 /elf | |
| parent | f0f47fa064bec45d40f586def9c0d1a505762b09 (diff) | |
| download | glibc-174baab3f9c3dfff4e16fd5b9eb2e5fb5c27db74.tar.gz glibc-174baab3f9c3dfff4e16fd5b9eb2e5fb5c27db74.tar.xz glibc-174baab3f9c3dfff4e16fd5b9eb2e5fb5c27db74.zip | |
Improve printing of lookup scopes
The scope of a new object should be printed earlier and when the scope of an already loaded object is extended only the changes should be printed.
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-open.c | 14 | ||||
| -rw-r--r-- | elf/rtld.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/elf/dl-open.c b/elf/dl-open.c index 980c47e845..65fdd3168d 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -288,6 +288,10 @@ dl_open_worker (void *a) r->r_state = RT_CONSISTENT; _dl_debug_state (); + /* Print scope information. */ + if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0)) + _dl_show_scope (new, 0); + /* Only do lazy relocation if `LD_BIND_NOW' is not set. */ int reloc_mode = mode & __RTLD_AUDIT; if (GLRO(dl_lazy)) @@ -407,7 +411,7 @@ dl_open_worker (void *a) /* Print scope information. */ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0)) - _dl_show_scope (imap); + _dl_show_scope (imap, cnt); } /* Only add TLS memory if this object is loaded now and therefore is not yet initialized. */ @@ -493,10 +497,6 @@ cannot load any more object with static TLS")); if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) _dl_debug_printf ("opening file=%s [%lu]; direct_opencount=%u\n\n", new->l_name, new->l_ns, new->l_direct_opencount); - - /* Print scope information. */ - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0)) - _dl_show_scope (new); } @@ -634,12 +634,12 @@ no more namespaces available for dlmopen()")); void -_dl_show_scope (struct link_map *l) +_dl_show_scope (struct link_map *l, int from) { _dl_debug_printf ("object=%s [%lu]\n", *l->l_name ? l->l_name : rtld_progname, l->l_ns); if (l->l_scope != NULL) - for (int scope_cnt = 0; l->l_scope[scope_cnt] != NULL; ++scope_cnt) + for (int scope_cnt = from; l->l_scope[scope_cnt] != NULL; ++scope_cnt) { _dl_debug_printf (" scope %u:", scope_cnt); diff --git a/elf/rtld.c b/elf/rtld.c index 478d037306..87bb5f0b46 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -2197,7 +2197,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", _dl_debug_printf ("\nInitial object scopes\n"); for (struct link_map *l = main_map; l != NULL; l = l->l_next) - _dl_show_scope (l); + _dl_show_scope (l, 0); } if (prelinked) |