Respect lower pool limit dynamically

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@844 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache_pool.c b/varnish-cache/bin/varnishd/cache_pool.c
index 32d80cbbeb48fb349a396c29e3420ad9a0171f1e..862b0c6f2b3795d27de43b137a73cac9f53e8b41 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_pool.c
+++ b/varnish-cache/bin/varnishd/cache_pool.c
@@ -160,6 +160,7 @@ wrk_thread(void *priv)
        struct worker *w, ww;
        struct timespec ts;
 
+       (void)priv;
        w = &ww;
        memset(w, 0, sizeof *w);
        w->magic = WORKER_MAGIC;
@@ -168,10 +169,8 @@ wrk_thread(void *priv)
 
        AZ(pthread_mutex_lock(&wrk_mtx));
        w->nbr = VSL_stats->n_wrk;
-       if (priv == NULL) {
-               VSL_stats->n_wrk_create++;
-               VSL(SLT_WorkThread, 0, "%u born dynamic", w->nbr);
-       }
+       VSL_stats->n_wrk_create++;
+       VSL(SLT_WorkThread, 0, "%u born", w->nbr);
        TAILQ_INSERT_HEAD(&wrk_busy, w, list);
        while (1) {
                CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
@@ -187,7 +186,7 @@ wrk_thread(void *priv)
                TAILQ_INSERT_HEAD(&wrk_idle, w, list);
 
                /* If we are a reserved thread we don't die */
-               if (priv != NULL) {
+               if (w->nbr < params->wthread_min) {
                        AZ(pthread_cond_wait(&w->cv, &wrk_mtx));
                } else {
                        /* If we are a dynamic thread, time out and die */
@@ -276,7 +275,7 @@ WRK_Init(void)
        VSL(SLT_Debug, 0, "Starting %u worker threads", params->wthread_min);
        for (i = 0; i < params->wthread_min; i++) {
                VSL_stats->n_wrk++;
-               AZ(pthread_create(&tp, NULL, wrk_thread, &i));
+               AZ(pthread_create(&tp, NULL, wrk_thread, NULL));
                AZ(pthread_detach(tp));
        }
 }