glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

unwind: use xgrowarray

Browse Source 
* unwind.c (build_mmap_cache): Use xgrowarray instead of manual dynamic
array management.
This commit is contained in:
Eugene Syromiatnikov 2017-08-08 16:37:01 +02:00 committed by Dmitry V. Levin
parent 057a8f2274
commit 81410d414c
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
unwind.c
View File

@ -139,9 +139,8 @@ static void
build_mmap_cache(struct tcb *tcp)
{
FILE *fp;
struct mmap_cache_t *cache_head;
/* start with a small dynamically-allocated array and then expand it */
size_t cur_array_size = 10;
struct mmap_cache_t *cache_head = NULL;
size_t cur_array_size = 0;
char filename[sizeof("/proc/4294967296/maps")];
char buffer[PATH_MAX + 80];
@ -154,8 +153,6 @@ build_mmap_cache(struct tcb *tcp)
return;
}
cache_head = xcalloc(cur_array_size, sizeof(*cache_head));
while (fgets(buffer, sizeof(buffer), fp) != NULL) {
struct mmap_cache_t *entry;
unsigned long start_addr, end_addr, mmap_offset;
@ -199,11 +196,9 @@ build_mmap_cache(struct tcb *tcp)
}
}
if (tcp->mmap_cache_size >= cur_array_size) {
cur_array_size *= 2;
cache_head = xreallocarray(cache_head, cur_array_size,
sizeof(*cache_head));
}
if (tcp->mmap_cache_size >= cur_array_size)
cache_head = xgrowarray(cache_head, &cur_array_size,
sizeof(*cache_head));
entry = &cache_head[tcp->mmap_cache_size];
entry->start_addr = start_addr;