Commit 8850d4ca authored by Mao Zhongyi's avatar Mao Zhongyi Committed by Jason Wang
Browse files

colo-compare: Insert packet into the suitable position of packet queue directly 



Currently, a packet from pri_dev or sec_dev is fristly pushed at the
tail of the primary or secondary packet queue then sorted by the tcp
sequence number.

Now, this patch use g_queue_insert_sorted to insert the packet directly
into the suitable position to avoid ordering all packets each time when
a new packet is comming, thereby increasing efficiency.

In addition, consolidate the code that add a packet to the list of
Connection (primary or secondary) into a separate routine colo_insert_packet()
since the same chunk of code is called from two place.

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 avatarZhang Chen <zhangckid@gmail.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent ff86d576

net/colo-compare.c

+22 −18
Original line number Diff line number Diff line
@@ -112,6 +112,26 @@ static gint seq_sorter(Packet *a, Packet *b, gpointer data) 
    return ntohl(atcp->th_seq) - ntohl(btcp->th_seq);

}



/*

 * Return 1 on success, if return 0 means the

 * packet will be dropped

 */

static int colo_insert_packet(GQueue *queue, Packet *pkt)

{

    if (g_queue_get_length(queue) <= MAX_QUEUE_SIZE) {

        if (pkt->ip->ip_p == IPPROTO_TCP) {

            g_queue_insert_sorted(queue,

                                  pkt,

                                  (GCompareDataFunc)seq_sorter,

                                  NULL);

        } else {

            g_queue_push_tail(queue, pkt);

        }

        return 1;

    }

    return 0;

}



/*

 * Return 0 on success, if return -1 means the pkt

 * is unsupported(arp and ipv6) and will be sent later
@@ -149,28 +169,12 @@ static int packet_enqueue(CompareState *s, int mode) 
    }



    if (mode == PRIMARY_IN) {

        if (g_queue_get_length(&conn->primary_list) <=

                               MAX_QUEUE_SIZE) {

            g_queue_push_tail(&conn->primary_list, pkt);

            if (conn->ip_proto == IPPROTO_TCP) {

                g_queue_sort(&conn->primary_list,

                             (GCompareDataFunc)seq_sorter,

                             NULL);

            }

        } else {

        if (!colo_insert_packet(&conn->primary_list, pkt)) {

            error_report("colo compare primary queue size too big,"

                         "drop packet");

        }

    } else {

        if (g_queue_get_length(&conn->secondary_list) <=

                               MAX_QUEUE_SIZE) {

            g_queue_push_tail(&conn->secondary_list, pkt);

            if (conn->ip_proto == IPPROTO_TCP) {

                g_queue_sort(&conn->secondary_list,

                             (GCompareDataFunc)seq_sorter,

                             NULL);

            }

        } else {

        if (!colo_insert_packet(&conn->secondary_list, pkt)) {

            error_report("colo compare secondary queue size too big,"

                         "drop packet");

        }