From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41489) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9567-0004le-TB for qemu-devel@nongnu.org; Mon, 12 Aug 2013 23:16:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V955z-0007fe-Fn for qemu-devel@nongnu.org; Mon, 12 Aug 2013 23:16:39 -0400 Received: from mail-oa0-x230.google.com ([2607:f8b0:4003:c02::230]:62846) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V955z-0007fS-BM for qemu-devel@nongnu.org; Mon, 12 Aug 2013 23:16:31 -0400 Received: by mail-oa0-f48.google.com with SMTP id o17so10594731oag.21 for ; Mon, 12 Aug 2013 20:16:30 -0700 (PDT) From: Liu Ping Fan Date: Tue, 13 Aug 2013 11:15:40 +0800 Message-Id: <1376363741-19420-3-git-send-email-pingfank@linux.vnet.ibm.com> In-Reply-To: <1376363741-19420-1-git-send-email-pingfank@linux.vnet.ibm.com> References: <1376363741-19420-1-git-send-email-pingfank@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 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 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/slirp/slirp.c b/slirp/slirp.c index 55654d5..1deaad9 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,11 @@ 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