diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-04-26 16:19:27 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-04-26 16:19:27 +0100 |
| commit | 51b9d495f2a99c65c9e524c8f6fe283ebfabae1d (patch) | |
| tree | cf7fa7454ebda6dd47c3ad9e30910d201ce0a691 | |
| parent | 41c7c7ef2936722258c7ccf06027daca499c113d (diff) | |
| download | qemu-51b9d495f2a99c65c9e524c8f6fe283ebfabae1d.tar.gz | |
Revert "COLO-compare: Optimize tcp compare trace event"
This reverts commit 0fc8aec7de64f2bf83a274a2a38b938ce03425d2.
In commit 2dfe5113b11 we split a trace event with a lot of arguments
in two, because the UST trace backend has a limit on the number
of arguments you can have in a single trace event. Unfortunately
we subsequently forgot about this, and in commit 0fc8aec7de64f2
we merged the two trace events again, recreating the "UST backend
doesn't build" bug.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | net/colo-compare.c | 29 | ||||
| -rw-r--r-- | net/trace-events | 3 |
2 files changed, 14 insertions, 18 deletions
diff --git a/net/colo-compare.c b/net/colo-compare.c index 03ddebe5d3..4ab80b1cbb 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -264,23 +264,18 @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt) res = -1; } - 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_tcp_info(ip_src, - ip_dst, - ntohl(ptcp->th_seq), - ntohl(stcp->th_seq), - ntohl(ptcp->th_ack), - ntohl(stcp->th_ack), - res, - ptcp->th_flags, - stcp->th_flags, - ppkt->size, - spkt->size); + 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); + + trace_colo_compare_pkt_info_dst(inet_ntoa(ppkt->ip->ip_dst), + ntohl(ptcp->th_seq), + ntohl(ptcp->th_ack), + res, ptcp->th_flags, + ppkt->size); qemu_hexdump((char *)ppkt->data, stderr, "colo-compare ppkt", ppkt->size); diff --git a/net/trace-events b/net/trace-events index 123cb28c63..35198bc742 100644 --- a/net/trace-events +++ b/net/trace-events @@ -13,7 +13,8 @@ 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_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" +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" # net/filter-rewriter.c colo_filter_rewriter_debug(void) "" |