{"id":809523,"url":"http://patchwork.ozlabs.org/api/1.0/patches/809523/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/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":""},"msgid":"<1504505688-32455-4-git-send-email-zhangchen.fnst@cn.fujitsu.com>","date":"2017-09-04T06:14:48","name":"[V5,3/3] net/colo-compare.c: Fix comments and scheme","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ae322d293a565e4996825acb500cd40cf2948b41","submitter":{"id":67759,"url":"http://patchwork.ozlabs.org/api/1.0/people/67759/?format=json","name":"Zhang Chen","email":"zhangchen.fnst@cn.fujitsu.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504505688-32455-4-git-send-email-zhangchen.fnst@cn.fujitsu.com/mbox/","series":[{"id":1310,"url":"http://patchwork.ozlabs.org/api/1.0/series/1310/?format=json","date":"2017-09-04T06:14:45","name":"Optimize COLO-compare performance","version":5,"mbox":"http://patchwork.ozlabs.org/series/1310/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809523/checks/","tags":{},"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=)","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 3xm02l6KzLz9s7c\n\tfor ;\n\tMon, 4 Sep 2017 16:15:43 +1000 (AEST)","from localhost ([::1]:35043 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dokfd-0007Hv-Vm\n\tfor incoming@patchwork.ozlabs.org; Mon, 04 Sep 2017 02:15:42 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37325)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dokdM-0005Vj-S0\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 02:13:22 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dokdK-0002k4-CV\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 02:13:20 -0400","from mail.cn.fujitsu.com ([183.91.158.132]:56337\n\thelo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dokdK-0002eu-2N\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 02:13:18 -0400","from localhost (HELO cn.fujitsu.com) ([10.167.33.5])\n\tby heian.cn.fujitsu.com with ESMTP; 04 Sep 2017 14:13:13 +0800","from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83])\n\tby cn.fujitsu.com (Postfix) with ESMTP id 796464725545;\n\tMon, 4 Sep 2017 14:13:09 +0800 (CST)","from localhost.localdomain (10.167.226.56) by\n\tG08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP\n\tServer (TLS) id 14.3.361.1; Mon, 4 Sep 2017 14:13:14 +0800"],"X-IronPort-AV":"E=Sophos;i=\"5.41,473,1498492800\"; d=\"scan'208\";a=\"25177675\"","From":"Zhang Chen ","To":"qemu devel , Jason Wang ","Date":"Mon, 4 Sep 2017 14:14:48 +0800","Message-ID":"<1504505688-32455-4-git-send-email-zhangchen.fnst@cn.fujitsu.com>","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1504505688-32455-1-git-send-email-zhangchen.fnst@cn.fujitsu.com>","References":"<1504505688-32455-1-git-send-email-zhangchen.fnst@cn.fujitsu.com>","MIME-Version":"1.0","Content-Type":"text/plain","X-Originating-IP":"[10.167.226.56]","X-yoursite-MailScanner-ID":"796464725545.A9B84","X-yoursite-MailScanner":"Found to be clean","X-yoursite-MailScanner-From":"zhangchen.fnst@cn.fujitsu.com","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"183.91.158.132","Subject":"[Qemu-devel] [PATCH V5 3/3] 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":"Li Zhijian ,\n\tZhang Chen ,\n\tZhang Chen ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Zhang Chen \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 8dd76e4..c9a7174 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":["V5","3/3"]}