From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33897) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9RNQ-0003Sh-Li for qemu-devel@nongnu.org; Tue, 13 Aug 2013 23:04:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V9RNA-0007ic-Mb for qemu-devel@nongnu.org; Tue, 13 Aug 2013 23:04:00 -0400 Received: from mail-ob0-x22c.google.com ([2607:f8b0:4003:c01::22c]:42954) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9RNA-0007iI-H2 for qemu-devel@nongnu.org; Tue, 13 Aug 2013 23:03:44 -0400 Received: by mail-ob0-f172.google.com with SMTP id er7so11451324obc.3 for ; Tue, 13 Aug 2013 20:03:44 -0700 (PDT) From: Liu Ping Fan Date: Wed, 14 Aug 2013 11:02:51 +0800 Message-Id: <1376449372-11184-3-git-send-email-pingfank@linux.vnet.ibm.com> In-Reply-To: <1376449372-11184-1-git-send-email-pingfank@linux.vnet.ibm.com> References: <1376449372-11184-1-git-send-email-pingfank@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 2/3] slirp: define timeout as macro List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Stefan Hajnoczi , Jan Kiszka Signed-off-by: Liu Ping Fan --- slirp/slirp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/slirp/slirp.c b/slirp/slirp.c index b71c617..c224523 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -47,6 +47,9 @@ static QTAILQ_HEAD(slirp_instances, Slirp) slirp_instances = static struct in_addr dns_addr; static u_int dns_addr_time; +#define TIMEOUT_FAST 2 +#define TIMEOUT_SLOW 499 + #ifdef _WIN32 int get_dns_addr(struct in_addr *pdns_addr) @@ -452,11 +455,13 @@ void slirp_pollfds_poll(GArray *pollfds, int select_error) /* * See if anything has timed out */ - if (slirp->time_fasttimo && ((curtime - slirp->time_fasttimo) >= 2)) { + if (slirp->time_fasttimo && + ((curtime - slirp->time_fasttimo) >= TIMEOUT_FAST)) { tcp_fasttimo(slirp); slirp->time_fasttimo = 0; } - if (slirp->do_slowtimo && ((curtime - slirp->last_slowtimo) >= 499)) { + if (slirp->do_slowtimo && + ((curtime - slirp->last_slowtimo) >= TIMEOUT_SLOW)) { ip_slowtimo(slirp); tcp_slowtimo(slirp); slirp->last_slowtimo = curtime; -- 1.8.1.4