[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/18] net/colo-compare.c: Fix comments and scheme
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 15/18] net/colo-compare.c: Fix comments and scheme |
Date: |
Fri, 8 Sep 2017 10:05:21 +0800 |
From: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
net/colo-compare.c | 59 ++++++++++++++++++++++++++++--------------------------
1 file changed, 31 insertions(+), 28 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index f480315..eee33b8 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -41,27 +41,27 @@
#define REGULAR_PACKET_CHECK_MS 3000
/*
- + CompareState ++
- | |
- +---------------+ +---------------+ +---------------+
- |conn list +--->conn +--------->conn |
- +---------------+ +---------------+ +---------------+
- | | | | | |
- +---------------+ +---v----+ +---v----+ +---v----+ +---v----+
- |primary | |secondary |primary | |secondary
- |packet | |packet + |packet | |packet +
- +--------+ +--------+ +--------+ +--------+
- | | | |
- +---v----+ +---v----+ +---v----+ +---v----+
- |primary | |secondary |primary | |secondary
- |packet | |packet + |packet | |packet +
- +--------+ +--------+ +--------+ +--------+
- | | | |
- +---v----+ +---v----+ +---v----+ +---v----+
- |primary | |secondary |primary | |secondary
- |packet | |packet + |packet | |packet +
- +--------+ +--------+ +--------+ +--------+
-*/
+ * + CompareState ++
+ * | |
+ * +---------------+ +---------------+ +---------------+
+ * | conn list + - > conn + ------- > conn + -- > ......
+ * +---------------+ +---------------+ +---------------+
+ * | | | | | |
+ * +---------------+ +---v----+ +---v----+ +---v----+ +---v----+
+ * |primary | |secondary |primary | |secondary
+ * |packet | |packet + |packet | |packet +
+ * +--------+ +--------+ +--------+ +--------+
+ * | | | |
+ * +---v----+ +---v----+ +---v----+ +---v----+
+ * |primary | |secondary |primary | |secondary
+ * |packet | |packet + |packet | |packet +
+ * +--------+ +--------+ +--------+ +--------+
+ * | | | |
+ * +---v----+ +---v----+ +---v----+ +---v----+
+ * |primary | |secondary |primary | |secondary
+ * |packet | |packet + |packet | |packet +
+ * +--------+ +--------+ +--------+ +--------+
+ */
typedef struct CompareState {
Object parent;
@@ -75,14 +75,14 @@ typedef struct CompareState {
SocketReadState sec_rs;
bool vnet_hdr;
- /* connection list: the connections belonged to this NIC could be found
- * in this list.
- * element type: Connection
+ /*
+ * Record the connection that through the NIC
+ * Element type: Connection
*/
GQueue conn_list;
- /* hashtable to save connection */
+ /* Record the connection without repetition */
GHashTable *connection_track_table;
- /* compare thread, a thread for each NIC */
+ /* This thread just do packet compare job */
QemuThread thread;
GMainContext *worker_context;
@@ -445,8 +445,11 @@ static int colo_old_packet_check_one_conn(Connection *conn,
(GCompareFunc)colo_old_packet_check_one);
if (result) {
- /* do checkpoint will flush old packet */
- /* TODO: colo_notify_checkpoint();*/
+ /* Do checkpoint will flush old packet */
+ /*
+ * TODO: Notify colo frame to do checkpoint.
+ * colo_compare_inconsistent_notify();
+ */
return 0;
}
--
2.7.4
- [Qemu-devel] [PULL 05/18] net/rocker: Fix the unusual macro name, (continued)
- [Qemu-devel] [PULL 05/18] net/rocker: Fix the unusual macro name, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 06/18] net: rtl8139: do not use old_mmio accesses, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 07/18] MAINTAINERS: Update mail address for COLO Proxy, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 08/18] net/socket: Don't treat odd socket type as SOCK_STREAM, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 09/18] net/socket: Convert several helper functions to Error, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 10/18] net/net: Convert parse_host_port() to Error, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 12/18] e1000: Rename the SEC symbol to SEQEC, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 11/18] net/socket: Improve -net socket error reporting, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 13/18] net/colo-compare.c: Optimize unpredictable tcp options comparison, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 14/18] net/colo-compare.c: Adjust net queue pop order for performance, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 15/18] net/colo-compare.c: Fix comments and scheme,
Jason Wang <=
- [Qemu-devel] [PULL 16/18] qemu-iothread: IOThread supports the GMainContext event loop, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 17/18] colo-compare: Use IOThread to Check old packet regularly and Process pactkets of the primary, Jason Wang, 2017/09/07
- [Qemu-devel] [PULL 18/18] colo-compare: Update the COLO document to add the IOThread configuration, Jason Wang, 2017/09/07
- Re: [Qemu-devel] [PULL 00/18] Net patches, Peter Maydell, 2017/09/08