haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

colo-compare: use notifier to notify packets comparing result

Browse source 
It's a good idea to use notifier to notify COLO frame of
inconsistent packets comparing.

Signed-off-by: Zhang Chen <zhangckid@gmail.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Zhang Chen 2018-09-03 12:38:44 +08:00 committed by Jason Wang
parent 0ffcece325
commit dccd0313b6
2 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
net/colo-compare.c
View file

@ -29,6 +29,7 @@
#include "sysemu/iothread.h" #include "sysemu/iothread.h"
#include "net/colo-compare.h" #include "net/colo-compare.h"
#include "migration/colo.h" #include "migration/colo.h"
#include "migration/migration.h"
#define TYPE_COLO_COMPARE "colo-compare" #define TYPE_COLO_COMPARE "colo-compare"
#define COLO_COMPARE(obj) \ #define COLO_COMPARE(obj) \
@ -37,6 +38,9 @@
static QTAILQ_HEAD(, CompareState) net_compares = static QTAILQ_HEAD(, CompareState) net_compares =
QTAILQ_HEAD_INITIALIZER(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 COMPARE_READ_LEN_MAX NET_BUFSIZE
#define MAX_QUEUE_SIZE 1024 #define MAX_QUEUE_SIZE 1024
@ -326,6 +330,12 @@ static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spkt,
return false; 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) static void colo_compare_tcp(CompareState *s, Connection *conn)
{ {
Packet *ppkt = NULL, *spkt = NULL; Packet *ppkt = NULL, *spkt = NULL;
@ -427,10 +437,7 @@ sec:
qemu_hexdump((char *)spkt->data, stderr, qemu_hexdump((char *)spkt->data, stderr,
"colo-compare spkt", spkt->size); "colo-compare spkt", spkt->size);
/* colo_compare_inconsistency_notify();
* colo_compare_inconsistent_notify();
* TODO: notice to checkpoint();
*/
} }
} }
@ -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, static int colo_old_packet_check_one_conn(Connection *conn,
void *user_data) void *user_data)
{ {
GList *result = NULL; GList *result = NULL;
int64_t check_time = REGULAR_PACKET_CHECK_MS; int64_t check_time = REGULAR_PACKET_CHECK_MS;
@ -573,10 +590,7 @@ static int colo_old_packet_check_one_conn(Connection *conn,
if (result) { if (result) {
/* Do checkpoint will flush old packet */ /* Do checkpoint will flush old packet */
/* colo_compare_inconsistency_notify();
* TODO: Notify colo frame to do checkpoint.
* colo_compare_inconsistent_notify();
*/
return 0; return 0;
} }
@ -620,11 +634,12 @@ static void colo_compare_packet(CompareState *s, Connection *conn,
/* /*
* If one packet arrive late, the secondary_list or * If one packet arrive late, the secondary_list or
* primary_list will be empty, so we can't compare it * 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"); trace_colo_compare_main("packet different");
g_queue_push_head(&conn->primary_list, pkt); g_queue_push_head(&conn->primary_list, pkt);
/* TODO: colo_notify_checkpoint();*/ colo_compare_inconsistency_notify();
break; break;
} }
} }

2
net/colo-compare.h
View file

@ -18,5 +18,7 @@
#define QEMU_COLO_COMPARE_H #define QEMU_COLO_COMPARE_H
void colo_notify_compares_event(void *opaque, int event, Error **errp); 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 */ #endif /* QEMU_COLO_COMPARE_H */