OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

net/colo-compare.c: Fix comments and scheme 

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Zhang Chen 2017-09-05 14:31:06 +08:00 committed by Jason Wang
parent 626bba988a
commit 61c5f46959
1 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
net/colo-compare.c
View File

@ -41,27 +41,27 @@
#define REGULAR_PACKET_CHECK_MS 3000 #define REGULAR_PACKET_CHECK_MS 3000
/* /*
+ CompareState ++ * + CompareState ++
| | * | |
+---------------+ +---------------+ +---------------+ * +---------------+ +---------------+ +---------------+
|conn list +--->conn +--------->conn | * | conn list + - > conn + ------- > conn + -- > ......
+---------------+ +---------------+ +---------------+ * +---------------+ +---------------+ +---------------+
| | | | | | * | | | | | |
+---------------+ +---v----+ +---v----+ +---v----+ +---v----+ * +---------------+ +---v----+ +---v----+ +---v----+ +---v----+
|primary | |secondary |primary | |secondary * |primary | |secondary |primary | |secondary
|packet | |packet + |packet | |packet + * |packet | |packet + |packet | |packet +
+--------+ +--------+ +--------+ +--------+ * +--------+ +--------+ +--------+ +--------+
| | | | * | | | |
+---v----+ +---v----+ +---v----+ +---v----+ * +---v----+ +---v----+ +---v----+ +---v----+
|primary | |secondary |primary | |secondary * |primary | |secondary |primary | |secondary
|packet | |packet + |packet | |packet + * |packet | |packet + |packet | |packet +
+--------+ +--------+ +--------+ +--------+ * +--------+ +--------+ +--------+ +--------+
| | | | * | | | |
+---v----+ +---v----+ +---v----+ +---v----+ * +---v----+ +---v----+ +---v----+ +---v----+
|primary | |secondary |primary | |secondary * |primary | |secondary |primary | |secondary
|packet | |packet + |packet | |packet + * |packet | |packet + |packet | |packet +
+--------+ +--------+ +--------+ +--------+ * +--------+ +--------+ +--------+ +--------+
*/ */
typedef struct CompareState { typedef struct CompareState {
Object parent; Object parent;
@ -75,14 +75,14 @@ typedef struct CompareState {
SocketReadState sec_rs; SocketReadState sec_rs;
bool vnet_hdr; bool vnet_hdr;
/* connection list: the connections belonged to this NIC could be found /*
* in this list. * Record the connection that through the NIC
* element type: Connection * Element type: Connection
*/ */
GQueue conn_list; GQueue conn_list;
/* hashtable to save connection */ /* Record the connection without repetition */
GHashTable *connection_track_table; GHashTable *connection_track_table;
/* compare thread, a thread for each NIC */ /* This thread just do packet compare job */
QemuThread thread; QemuThread thread;
GMainContext *worker_context; GMainContext *worker_context;
@ -445,8 +445,11 @@ static int colo_old_packet_check_one_conn(Connection *conn,
(GCompareFunc)colo_old_packet_check_one); (GCompareFunc)colo_old_packet_check_one);
if (result) { if (result) {
/* do checkpoint will flush old packet */ /* Do checkpoint will flush old packet */
/* TODO: colo_notify_checkpoint();*/ /*
* TODO: Notify colo frame to do checkpoint.
* colo_compare_inconsistent_notify();
*/
return 0; return 0;
} }