diff options
Diffstat (limited to 'libdwfl')
| -rw-r--r-- | libdwfl/ChangeLog | 13 | ||||
| -rw-r--r-- | libdwfl/dwfl_getmodules.c | 62 | ||||
| -rw-r--r-- | libdwfl/dwfl_module_build_id.c | 5 |
3 files changed, 50 insertions, 30 deletions
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index e29c7d60..41ff69bc 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,3 +1,16 @@ +2008-12-02 Roland McGrath <roland@redhat.com> + + * dwfl_getmodules.c (dwfl_getmodules): Typo fix in last change. + +2008-11-26 Roland McGrath <roland@redhat.com> + + * dwfl_getmodules.c (dwfl_getmodules): Encode iteration style in + return value, and interpret encoded OFFSET argument. + +2008-10-07 Roland McGrath <roland@redhat.com> + + * dwfl_module_build_id.c (check_notes): Fix typo in vaddr calculation. + 2008-09-29 Roland McGrath <roland@redhat.com> * segment.c (insert): Must realloc DWFL->lookup_module here too. diff --git a/libdwfl/dwfl_getmodules.c b/libdwfl/dwfl_getmodules.c index f205b899..7c6ab971 100644 --- a/libdwfl/dwfl_getmodules.c +++ b/libdwfl/dwfl_getmodules.c @@ -59,49 +59,55 @@ dwfl_getmodules (Dwfl *dwfl, if (dwfl == NULL) return -1; + /* We iterate through the linked list when it's all we have. + But continuing from an offset is slow that way. So when + DWFL->lookup_module is populated, we can instead keep our + place by jumping directly into the array. Since the actions + of a callback could cause it to get populated, we must + choose the style of place-holder when we return an offset, + and we encode the choice in the low bits of that value. */ + Dwfl_Module *m = dwfl->modulelist; - if (unlikely (dwfl->lookup_module == NULL)) + if ((offset & 3) == 1) { + offset >>= 2; for (ptrdiff_t pos = 0; pos < offset; ++pos) if (m == NULL) return -1; else m = m->next; - while (m != NULL) - { - ++offset; - if ((*callback) (MODCB_ARGS (m), arg) != DWARF_CB_OK) - return offset; - m = m->next; - } } - else + else if (((offset & 3) == 2) && likely (dwfl->lookup_module != NULL)) { - if (offset > 0) - { - if ((size_t) offset - 1 == dwfl->lookup_elts) - return 0; + offset >>= 2; - if (unlikely ((size_t) offset - 1 > dwfl->lookup_elts)) - return -1; + if ((size_t) offset - 1 == dwfl->lookup_elts) + return 0; - m = dwfl->lookup_module[offset - 1]; - if (unlikely (m == NULL)) - return -1; - } + if (unlikely ((size_t) offset - 1 > dwfl->lookup_elts)) + return -1; - while (m != NULL) - { - int ok = (*callback) (MODCB_ARGS (m), arg); - m = m->next; - if (ok != DWARF_CB_OK) - return (m == NULL - ? (ptrdiff_t) dwfl->lookup_elts + 1 - : m->segment + 1); - } + m = dwfl->lookup_module[offset - 1]; + if (unlikely (m == NULL)) + return -1; + } + else if (offset != 0) + { + __libdwfl_seterrno (DWFL_E_BADSTROFF); + return -1; } + while (m != NULL) + { + int ok = (*callback) (MODCB_ARGS (m), arg); + ++offset; + m = m->next; + if (ok != DWARF_CB_OK) + return ((dwfl->lookup_module == NULL) ? ((offset << 2) | 1) + : (((m == NULL ? (ptrdiff_t) dwfl->lookup_elts + 1 + : m->segment + 1) << 2) | 2)); + } return 0; } INTDEF (dwfl_getmodules) diff --git a/libdwfl/dwfl_module_build_id.c b/libdwfl/dwfl_module_build_id.c index 903b79c5..8725afbc 100644 --- a/libdwfl/dwfl_module_build_id.c +++ b/libdwfl/dwfl_module_build_id.c @@ -1,5 +1,5 @@ /* Return build ID information for a module. - Copyright (C) 2007 Red Hat, Inc. + Copyright (C) 2007, 2008 Red Hat, Inc. This file is part of Red Hat elfutils. Red Hat elfutils is free software; you can redistribute it and/or modify @@ -88,7 +88,8 @@ check_notes (Dwfl_Module *mod, bool set, Elf_Data *data, GElf_Addr data_vaddr) "GNU", sizeof "GNU")) return found_build_id (mod, set, data->d_buf + desc_pos, nhdr.n_descsz, - data_vaddr == NO_VADDR ? 0 : data_vaddr + pos); + data_vaddr == NO_VADDR ? 0 + : data_vaddr + desc_pos); return 0; } |