[PATCH] remove invalid assertion in vws_thread()

[Poul-Henning Kamp]

Content-Type: text/plain; charset=ISO-8859-1
--------

Applied.

In message <50FF00AA.7080107 at schokola.de>, Nils Goroll writes:
>This is a multi-part message in MIME format.
>--------------090507030006090308070204
>Content-Type: text/plain; charset=ISO-8859-1; format=flowed
>Content-Transfer-Encoding: 7bit
>
>
>--------------090507030006090308070204
>Content-Type: text/plain;
> name="0001-remove-invalid-assertion-in-vws_thread.patch"
>Content-Transfer-Encoding: 7bit
>Content-Disposition: attachment;
> filename="0001-remove-invalid-assertion-in-vws_thread.patch"
>
>>From 168a14c1dc01cfc360ea831e5e9e8104f46f37c4 Mon Sep 17 00:00:00 2001
>>From 168a14c1dc01cfc360ea831e5e9e8104f46f37c4 Mon Sep 17 00:00:00 2001
>From: Nils Goroll <nils.goroll at uplex.de>
>Date: Tue, 22 Jan 2013 22:08:09 +0100
>Subject: [PATCH] remove invalid assertion in vws_thread()
>
>tmo can become negativ if timeout_idle gets changed on the fly
>or when the rtc jumps
>---
> bin/varnishd/waiter/cache_waiter_ports.c |    6 ------
> 1 files changed, 0 insertions(+), 6 deletions(-)
>
>diff --git a/bin/varnishd/waiter/cache_waiter_ports.c b/bin/varnishd/waiter/cache_waiter_ports.c
>index aa3d766..3c07b95 100644
>--- a/bin/varnishd/waiter/cache_waiter_ports.c
>+++ b/bin/varnishd/waiter/cache_waiter_ports.c
>@@ -222,12 +222,6 @@ vws_thread(void *priv)
> 			double tmo =
> 			    (sp->t_idle + cache_param->timeout_idle) - now;
> 
>-			/*
>-			 * we should have removed all sps whose timeout
>-			 * has passed
>-			 */
>-			assert(tmo > 0.0);
>-
> 			if (tmo < min_t) {
> 				timeout = &min_ts;
> 			} else if (tmo > max_t) {
>-- 
>1.5.6.5
>
>
>--------------090507030006090308070204
>Content-Type: text/plain; charset="us-ascii"
>MIME-Version: 1.0
>Content-Transfer-Encoding: 7bit
>Content-Disposition: inline
>
>_______________________________________________
>varnish-dev mailing list
>varnish-dev at varnish-cache.org
>https://www.varnish-cache.org/lists/mailman/listinfo/varnish-dev
>--------------090507030006090308070204--
>

-- 
Poul-Henning Kamp       | UNIX since Zilog Zeus 3.20
phk at FreeBSD.ORG         | TCP/IP since RFC 956
FreeBSD committer       | BSD since 4.3-tahoe    
Never attribute to malice what can adequately be explained by incompetence.