mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

colo-compare: compare the packet in a specified Connection

Browse Source 
A package from pri_indev or sec_indev only belongs to a particular
Connection, so we only need to compare the package in the specified
Connection's primary_list and secondary_list, rather than for each
the whole Connection list to compare. This is time-consuming and
unnecessary.

Less checkpoint more efficiency.

Cc: Zhang Chen <zhangckid@gmail.com>
Cc: Li Zhijian <lizhijian@cn.fujitsu.com>
Cc: Jason Wang <jasowang@redhat.com>
Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Mao Zhongyi 2017-10-13 14:32:07 +08:00 committed by Jason Wang
parent 8850d4caa7
commit 8ec1440202
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/colo-compare.c
View File

@ -136,7 +136,7 @@ static int colo_insert_packet(GQueue *queue, Packet *pkt)
* Return 0 on success, if return -1 means the pkt * Return 0 on success, if return -1 means the pkt
* is unsupported(arp and ipv6) and will be sent later * is unsupported(arp and ipv6) and will be sent later
*/ */
static int packet_enqueue(CompareState *s, int mode) static int packet_enqueue(CompareState *s, int mode, Connection **con)
{ {
ConnectionKey key; ConnectionKey key;
Packet *pkt = NULL; Packet *pkt = NULL;
@ -179,6 +179,7 @@ static int packet_enqueue(CompareState *s, int mode)
"drop packet"); "drop packet");
} }
} }
con = &conn;
return 0; return 0;
} }
@ -728,8 +729,9 @@ static void compare_set_vnet_hdr(Object *obj,
static void compare_pri_rs_finalize(SocketReadState *pri_rs) static void compare_pri_rs_finalize(SocketReadState *pri_rs)
{ {
CompareState *s = container_of(pri_rs, CompareState, pri_rs); CompareState *s = container_of(pri_rs, CompareState, pri_rs);
Connection *conn = NULL;
if (packet_enqueue(s, PRIMARY_IN)) { if (packet_enqueue(s, PRIMARY_IN, &conn)) {
trace_colo_compare_main("primary: unsupported packet in"); trace_colo_compare_main("primary: unsupported packet in");
compare_chr_send(s, compare_chr_send(s,
pri_rs->buf, pri_rs->buf,
@ -737,19 +739,20 @@ static void compare_pri_rs_finalize(SocketReadState *pri_rs)
pri_rs->vnet_hdr_len); pri_rs->vnet_hdr_len);
} else { } else {
/* compare connection */ /* compare connection */
g_queue_foreach(&s->conn_list, colo_compare_connection, s); colo_compare_connection(conn, s);
} }
} }
static void compare_sec_rs_finalize(SocketReadState *sec_rs) static void compare_sec_rs_finalize(SocketReadState *sec_rs)
{ {
CompareState *s = container_of(sec_rs, CompareState, sec_rs); CompareState *s = container_of(sec_rs, CompareState, sec_rs);
Connection *conn = NULL;
if (packet_enqueue(s, SECONDARY_IN)) { if (packet_enqueue(s, SECONDARY_IN, &conn)) {
trace_colo_compare_main("secondary: unsupported packet in"); trace_colo_compare_main("secondary: unsupported packet in");
} else { } else {
/* compare connection */ /* compare connection */
g_queue_foreach(&s->conn_list, colo_compare_connection, s); colo_compare_connection(conn, s);
} }
} }