Commit 0fc8aec7 authored by Zhang Chen's avatar Zhang Chen Committed by Jason Wang
Browse files

COLO-compare: Optimize tcp compare trace event 



Optimize two trace events as one, adjust print format make
it easy to read. rename trace_colo_compare_pkt_info_src/dst
to trace_colo_compare_tcp_info.

Signed-off-by: default avatarZhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent 184d4d42

net/colo-compare.c

+17 −12
Original line number Diff line number Diff line
@@ -264,18 +264,23 @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt) 
        res = -1;

    }



    if (res != 0 && trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) {

        trace_colo_compare_pkt_info_src(inet_ntoa(ppkt->ip->ip_src),

                                        ntohl(stcp->th_seq),

                                        ntohl(stcp->th_ack),

                                        res, stcp->th_flags,

                                        spkt->size);

    if (res && trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) {

        char ip_src[20], ip_dst[20];



        strcpy(ip_src, inet_ntoa(ppkt->ip->ip_src));

        strcpy(ip_dst, inet_ntoa(ppkt->ip->ip_dst));



        trace_colo_compare_pkt_info_dst(inet_ntoa(ppkt->ip->ip_dst),

        trace_colo_compare_tcp_info(ip_src,

                                    ip_dst,

                                    ntohl(ptcp->th_seq),

                                    ntohl(stcp->th_seq),

                                    ntohl(ptcp->th_ack),

                                        res, ptcp->th_flags,

                                        ppkt->size);

                                    ntohl(stcp->th_ack),

                                    res,

                                    ptcp->th_flags,

                                    stcp->th_flags,

                                    ppkt->size,

                                    spkt->size);



        qemu_hexdump((char *)ppkt->data, stderr,

                     "colo-compare ppkt", ppkt->size);

net/trace-events

+1 −2
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ colo_compare_icmp_miscompare(const char *sta, int size) ": %s = %d" 
colo_compare_ip_info(int psize, const char *sta, const char *stb, int ssize, const char *stc, const char *std) "ppkt size = %d, ip_src = %s, ip_dst = %s, spkt size = %d, ip_src = %s, ip_dst = %s"

colo_old_packet_check_found(int64_t old_time) "%" PRId64

colo_compare_miscompare(void) ""

colo_compare_pkt_info_src(const char *src, uint32_t sseq, uint32_t sack, int res, uint32_t sflag, int ssize) "src/dst: %s s: seq/ack=%u/%u res=%d flags=%x spkt_size: %d\n"

colo_compare_pkt_info_dst(const char *dst, uint32_t dseq, uint32_t dack, int res, uint32_t dflag, int dsize) "src/dst: %s d: seq/ack=%u/%u res=%d flags=%x dpkt_size: %d\n"

colo_compare_tcp_info(const char *src, const char *dst, uint32_t pseq, uint32_t sseq, uint32_t pack, uint32_t sack, int res, uint32_t pflag, uint32_t sflag, int psize, int ssize) "src/dst: %s/%s pseq/sseq:%u/%u pack/sack:%u/%u res=%d pflags/sflag:%x/%x psize/ssize:%d/%d \n"



# net/filter-rewriter.c

colo_filter_rewriter_debug(void) ""