mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 14:25:49 +00:00
Code Issues Releases Wiki Activity

rst: Fix helpers memory allocation

Browse Source 
Calling rst_mem_alloc() in a loop with increasing size causes the
n^2 memory grow :) since _alloc is not _realloc.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2015-06-25 15:36:30 +03:00
parent 49dc94ad73
commit 7166e3c984
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cr-restore.c
View File

@@ -116,7 +116,6 @@ static int prepare_posix_timers(int pid, CoreEntry *core);
static int prepare_signals(int pid, CoreEntry *core);
static int root_as_sibling;
static pid_t *helpers = NULL;
static unsigned long helpers_pos = 0;
static int n_helpers = 0;
@@ -735,25 +734,20 @@ static int collect_helper_pids()
{
struct pstree_item *pi;
helpers_pos = rst_mem_cpos(RM_PRIVATE);
list_for_each_entry(pi, &current->children, sibling) {
static pid_t *helper;
if (pi->state != TASK_HELPER)
continue;
if (helpers) {
void *m;
m = rst_mem_alloc(sizeof(*helpers) * ++n_helpers, RM_PRIVATE);
if (!m)
return -1;
} else {
helpers_pos = rst_mem_cpos(RM_PRIVATE);
helpers = rst_mem_alloc(sizeof(*helpers), RM_PRIVATE);
if (!helpers)
return -1;
n_helpers = 1;
}
helper = rst_mem_alloc(sizeof(*helper), RM_PRIVATE);
if (!helper)
return -1;
helpers[n_helpers - 1] = pi->pid.virt;
n_helpers++;
*helper = pi->pid.virt;
}
return 0;