[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/26] colo-compare: use notifier to notify packets c
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 03/26] colo-compare: use notifier to notify packets comparing result |
Date: |
Mon, 15 Oct 2018 16:46:03 +0800 |
From: Zhang Chen <address@hidden>
It's a good idea to use notifier to notify COLO frame of
inconsistent packets comparing.
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
net/colo-compare.c | 37 ++++++++++++++++++++++++++-----------
net/colo-compare.h | 2 ++
2 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 80e6532..3f7e240 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -29,6 +29,7 @@
#include "sysemu/iothread.h"
#include "net/colo-compare.h"
#include "migration/colo.h"
+#include "migration/migration.h"
#define TYPE_COLO_COMPARE "colo-compare"
#define COLO_COMPARE(obj) \
@@ -37,6 +38,9 @@
static QTAILQ_HEAD(, CompareState) net_compares =
QTAILQ_HEAD_INITIALIZER(net_compares);
+static NotifierList colo_compare_notifiers =
+ NOTIFIER_LIST_INITIALIZER(colo_compare_notifiers);
+
#define COMPARE_READ_LEN_MAX NET_BUFSIZE
#define MAX_QUEUE_SIZE 1024
@@ -326,6 +330,12 @@ static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spkt,
return false;
}
+static void colo_compare_inconsistency_notify(void)
+{
+ notifier_list_notify(&colo_compare_notifiers,
+ migrate_get_current());
+}
+
static void colo_compare_tcp(CompareState *s, Connection *conn)
{
Packet *ppkt = NULL, *spkt = NULL;
@@ -427,10 +437,7 @@ sec:
qemu_hexdump((char *)spkt->data, stderr,
"colo-compare spkt", spkt->size);
- /*
- * colo_compare_inconsistent_notify();
- * TODO: notice to checkpoint();
- */
+ colo_compare_inconsistency_notify();
}
}
@@ -561,8 +568,18 @@ static int colo_old_packet_check_one(Packet *pkt, int64_t
*check_time)
}
}
+void colo_compare_register_notifier(Notifier *notify)
+{
+ notifier_list_add(&colo_compare_notifiers, notify);
+}
+
+void colo_compare_unregister_notifier(Notifier *notify)
+{
+ notifier_remove(notify);
+}
+
static int colo_old_packet_check_one_conn(Connection *conn,
- void *user_data)
+ void *user_data)
{
GList *result = NULL;
int64_t check_time = REGULAR_PACKET_CHECK_MS;
@@ -573,10 +590,7 @@ static int colo_old_packet_check_one_conn(Connection *conn,
if (result) {
/* Do checkpoint will flush old packet */
- /*
- * TODO: Notify colo frame to do checkpoint.
- * colo_compare_inconsistent_notify();
- */
+ colo_compare_inconsistency_notify();
return 0;
}
@@ -620,11 +634,12 @@ static void colo_compare_packet(CompareState *s,
Connection *conn,
/*
* If one packet arrive late, the secondary_list or
* primary_list will be empty, so we can't compare it
- * until next comparison.
+ * until next comparison. If the packets in the list are
+ * timeout, it will trigger a checkpoint request.
*/
trace_colo_compare_main("packet different");
g_queue_push_head(&conn->primary_list, pkt);
- /* TODO: colo_notify_checkpoint();*/
+ colo_compare_inconsistency_notify();
break;
}
}
diff --git a/net/colo-compare.h b/net/colo-compare.h
index 1b1ce76..22ddd51 100644
--- a/net/colo-compare.h
+++ b/net/colo-compare.h
@@ -18,5 +18,7 @@
#define QEMU_COLO_COMPARE_H
void colo_notify_compares_event(void *opaque, int event, Error **errp);
+void colo_compare_register_notifier(Notifier *notify);
+void colo_compare_unregister_notifier(Notifier *notify);
#endif /* QEMU_COLO_COMPARE_H */
--
2.5.0
- [Qemu-devel] [PULL 01/26] filter-rewriter: Add TCP state machine and fix memory leak in connection_track_table, (continued)
- [Qemu-devel] [PULL 01/26] filter-rewriter: Add TCP state machine and fix memory leak in connection_track_table, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 09/26] COLO: Flush memory data from ram cache, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 02/26] colo-compare: implement the process of checkpoint, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 08/26] ram/COLO: Record the dirty pages that SVM received, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 11/26] qapi/migration.json: Rename COLO unknown mode to none mode., Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 04/26] COLO: integrate colo compare with colo frame, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 10/26] qmp event: Add COLO_EXIT event to notify users while exited COLO, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 05/26] COLO: Add block replication into colo process, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 14/26] COLO: flush host dirty ram from cache, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 18/26] COLO: quick failover process by kick COLO thread, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 03/26] colo-compare: use notifier to notify packets comparing result,
Jason Wang <=
- [Qemu-devel] [PULL 15/26] filter: Add handle_event method for NetFilterClass, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 19/26] docs: Add COLO status diagram to COLO-FT.txt, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 13/26] savevm: split the process of different stages for loadvm/savevm, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 12/26] qapi: Add new command to query colo status, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 17/26] COLO: notify net filters about checkpoint/failover event, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 07/26] COLO: Load dirty pages into SVM's RAM cache firstly, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 20/26] clean up callback when del virtqueue, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 06/26] COLO: Remove colo_state migration struct, Jason Wang, 2018/10/15
- [Qemu-devel] [PULL 22/26] rtl8139: fix possible out of bound access, Jason Wang, 2018/10/15