[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V4 03/16] colo-compare: use notifier to notify packe
From: |
Zhang Chen |
Subject: |
[Qemu-devel] [PATCH V4 03/16] colo-compare: use notifier to notify packets comparing result |
Date: |
Fri, 19 Jan 2018 21:44:32 +0800 |
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: zhanghailiang <address@hidden>
---
net/colo-compare.c | 32 +++++++++++++++++++++++++-------
net/colo-compare.h | 2 ++
2 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 4bceca8..ba9bc71 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -31,6 +31,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) \
@@ -39,6 +40,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
@@ -452,8 +456,24 @@ static int colo_old_packet_check_one(Packet *pkt, int64_t
*check_time)
}
}
+static void colo_compare_inconsistent_notify(void)
+{
+ notifier_list_notify(&colo_compare_notifiers,
+ migrate_get_current());
+}
+
+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;
@@ -464,10 +484,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_inconsistent_notify();
return 0;
}
@@ -542,11 +559,12 @@ static void colo_compare_connection(void *opaque, void
*user_data)
/*
* 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_inconsistent_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.7.4
- [Qemu-devel] [PATCH V4 00/16] COLO: integrate colo frame with block replication and COLO proxy, Zhang Chen, 2018/01/19
- [Qemu-devel] [PATCH V4 01/16] filter-rewriter: fix memory leak for connection in connection_track_table, Zhang Chen, 2018/01/19
- [Qemu-devel] [PATCH V4 02/16] colo-compare: implement the process of checkpoint, Zhang Chen, 2018/01/19
- [Qemu-devel] [PATCH V4 03/16] colo-compare: use notifier to notify packets comparing result,
Zhang Chen <=
- [Qemu-devel] [PATCH V4 04/16] COLO: integrate colo compare with colo frame, Zhang Chen, 2018/01/19
- [Qemu-devel] [PATCH V4 05/16] COLO: Add block replication into colo process, Zhang Chen, 2018/01/19
- [Qemu-devel] [PATCH V4 06/16] COLO: Remove colo_state migration struct, Zhang Chen, 2018/01/19
- [Qemu-devel] [PATCH V4 07/16] COLO: Load dirty pages into SVM's RAM cache firstly, Zhang Chen, 2018/01/19
- [Qemu-devel] [PATCH V4 08/16] ram/COLO: Record the dirty pages that SVM received, Zhang Chen, 2018/01/19
- [Qemu-devel] [PATCH V4 09/16] COLO: Flush memory data from ram cache, Zhang Chen, 2018/01/19
- [Qemu-devel] [PATCH V4 10/16] qmp event: Add COLO_EXIT event to notify users while exited COLO, Zhang Chen, 2018/01/19
- [Qemu-devel] [PATCH V4 11/16] savevm: split the process of different stages for loadvm/savevm, Zhang Chen, 2018/01/19
- [Qemu-devel] [PATCH V4 12/16] COLO: flush host dirty ram from cache, Zhang Chen, 2018/01/19
- [Qemu-devel] [PATCH V4 13/16] filter: Add handle_event method for NetFilterClass, Zhang Chen, 2018/01/19