Commit 170f75ad authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Stefan Hajnoczi
Browse files

trace: move colo trace events to net/ sub-directory 



The colo patch series added various trace events to the top
level trace-events file, despite the files using them being
in a sub-dir.

  commit 30656b09
  Author: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
  Date:   Tue Sep 27 10:22:34 2016 +0800

    filter-rewriter: rewrite tcp packet to keep secondary connection

  commit f4b61836
  Author: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
  Date:   Tue Sep 27 10:22:31 2016 +0800

    colo-compare: add TCP, UDP, ICMP packet comparison

    We add TCP,UDP,ICMP packet comparison to replace
    IP packet comparison. This can increase the
    accuracy of the package comparison.
    Less checkpoint more efficiency.

    Signed-off-by: default avatarZhang Chen <zhangchen.fnst@cn.fujitsu.com>
    Signed-off-by: default avatarLi Zhijian <lizhijian@cn.fujitsu.com>
    Signed-off-by: default avatarWen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: default avatarJason Wang <jasowang@redhat.com>

  commit 0682e15b
  Author: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
  Date:   Tue Sep 27 10:22:30 2016 +0800

    colo-compare: introduce packet comparison thread

  commit 59509ec1
  Author: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
  Date:   Tue Sep 27 10:22:27 2016 +0800

    net/colo.c: add colo.c to define and handle packet

This moves all events into net/trace-events where they
were supposed to live.

Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Message-id: 1475588159-30598-2-git-send-email-berrange@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 627eae7d

net/trace-events

+16 −0
Original line number Diff line number Diff line
@@ -2,3 +2,19 @@ 


# net/vhost-user.c

vhost_user_event(const char *chr, int event) "chr: %s got event: %d"



# net/colo.c

colo_proxy_main(const char *chr) ": %s"



# net/colo-compare.c

colo_compare_main(const char *chr) ": %s"

colo_compare_udp_miscompare(const char *sta, int size) ": %s = %d"

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



# net/filter-rewriter.c

colo_filter_rewriter_debug(void) ""

colo_filter_rewriter_pkt_info(const char *func, const char *src, const char *dst, uint32_t seq, uint32_t ack, uint32_t flag) "%s: src/dst: %s/%s p: seq/ack=%u/%u  flags=%x\n"

colo_filter_rewriter_conn_offset(uint32_t offset) ": offset=%u\n"

trace-events

+0 −16
Original line number Diff line number Diff line
@@ -122,22 +122,6 @@ memory_region_subpage_write(int cpu_index, void *mr, uint64_t offset, uint64_t v 
memory_region_tb_read(int cpu_index, uint64_t addr, uint64_t value, unsigned size) "cpu %d addr %#"PRIx64" value %#"PRIx64" size %u"

memory_region_tb_write(int cpu_index, uint64_t addr, uint64_t value, unsigned size) "cpu %d addr %#"PRIx64" value %#"PRIx64" size %u"



# net/colo.c

colo_proxy_main(const char *chr) ": %s"



# net/colo-compare.c

colo_compare_main(const char *chr) ": %s"

colo_compare_udp_miscompare(const char *sta, int size) ": %s = %d"

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



# net/filter-rewriter.c

colo_filter_rewriter_debug(void) ""

colo_filter_rewriter_pkt_info(const char *func, const char *src, const char *dst, uint32_t seq, uint32_t ack, uint32_t flag) "%s: src/dst: %s/%s p: seq/ack=%u/%u  flags=%x\n"

colo_filter_rewriter_conn_offset(uint32_t offset) ": offset=%u\n"



### Guest events, keep at bottom