[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/8] colo-compare: Insert packet into the suitable po
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 2/8] colo-compare: Insert packet into the suitable position of packet queue directly |
Date: |
Tue, 14 Nov 2017 10:11:32 +0800 |
From: Mao Zhongyi <address@hidden>
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 <address@hidden>
Cc: Li Zhijian <address@hidden>
Cc: Jason Wang <address@hidden>
Signed-off-by: Mao Zhongyi <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
net/colo-compare.c | 40 ++++++++++++++++++++++------------------
1 file changed, 22 insertions(+), 18 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index b3f35d7..54b6347 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -113,6 +113,26 @@ static gint seq_sorter(Packet *a, Packet *b, gpointer data)
}
/*
+ * 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");
}
--
2.7.4
- [Qemu-devel] [PULL 0/8] Net patches, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 1/8] net: fix check for number of parameters to -netdev socket, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 2/8] colo-compare: Insert packet into the suitable position of packet queue directly,
Jason Wang <=
- [Qemu-devel] [PULL 3/8] colo-compare: compare the packet in a specified Connection, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 4/8] colo-compare: Fix comments, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 6/8] Fix eepro100 simple transmission mode, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 5/8] colo: Consolidate the duplicate code chunk into a routine, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 7/8] Add new PCI ID for i82559a, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 8/8] net/socket: fix coverity issue, Jason Wang, 2017/11/13