generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Erase elements in LinkedList::remove_if

Browse Source 
(cherry picked from commit 4bea498544)

Change-Id: I1ffe248bc2b7572f38fbd987e9c6db5ecbd4559d
This commit is contained in:
Dmitriy Ivanov
2014-08-29 14:01:48 -07:00
parent cfad7ae934
commit 4d01d08c29
3 changed files with 121 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
linker/linker.cpp
View File

@@ -627,6 +627,8 @@ done:
return nullptr;
}
// Another soinfo list allocator to use in dlsym. We don't reuse
// SoinfoListAllocator because it is write-protected most of the time.
static LinkerAllocator<LinkedListEntry<soinfo>> g_soinfo_list_allocator_rw;
@@ -879,10 +881,17 @@ static void soinfo_unload(soinfo* si) {
si->CallDestructors();
if (si->has_min_version(0)) {
si->get_children().for_each([&] (soinfo* child) {
TRACE("%s needs to unload %s", si->name, child->name);
soinfo_unload(child);
});
// It is not safe to do si->get_children().for_each, because
// during soinfo_free the child will concurrently modify the si->children
// list, therefore we create a copy and use it to unload children.
size_t children_count = si->get_children().size();
soinfo* children[children_count];
si->get_children().copy_to_array(children, children_count);
for (size_t i = 0; i < children_count; ++i) {
TRACE("%s needs to unload %s", si->name, children[i]->name);
soinfo_unload(children[i]);
}
} else {
for (ElfW(Dyn)* d = si->dynamic; d->d_tag != DT_NULL; ++d) {
if (d->d_tag == DT_NEEDED) {
@@ -1636,7 +1645,7 @@ void soinfo::remove_all_links() {
});
parents.for_each([&] (soinfo* parent) {
parent->children.for_each([&] (const soinfo* child) {
parent->children.remove_if([&] (const soinfo* child) {
return child == this;
});
});