{"id":811302,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811302/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504836324-4871-16-git-send-email-jasowang@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504836324-4871-16-git-send-email-jasowang@redhat.com>","list_archive_url":null,"date":"2017-09-08T02:05:21","name":"[PULL,15/18] net/colo-compare.c: Fix comments and scheme","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ae322d293a565e4996825acb500cd40cf2948b41","submitter":{"id":5225,"url":"http://patchwork.ozlabs.org/api/1.2/people/5225/?format=json","name":"Jason Wang","email":"jasowang@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504836324-4871-16-git-send-email-jasowang@redhat.com/mbox/","series":[{"id":2087,"url":"http://patchwork.ozlabs.org/api/1.2/series/2087/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2087","date":"2017-09-08T02:05:06","name":"[PULL,01/18] net/filter-rewriter.c: Fix rewirter checksum bug when use virtio-net","version":1,"mbox":"http://patchwork.ozlabs.org/series/2087/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811302/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811302/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=jasowang@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xpLbq31bDz9s83\n\tfor ;\n\tFri, 8 Sep 2017 12:19:03 +1000 (AEST)","from localhost ([::1]:42996 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dq8sn-0006Hv-Hn\n\tfor incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 22:19:01 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:32945)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dq8gq-0003l7-6U\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:44 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dq8gl-0002dS-DH\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:40 -0400","from mx1.redhat.com ([209.132.183.28]:56108)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dq8gl-0002cs-4x\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:35 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 416DF81DFA;\n\tFri, 8 Sep 2017 02:06:34 +0000 (UTC)","from jason-ThinkPad-T450s.redhat.com (ovpn-12-98.pek2.redhat.com\n\t[10.72.12.98])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id BBFCD600C2;\n\tFri, 8 Sep 2017 02:06:31 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 416DF81DFA","From":"Jason Wang ","To":"peter.maydell@linaro.org,\n\tqemu-devel@nongnu.org","Date":"Fri, 8 Sep 2017 10:05:21 +0800","Message-Id":"<1504836324-4871-16-git-send-email-jasowang@redhat.com>","In-Reply-To":"<1504836324-4871-1-git-send-email-jasowang@redhat.com>","References":"<1504836324-4871-1-git-send-email-jasowang@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tFri, 08 Sep 2017 02:06:34 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 15/18] net/colo-compare.c: Fix comments and\n\tscheme","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Jason Wang ,\n\tZhang Chen ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Zhang Chen \n\nSigned-off-by: Zhang Chen \nSigned-off-by: Jason Wang \n---\n net/colo-compare.c | 59 ++++++++++++++++++++++++++++--------------------------\n 1 file changed, 31 insertions(+), 28 deletions(-)","diff":"diff --git a/net/colo-compare.c b/net/colo-compare.c\nindex f480315..eee33b8 100644\n--- a/net/colo-compare.c\n+++ b/net/colo-compare.c\n@@ -41,27 +41,27 @@\n #define REGULAR_PACKET_CHECK_MS 3000\n \n /*\n- + CompareState ++\n- | |\n- +---------------+ +---------------+ +---------------+\n- |conn list +--->conn +--------->conn |\n- +---------------+ +---------------+ +---------------+\n- | | | | | |\n- +---------------+ +---v----+ +---v----+ +---v----+ +---v----+\n- |primary | |secondary |primary | |secondary\n- |packet | |packet + |packet | |packet +\n- +--------+ +--------+ +--------+ +--------+\n- | | | |\n- +---v----+ +---v----+ +---v----+ +---v----+\n- |primary | |secondary |primary | |secondary\n- |packet | |packet + |packet | |packet +\n- +--------+ +--------+ +--------+ +--------+\n- | | | |\n- +---v----+ +---v----+ +---v----+ +---v----+\n- |primary | |secondary |primary | |secondary\n- |packet | |packet + |packet | |packet +\n- +--------+ +--------+ +--------+ +--------+\n-*/\n+ * + CompareState ++\n+ * | |\n+ * +---------------+ +---------------+ +---------------+\n+ * | conn list + - > conn + ------- > conn + -- > ......\n+ * +---------------+ +---------------+ +---------------+\n+ * | | | | | |\n+ * +---------------+ +---v----+ +---v----+ +---v----+ +---v----+\n+ * |primary | |secondary |primary | |secondary\n+ * |packet | |packet + |packet | |packet +\n+ * +--------+ +--------+ +--------+ +--------+\n+ * | | | |\n+ * +---v----+ +---v----+ +---v----+ +---v----+\n+ * |primary | |secondary |primary | |secondary\n+ * |packet | |packet + |packet | |packet +\n+ * +--------+ +--------+ +--------+ +--------+\n+ * | | | |\n+ * +---v----+ +---v----+ +---v----+ +---v----+\n+ * |primary | |secondary |primary | |secondary\n+ * |packet | |packet + |packet | |packet +\n+ * +--------+ +--------+ +--------+ +--------+\n+ */\n typedef struct CompareState {\n Object parent;\n \n@@ -75,14 +75,14 @@ typedef struct CompareState {\n SocketReadState sec_rs;\n bool vnet_hdr;\n \n- /* connection list: the connections belonged to this NIC could be found\n- * in this list.\n- * element type: Connection\n+ /*\n+ * Record the connection that through the NIC\n+ * Element type: Connection\n */\n GQueue conn_list;\n- /* hashtable to save connection */\n+ /* Record the connection without repetition */\n GHashTable *connection_track_table;\n- /* compare thread, a thread for each NIC */\n+ /* This thread just do packet compare job */\n QemuThread thread;\n \n GMainContext *worker_context;\n@@ -445,8 +445,11 @@ static int colo_old_packet_check_one_conn(Connection *conn,\n (GCompareFunc)colo_old_packet_check_one);\n \n if (result) {\n- /* do checkpoint will flush old packet */\n- /* TODO: colo_notify_checkpoint();*/\n+ /* Do checkpoint will flush old packet */\n+ /*\n+ * TODO: Notify colo frame to do checkpoint.\n+ * colo_compare_inconsistent_notify();\n+ */\n return 0;\n }\n \n","prefixes":["PULL","15/18"]}