Commit 8ec14402 authored by Mao Zhongyi's avatar Mao Zhongyi Committed by Jason Wang
Browse files

colo-compare: compare the packet in a specified Connection 



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: default avatarMao Zhongyi <maozy.fnst@cn.fujitsu.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent 8850d4ca

net/colo-compare.c

+8 −5
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static int colo_insert_packet(GQueue *queue, Packet *pkt) 
 * Return 0 on success, if return -1 means the pkt

 * 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;

    Packet *pkt = NULL;
@@ -179,6 +179,7 @@ static int packet_enqueue(CompareState *s, int mode) 
                         "drop packet");

        }

    }

    con = &conn;



    return 0;

}
@@ -728,8 +729,9 @@ static void compare_set_vnet_hdr(Object *obj, 
static void compare_pri_rs_finalize(SocketReadState *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");

        compare_chr_send(s,

                         pri_rs->buf,
@@ -737,19 +739,20 @@ static void compare_pri_rs_finalize(SocketReadState *pri_rs) 
                         pri_rs->vnet_hdr_len);

    } else {

        /* 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)

{

    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");

    } else {

        /* compare connection */

        g_queue_foreach(&s->conn_list, colo_compare_connection, s);

        colo_compare_connection(conn, s);

    }

}