r286 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2006-07-03 20:03:44 +0200 (Mon, 03 Jul 2006)
New Revision: 286

Modified:
   trunk/varnish-cache/bin/varnishd/cache_expire.c
Log:
Close race condition


Modified: trunk/varnish-cache/bin/varnishd/cache_expire.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_expire.c	2006-07-03 17:59:13 UTC (rev 285)
+++ trunk/varnish-cache/bin/varnishd/cache_expire.c	2006-07-03 18:03:44 UTC (rev 286)
@@ -139,8 +139,8 @@
 {
 
 	AZ(pthread_mutex_init(&exp_mtx, NULL));
+	exp_heap = binheap_new(NULL, object_cmp, object_update);
+	assert(exp_heap != NULL);
 	AZ(pthread_create(&exp_thread, NULL, exp_prefetch, NULL));
 	AZ(pthread_create(&exp_thread, NULL, exp_hangman, NULL));
-	exp_heap = binheap_new(NULL, object_cmp, object_update);
-	assert(exp_heap != NULL);
 }