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

bionic/linker: rename ba_prelink to ba_nonprelink

Browse Source 
-- fixes b/2432550
-- ba_prelink is used to manage non-prelinked libraries, hence ba_nonprelink is
   a more appropriate name for it

Signed-off-by: Iliyan Malchev <malchev@google.com>
This commit is contained in:
Iliyan Malchev 2010-02-10 15:19:37 -08:00
parent 16f7d16f9f
commit e100f52f4a
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
linker/linker.c
View File

@ -91,15 +91,15 @@ static soinfo *somain; /* main process, always the one after libdl_info */
#endif #endif
/* Set up for the buddy allocator managing the prelinked libraries. */ /* Set up for the buddy allocator managing the non-prelinked libraries. */
static struct ba_bits ba_prelink_bitmap[(LIBLAST - LIBBASE) / LIBINC]; static struct ba_bits ba_nonprelink_bitmap[(LIBLAST - LIBBASE) / LIBINC];
static struct ba ba_prelink = { static struct ba ba_nonprelink = {
.base = LIBBASE, .base = LIBBASE,
.size = LIBLAST - LIBBASE, .size = LIBLAST - LIBBASE,
.min_alloc = LIBINC, .min_alloc = LIBINC,
/* max_order will be determined automatically */ /* max_order will be determined automatically */
.bitmap = ba_prelink_bitmap, .bitmap = ba_nonprelink_bitmap,
.num_entries = sizeof(ba_prelink_bitmap)/sizeof(ba_prelink_bitmap[0]), .num_entries = sizeof(ba_nonprelink_bitmap)/sizeof(ba_nonprelink_bitmap[0]),
}; };
static inline int validate_soinfo(soinfo *si) static inline int validate_soinfo(soinfo *si)
@ -792,14 +792,14 @@ alloc_mem_region(soinfo *si)
for it from the buddy allocator, which manages the area between for it from the buddy allocator, which manages the area between
LIBBASE and LIBLAST. LIBBASE and LIBLAST.
*/ */
si->ba_index = ba_allocate(&ba_prelink, si->size); si->ba_index = ba_allocate(&ba_nonprelink, si->size);
if(si->ba_index >= 0) { if(si->ba_index >= 0) {
si->base = ba_start_addr(&ba_prelink, si->ba_index); si->base = ba_start_addr(&ba_nonprelink, si->ba_index);
PRINT("%5d mapping library '%s' at %08x (index %d) " \ PRINT("%5d mapping library '%s' at %08x (index %d) " \
"through buddy allocator.\n", "through buddy allocator.\n",
pid, si->name, si->base, si->ba_index); pid, si->name, si->base, si->ba_index);
if (reserve_mem_region(si) < 0) { if (reserve_mem_region(si) < 0) {
ba_free(&ba_prelink, si->ba_index); ba_free(&ba_nonprelink, si->ba_index);
si->ba_index = -1; si->ba_index = -1;
si->base = 0; si->base = 0;
goto err; goto err;
@ -1095,7 +1095,7 @@ load_library(const char *name)
/* Now actually load the library's segments into right places in memory */ /* Now actually load the library's segments into right places in memory */
if (load_segments(fd, &__header[0], si) < 0) { if (load_segments(fd, &__header[0], si) < 0) {
if (si->ba_index >= 0) { if (si->ba_index >= 0) {
ba_free(&ba_prelink, si->ba_index); ba_free(&ba_nonprelink, si->ba_index);
si->ba_index = -1; si->ba_index = -1;
} }
goto fail; goto fail;
@ -1198,7 +1198,7 @@ unsigned unload_library(soinfo *si)
PRINT("%5d releasing library '%s' address space at %08x "\ PRINT("%5d releasing library '%s' address space at %08x "\
"through buddy allocator.\n", "through buddy allocator.\n",
pid, si->name, si->base); pid, si->name, si->base);
ba_free(&ba_prelink, si->ba_index); ba_free(&ba_nonprelink, si->ba_index);
} }
notify_gdb_of_unload(si); notify_gdb_of_unload(si);
free_info(si); free_info(si);
@ -2087,7 +2087,7 @@ unsigned __linker_init(unsigned **elfdata)
vecs += 2; vecs += 2;
} }
ba_init(&ba_prelink); ba_init(&ba_nonprelink);
si->base = 0; si->base = 0;
si->dynamic = (unsigned *)-1; si->dynamic = (unsigned *)-1;