Re: [Qemu-devel] [PATCH 2/3] slirp: define timeout as macro

[Jan Kiszka]

On 2013-08-13 05:15, Liu Ping Fan wrote:
> Signed-off-by: Liu Ping Fan <address@hidden>
> ---
>  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