From patchwork Wed Aug 21 02:15:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pingfan liu X-Patchwork-Id: 268674 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 71F3A2C0087 for ; Wed, 21 Aug 2013 12:17:55 +1000 (EST) Received: from localhost ([::1]:51101 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBxzd-0000iU-Gd for incoming@patchwork.ozlabs.org; Tue, 20 Aug 2013 22:17:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBxyK-0007aJ-1x for qemu-devel@nongnu.org; Tue, 20 Aug 2013 22:16:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VBxyB-0002rp-Jm for qemu-devel@nongnu.org; Tue, 20 Aug 2013 22:16:31 -0400 Received: from mail-oa0-x236.google.com ([2607:f8b0:4003:c02::236]:53309) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBxyB-0002ra-EK for qemu-devel@nongnu.org; Tue, 20 Aug 2013 22:16:23 -0400 Received: by mail-oa0-f54.google.com with SMTP id o6so2472168oag.13 for ; Tue, 20 Aug 2013 19:16:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ql6K7iNQT8uuNOP4UKOGJDGCRRykBrG1pAABX6oxk7Y=; b=uw6kvz5L58VRBb9glLB5pSW2diFLfRcwKqAGh1IYnRg21evp03Xh9seFLJVpVAO3H2 UTXEubcCpo0ef8BQKHscTWlFhAPyQp35daZu65czlS4Nmxc4ow/np2pDmY7Xbj9Jrw0t 4jYQi7Wu6Xr33K5rHc+kBem2uH4MJz1haJjK/EBAJ36P8fH831kg6mXFd0bCgkniLGV2 SILZydH4gzVrG8WKjoXqq2zfjfiydluHdWG/gwhj17yoStBVPT2jl+yX2uC1Ag00QrWp X+kIVHrgygGUMzAOIq6lU7dND30oXonuBIijQAcZzYB20tmTCOJE0zLEeKmewtrDy/3F 8w7g== X-Received: by 10.60.179.35 with SMTP id dd3mr5198797oec.53.1377051382966; Tue, 20 Aug 2013 19:16:22 -0700 (PDT) Received: from localhost ([111.192.245.86]) by mx.google.com with ESMTPSA id fh1sm6645734oeb.7.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 20 Aug 2013 19:16:22 -0700 (PDT) From: Liu Ping Fan To: qemu-devel@nongnu.org Date: Wed, 21 Aug 2013 10:15:50 +0800 Message-Id: <1377051352-23499-2-git-send-email-pingfank@linux.vnet.ibm.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1377051352-23499-1-git-send-email-pingfank@linux.vnet.ibm.com> References: <1377051352-23499-1-git-send-email-pingfank@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4003:c02::236 Cc: Jan Kiszka , Stefan Hajnoczi , Paolo Bonzini Subject: [Qemu-devel] [PATCH v3 1/3] slirp: make timeout local X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Each slirp has its own time to caculate timeout. Signed-off-by: Liu Ping Fan --- slirp/slirp.c | 22 ++++++++++------------ slirp/slirp.h | 3 +++ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/slirp/slirp.c b/slirp/slirp.c index 80b28ea..b71c617 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -40,8 +40,6 @@ static const uint8_t special_ethaddr[ETH_ALEN] = { static const uint8_t zero_ethaddr[ETH_ALEN] = { 0, 0, 0, 0, 0, 0 }; u_int curtime; -static u_int time_fasttimo, last_slowtimo; -static int do_slowtimo; static QTAILQ_HEAD(slirp_instances, Slirp) slirp_instances = QTAILQ_HEAD_INITIALIZER(slirp_instances); @@ -278,14 +276,13 @@ void slirp_pollfds_fill(GArray *pollfds) /* * First, TCP sockets */ - do_slowtimo = 0; QTAILQ_FOREACH(slirp, &slirp_instances, entry) { /* * *_slowtimo needs calling if there are IP fragments * in the fragment queue, or there are TCP connections active */ - do_slowtimo |= ((slirp->tcb.so_next != &slirp->tcb) || + slirp->do_slowtimo = ((slirp->tcb.so_next != &slirp->tcb) || (&slirp->ipq.ip_link != slirp->ipq.ip_link.next)); for (so = slirp->tcb.so_next; so != &slirp->tcb; @@ -299,8 +296,9 @@ void slirp_pollfds_fill(GArray *pollfds) /* * See if we need a tcp_fasttimo */ - if (time_fasttimo == 0 && so->so_tcpcb->t_flags & TF_DELACK) { - time_fasttimo = curtime; /* Flag when we want a fasttimo */ + if (slirp->time_fasttimo == 0 && + so->so_tcpcb->t_flags & TF_DELACK) { + slirp->time_fasttimo = curtime; /* Flag when want a fasttimo */ } /* @@ -381,7 +379,7 @@ void slirp_pollfds_fill(GArray *pollfds) udp_detach(so); continue; } else { - do_slowtimo = 1; /* Let socket expire */ + slirp->do_slowtimo = true; /* Let socket expire */ } } @@ -422,7 +420,7 @@ void slirp_pollfds_fill(GArray *pollfds) icmp_detach(so); continue; } else { - do_slowtimo = 1; /* Let socket expire */ + slirp->do_slowtimo = true; /* Let socket expire */ } } @@ -454,14 +452,14 @@ void slirp_pollfds_poll(GArray *pollfds, int select_error) /* * See if anything has timed out */ - if (time_fasttimo && ((curtime - time_fasttimo) >= 2)) { + if (slirp->time_fasttimo && ((curtime - slirp->time_fasttimo) >= 2)) { tcp_fasttimo(slirp); - time_fasttimo = 0; + slirp->time_fasttimo = 0; } - if (do_slowtimo && ((curtime - last_slowtimo) >= 499)) { + if (slirp->do_slowtimo && ((curtime - slirp->last_slowtimo) >= 499)) { ip_slowtimo(slirp); tcp_slowtimo(slirp); - last_slowtimo = curtime; + slirp->last_slowtimo = curtime; } /* diff --git a/slirp/slirp.h b/slirp/slirp.h index fe0e65d..e4a1bd4 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -203,6 +203,9 @@ bool arp_table_search(Slirp *slirp, uint32_t ip_addr, struct Slirp { QTAILQ_ENTRY(Slirp) entry; + u_int time_fasttimo; + u_int last_slowtimo; + bool do_slowtimo; /* virtual network configuration */ struct in_addr vnetwork_addr;