[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/5] colo-compare: sort TCP packet queue by sequence
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 3/5] colo-compare: sort TCP packet queue by sequence number |
Date: |
Wed, 15 Feb 2017 11:53:20 +0800 |
From: Zhang Chen <address@hidden>
Improve efficiency of TCP packet comparison.
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
net/colo-compare.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 4962976..162fd6a 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -101,6 +101,15 @@ static int compare_chr_send(CharBackend *out,
const uint8_t *buf,
uint32_t size);
+static gint seq_sorter(Packet *a, Packet *b, gpointer data)
+{
+ struct tcphdr *atcp, *btcp;
+
+ atcp = (struct tcphdr *)(a->transport_header);
+ btcp = (struct tcphdr *)(b->transport_header);
+ return ntohl(atcp->th_seq) - ntohl(btcp->th_seq);
+}
+
/*
* Return 0 on success, if return -1 means the pkt
* is unsupported(arp and ipv6) and will be sent later
@@ -137,6 +146,11 @@ static int packet_enqueue(CompareState *s, int mode)
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 {
error_report("colo compare primary queue size too big,"
"drop packet");
@@ -145,6 +159,11 @@ static int packet_enqueue(CompareState *s, int mode)
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 {
error_report("colo compare secondary queue size too big,"
"drop packet");
--
2.7.4
- [Qemu-devel] [PULL 0/5] Net patches, Jason Wang, 2017/02/14
- [Qemu-devel] [PULL 1/5] net: Mark 'vlan' parameter as deprecated, Jason Wang, 2017/02/14
- [Qemu-devel] [PULL 2/5] net: e1000e: fix dead code in e1000e_write_packet_to_guest, Jason Wang, 2017/02/14
- [Qemu-devel] [PULL 3/5] colo-compare: sort TCP packet queue by sequence number,
Jason Wang <=
- [Qemu-devel] [PULL 4/5] net: imx: limit buffer descriptor count, Jason Wang, 2017/02/14
- [Qemu-devel] [PULL 5/5] net: e1000e: fix an infinite loop issue, Jason Wang, 2017/02/14
- Re: [Qemu-devel] [PULL 0/5] Net patches, Peter Maydell, 2017/02/16