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

page-xfer: stop waiting for a new command after a close command

Browse Source 
There is no reason to do that and in case of tls, __recv returns EAGAIN
instead of 0.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
This commit is contained in:
Andrei Vagin
2021-12-22 09:59:11 -08:00
parent 13b726ebc3
commit c59abfa81a
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
criu/page-xfer.c
View File

@@ -50,8 +50,8 @@ static void psi2iovec(struct page_server_iov *ps, struct iovec *iov)
#define PS_IOV_ADD_F 6
#define PS_IOV_GET 7
#define PS_IOV_FLUSH 0x1023
#define PS_IOV_FLUSH_N_CLOSE 0x1024
#define PS_IOV_CLOSE 0x1023
#define PS_IOV_FORCE_CLOSE 0x1024
#define PS_CMD_BITS 16
#define PS_CMD_MASK ((1 << PS_CMD_BITS) - 1)
@@ -1223,8 +1223,8 @@ static int page_server_serve(int sk)
ret = page_server_add(sk, &pi, flags);
break;
}
case PS_IOV_FLUSH:
case PS_IOV_FLUSH_N_CLOSE: {
case PS_IOV_CLOSE:
case PS_IOV_FORCE_CLOSE: {
int32_t status = 0;
ret = 0;
@@ -1250,7 +1250,9 @@ static int page_server_serve(int sk)
break;
}
if (ret || (pi.cmd == PS_IOV_FLUSH_N_CLOSE))
if (ret)
break;
if (pi.cmd == PS_IOV_CLOSE || pi.cmd == PS_IOV_FORCE_CLOSE)
break;
}
@@ -1491,9 +1493,9 @@ int disconnect_from_page_server(void)
* the parent process) so we must order the
* page-server to terminate itself.
*/
pi.cmd = PS_IOV_FLUSH_N_CLOSE;
pi.cmd = PS_IOV_FORCE_CLOSE;
else
pi.cmd = PS_IOV_FLUSH;
pi.cmd = PS_IOV_CLOSE;
if (send_psi(page_server_sk, &pi))
goto out;