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

shmem: Move pr_info to open_fd_of_real_pid()

Browse Source 
Just to not allocate path buffer twice.

v2: Change debug message.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Kirill Tkhai 2017-06-07 14:23:19 +03:00 committed by Andrei Vagin
parent 02fcb99c39
commit 320dba091a
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
criu/shmem.c
View File

@ -441,16 +441,11 @@ int collect_shmem(int pid, struct vma_area *vma)
static int shmem_wait_and_open(struct shmem_info *si, VmaEntry *vi) static int shmem_wait_and_open(struct shmem_info *si, VmaEntry *vi)
{ {
char path[128];
int pid, ret; int pid, ret;
pr_info("Waiting for the %lx shmem to appear\n", si->shmid); pr_info("Waiting for the %lx shmem to appear\n", si->shmid);
futex_wait_while(&si->lock, 0); futex_wait_while(&si->lock, 0);
snprintf(path, sizeof(path), "/proc/%d/fd/%d",
si->pid, si->fd);
pr_info("Opening shmem [%s] \n", path);
pid = pstree_pid_by_virt(si->pid)->real; pid = pstree_pid_by_virt(si->pid)->real;
ret = open_fd_of_real_pid(pid, si->fd, O_RDWR); ret = open_fd_of_real_pid(pid, si->fd, O_RDWR);
futex_inc_and_wake(&si->lock); futex_inc_and_wake(&si->lock);

1
criu/util.c
View File

@ -1411,6 +1411,7 @@ int open_fd_of_real_pid(pid_t pid, int fd, int flags)
int ret; int ret;
ret = sprintf(path, "%d/fd/%d", pid, fd); ret = sprintf(path, "%d/fd/%d", pid, fd);
pr_info("Opening /proc/%s on the criu side\n", path);
if (flags == O_RDONLY) if (flags == O_RDONLY)
ret = userns_call(fn_open_proc_r, UNS_FDOUT, path, ret + 1, -1); ret = userns_call(fn_open_proc_r, UNS_FDOUT, path, ret + 1, -1);
else if (flags == O_WRONLY) else if (flags == O_WRONLY)