mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-30 05:48:05 +00:00
Code Issues Releases Wiki Activity

rst: Collect procfs remaps at once

Browse Source 
There's no need in separate call to prepare_procfs_remaps().
All remaps are collected one step earlier and we can do
open_remap_dead_process() right at once.

Also rename the latter routine.

✓ travis-ci: success for Sanitize initialization bits
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Pavel Emelyanov 2017-05-18 12:35:19 +03:00 committed by Andrei Vagin
parent 30e2fd2175
commit b01bd93757
3 changed files with 13 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
criu/cr-restore.c
View File

@ -229,11 +229,6 @@ static int crtools_prepare_shared(void)
if (collect_remaps_and_regfiles()) if (collect_remaps_and_regfiles())
return -1; return -1;
/* dead pid remap needs to allocate task helpers which all tasks need
* to see */
if (prepare_procfs_remaps())
return -1;
/* Connections are unlocked from criu */ /* Connections are unlocked from criu */
if (collect_inet_sockets()) if (collect_inet_sockets())
return -1; return -1;

42
criu/files-reg.c
View File

@ -374,7 +374,7 @@ static int open_remap_linked(struct reg_file_info *rfi,
return 0; return 0;
} }
static int open_remap_dead_process(struct reg_file_info *rfi, static int collect_remap_dead_process(struct reg_file_info *rfi,
RemapFilePathEntry *rfe) RemapFilePathEntry *rfe)
{ {
struct pstree_item *helper; struct pstree_item *helper;
@ -434,12 +434,21 @@ static int collect_one_remap(void *obj, ProtobufCMessage *msg, struct cr_img *i)
ri->rfi = container_of(fdesc, struct reg_file_info, d); ri->rfi = container_of(fdesc, struct reg_file_info, d);
if (rfe->remap_type == REMAP_TYPE__GHOST) { switch (rfe->remap_type) {
case REMAP_TYPE__GHOST:
if (collect_remap_ghost(ri->rfi, ri->rfe)) if (collect_remap_ghost(ri->rfi, ri->rfe))
return -1; return -1;
} else if (rfe->remap_type == REMAP_TYPE__LINKED) { break;
case REMAP_TYPE__LINKED:
if (collect_remap_linked(ri->rfi, ri->rfe)) if (collect_remap_linked(ri->rfi, ri->rfe))
return -1; return -1;
break;
case REMAP_TYPE__PROCFS:
if (collect_remap_dead_process(ri->rfi, rfe) < 0)
return -1;
break;
default:
break;
} }
list_add_tail(&ri->list, &remaps); list_add_tail(&ri->list, &remaps);
@ -463,7 +472,7 @@ static int prepare_one_remap(struct remap_info *ri)
ret = open_remap_ghost(rfi, rfe); ret = open_remap_ghost(rfi, rfe);
break; break;
case REMAP_TYPE__PROCFS: case REMAP_TYPE__PROCFS:
/* handled earlier by prepare_procfs_remaps */ /* handled earlier by collect_remap_dead_process */
ret = 0; ret = 0;
break; break;
default: default:
@ -475,31 +484,6 @@ out:
return ret; return ret;
} }
/* We separate the preparation of PROCFS remaps because they allocate pstree
* items, which need to be seen by the root task. We can't do all remaps here,
* because the files haven't been loaded yet.
*/
int prepare_procfs_remaps(void)
{
struct remap_info *ri;
list_for_each_entry(ri, &remaps, list) {
RemapFilePathEntry *rfe = ri->rfe;
struct reg_file_info *rfi = ri->rfi;
switch (rfe->remap_type) {
case REMAP_TYPE__PROCFS:
if (open_remap_dead_process(rfi, rfe) < 0)
return -1;
break;
default:
continue;
}
}
return 0;
}
int prepare_remaps(void) int prepare_remaps(void)
{ {
struct remap_info *ri; struct remap_info *ri;

1
criu/include/files-reg.h
View File

@ -53,7 +53,6 @@ extern int try_clean_remaps(bool only_ghosts);
extern int strip_deleted(struct fd_link *link); extern int strip_deleted(struct fd_link *link);
extern int prepare_procfs_remaps(void);
extern int dead_pid_conflict(void); extern int dead_pid_conflict(void);
#endif /* __CR_FILES_REG_H__ */ #endif /* __CR_FILES_REG_H__ */