This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH v2 1/2] count number of loaded objects in each namespace only once
- From: Gleb Natapov <gleb at scylladb dot com>
- To: libc-alpha at sourceware dot org
- Date: Fri, 5 Aug 2016 10:40:25 +0300
- Subject: [PATCH v2 1/2] count number of loaded objects in each namespace only once
- Authentication-results: sourceware.org; auth=none
- References: <1470382826-6022-1-git-send-email-gleb@scylladb.com>
_ns_nloaded already has count of all objects in a namespace, no need to
add it while iterating over all objects.
---
elf/dl-iteratephdr.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/elf/dl-iteratephdr.c b/elf/dl-iteratephdr.c
index 1cb6e26..e4e7205 100644
--- a/elf/dl-iteratephdr.c
+++ b/elf/dl-iteratephdr.c
@@ -48,17 +48,18 @@ __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
#ifdef SHARED
const void *caller = RETURN_ADDRESS (0);
for (Lmid_t cnt = GL(dl_nns) - 1; cnt > 0; --cnt)
- for (struct link_map *l = GL(dl_ns)[cnt]._ns_loaded; l; l = l->l_next)
- {
- /* We have to count the total number of loaded objects. */
- nloaded += GL(dl_ns)[cnt]._ns_nloaded;
-
- if (caller >= (const void *) l->l_map_start
- && caller < (const void *) l->l_map_end
- && (l->l_contiguous
- || _dl_addr_inside_object (l, (ElfW(Addr)) caller)))
- ns = cnt;
- }
+ {
+ /* We have to count the total number of loaded objects. */
+ nloaded += GL(dl_ns)[cnt]._ns_nloaded;
+ for (struct link_map *l = GL(dl_ns)[cnt]._ns_loaded; l; l = l->l_next)
+ {
+ if (caller >= (const void *) l->l_map_start
+ && caller < (const void *) l->l_map_end
+ && (l->l_contiguous
+ || _dl_addr_inside_object (l, (ElfW(Addr)) caller)))
+ ns = cnt;
+ }
+ }
#endif
for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
--
2.5.5