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

page-xfer: Rework send_psi to use send (and flags)

Browse Source 
There are cases when we need to specify flags with which
to send the ps_iov, so tune-up the send_psi for that and
use where needed.

Acked-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Pavel Emelyanov
2017-07-06 12:40:07 +03:00
committed by Andrei Vagin
parent 4fd66c9d9e
commit f83ba3fe31
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
criu/page-xfer.c
View File

@@ -127,16 +127,21 @@ static inline u32 decode_ps_flags(u32 cmd)
return cmd >> PS_CMD_BITS;
}
static inline int send_psi(int sk, struct page_server_iov *pi)
static inline int send_psi_flags(int sk, struct page_server_iov *pi, int flags)
{
if (write(sk, pi, sizeof(*pi)) != sizeof(*pi)) {
pr_perror("Can't write PSI %d to server", pi->cmd);
if (send(sk, pi, sizeof(*pi), flags) != sizeof(*pi)) {
pr_perror("Can't send PSI %d to server", pi->cmd);
return -1;
}
return 0;
}
static inline int send_psi(int sk, struct page_server_iov *pi)
{
return send_psi_flags(sk, pi, 0);
}
/* page-server xfer */
static int write_pages_to_server(struct page_xfer *xfer,
int p, unsigned long len)
@@ -1179,11 +1184,9 @@ int request_remote_pages(int pid, unsigned long addr, int nr_pages)
.dst_id = pid,
};
/* We cannot use send_psi here because we have to use MSG_DONTWAIT */
if (send(page_server_sk, &pi, sizeof(pi), MSG_DONTWAIT) != sizeof(pi)) {
pr_perror("Can't write PSI to server");
/* XXX: why MSG_DONTWAIT here? */
if (send_psi_flags(page_server_sk, &pi, MSG_DONTWAIT))
return -1;
}
tcp_nodelay(page_server_sk, true);
return 0;