mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-29 13:28:27 +00:00
Code Issues Releases Wiki Activity

shmem: implement manual anon shared memory dedup

Browse Source 
We use the same dumping and restoring mechanism for anon private and
anon shared memory. Because of this we can implement manual deduplication
of shared anon memory the same way we do it with private anonymous memory.
Also we need to rename pid parameter of cr_dedup_one_pagemap to id because
now we can pass either pid or shmid there and the actual meaning depends
on flags: PR_TASK is for pid, PR_SHMEM is for shmid.

Signed-off-by: Fyodor Bocharov <bocharovfedor@gmail.com>
Signed-off-by: Eugene Batalov <eabatalov89@gmail.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Fyodor Bocharov 2016-08-11 17:53:56 +03:00 committed by Pavel Emelyanov
parent 6d192fabc6
commit eadf47c609
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
criu/cr-dedup.c
View File

@ -7,12 +7,12 @@
#include "pagemap.h"
#include "restorer.h"
static int cr_dedup_one_pagemap(int pid);
static int cr_dedup_one_pagemap(int id, int flags);
int cr_dedup(void)
{
int close_ret, ret = 0;
int pid;
int id;
DIR * dirp;
struct dirent *ent;
@ -35,10 +35,18 @@ int cr_dedup(void)
break;
}
ret = sscanf(ent->d_name, "pagemap-%d.img", &pid);
ret = sscanf(ent->d_name, "pagemap-%d.img", &id);
if (ret == 1) {
pr_info("pid=%d\n", pid);
ret = cr_dedup_one_pagemap(pid);
pr_info("pid=%d\n", id);
ret = cr_dedup_one_pagemap(id, PR_TASK);
if (ret < 0)
break;
}
ret = sscanf(ent->d_name, "pagemap-shmem-%d.img", &id);
if (ret == 1) {
pr_info("shmid=%d\n", id);
ret = cr_dedup_one_pagemap(id, PR_SHMEM);
if (ret < 0)
break;
}
@ -58,14 +66,15 @@ err:
return 0;
}
static int cr_dedup_one_pagemap(int pid)
static int cr_dedup_one_pagemap(int id, int flags)
{
int ret;
struct page_read pr;
struct page_read * prp;
struct iovec iov;
ret = open_page_read(pid, &pr, PR_TASK | PR_MOD);
flags |= PR_MOD;
ret = open_page_read(id, &pr, flags);
if (ret <= 0) {
ret = -1;
goto exit;