From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:39784)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jan.kiszka@siemens.com>) id 1V99ai-0001Lp-Hs
	for qemu-devel@nongnu.org; Tue, 13 Aug 2013 04:04:40 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jan.kiszka@siemens.com>) id 1V99ab-0008TB-7t
	for qemu-devel@nongnu.org; Tue, 13 Aug 2013 04:04:32 -0400
Received: from david.siemens.de ([192.35.17.14]:25208)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jan.kiszka@siemens.com>) id 1V99aZ-0008Su-G7
	for qemu-devel@nongnu.org; Tue, 13 Aug 2013 04:04:23 -0400
Message-ID: <5209E885.50304@siemens.com>
Date: Tue, 13 Aug 2013 10:04:21 +0200
From: Jan Kiszka <jan.kiszka@siemens.com>
MIME-Version: 1.0
References: <1376363741-19420-1-git-send-email-pingfank@linux.vnet.ibm.com>
	<1376363741-19420-3-git-send-email-pingfank@linux.vnet.ibm.com>
In-Reply-To: <1376363741-19420-3-git-send-email-pingfank@linux.vnet.ibm.com>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 2/3] slirp: define timeout as macro
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Liu Ping Fan <qemulist@gmail.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>, qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>

On 2013-08-13 05:15, Liu Ping Fan wrote:
> Signed-off-by: Liu Ping Fan <pingfank@linux.vnet.ibm.com>
> ---
>  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)) {

Overlong line.

>              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)) {

Here probably as well.

>              ip_slowtimo(slirp);
>              tcp_slowtimo(slirp);
>              slirp->last_slowtimo = curtime;
> 

JAn

-- 
Siemens AG, Corporate Technology, CT RTC ITP SES-DE
Corporate Competence Center Embedded Linux