Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-08-02 06:43:00 +00:00
Code Issues Projects Releases Wiki Activity

tcp: save the amount of unsent data in the socket send queue

Browse source 
TCP send queue contains two types of data:
* unacknowledged data, which have been sent out
* data, which have not been sent

Currently only the size of all data is save, but it's not enough for
proper restoring of TCP connections.

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin 2013-11-14 01:01:56 +04:00 • committed by Pavel Emelyanov
parent cf6d5d02a6
commit d917ff15bb
4 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cr-show.c
View file

@ -320,7 +320,7 @@ static struct show_image_info show_infos[] = {
SHOW_PLAIN(RLIMIT),
SHOW_PLAIN(TUNFILE),
{ TCP_STREAM_MAGIC, PB_TCP_STREAM, true, show_tcp_stream, "1:%u 2:%u 3:%u 4:%u", },
{ TCP_STREAM_MAGIC, PB_TCP_STREAM, true, show_tcp_stream, "1:%u 2:%u 3:%u 4:%u 12:%u", },
{ STATS_MAGIC, PB_STATS, true, NULL, "1.1:%u 1.2:%u 1.3:%u 1.4:%u 1.5:%Lu 1.6:%Lu 1.7:%Lu", },
{ FDINFO_MAGIC, PB_FDINFO, false, NULL, "flags:%#o fd:%d", },
{ UNIXSK_MAGIC, PB_UNIX_SK, false, NULL, "1:%#x 2:%#x 3:%d 4:%d 5:%d 6:%d 7:%d 8:%#x 11:S", },

3
include/sk-inet.h
View file

@ -24,7 +24,8 @@ struct inet_sk_desc {
unsigned int dst_port;
unsigned int state;
unsigned int rqlen;
unsigned int wqlen;
unsigned int wqlen; /* sent + unsent data */
unsigned int uwqlen; /* unsent data */
unsigned int src_addr[4];
unsigned int dst_addr[4];
unsigned short shutdown;

4
protobuf/tcp-stream.proto
View file

@ -1,7 +1,7 @@
message tcp_stream_entry {
required uint32 inq_len = 1;
required uint32 inq_seq = 2;
required uint32 outq_len = 3;
required uint32 outq_len = 3; /* unsent and sent data in the send queue*/
required uint32 outq_seq = 4;
required uint32 opt_mask = 5; /* TCPI_OPT_ bits */
@ -12,4 +12,6 @@ message tcp_stream_entry {
optional bool cork = 10;
optional bool nodelay = 11;
optional uint32 unsq_len = 12; /* unsent data in the send queue */
}

9
sk-tcp.c
View file

@ -94,6 +94,13 @@ static int refresh_inet_sk(struct inet_sk_desc *sk)
sk->wqlen = size;
if (ioctl(sk->rfd, SIOCOUTQNSD, &size) == -1) {
pr_perror("Unable to get size of unsent data");
return -1;
}
sk->uwqlen = size;
if (ioctl(sk->rfd, SIOCINQ, &size) == -1) {
pr_perror("Unable to get size of recv queue");
return -1;
@ -324,6 +331,8 @@ static int dump_tcp_conn_state(struct inet_sk_desc *sk)
pr_info("Reading outq for socket\n");
tse.outq_len = sk->wqlen;
tse.unsq_len = sk->uwqlen;
tse.has_unsq_len = true;
ret = tcp_stream_get_queue(sk->rfd, TCP_SEND_QUEUE,
&tse.outq_seq, tse.outq_len, &out_buf);
if (ret < 0)