Skip to content

V
varnish-cache
Commit 827cd226 authored by Nils Goroll's avatar Nils Goroll
Browse files
Options

use monotonic time for the watchdog

parent 4dcb8fb9
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
bin/varnishd/cache/cache_wrk.c
View file @ 827cd226
...@@ -489,7 +489,7 @@ pool_herder(void *priv) ...@@ -489,7 +489,7 @@ pool_herder(void *priv)
double delay; double delay;
int wthread_min; int wthread_min;
uintmax_t dq = (1ULL << 31); uintmax_t dq = (1ULL << 31);
double dqt = 0; vtim_mono dqt = 0;
CAST_OBJ_NOTNULL(pp, priv, POOL_MAGIC); CAST_OBJ_NOTNULL(pp, priv, POOL_MAGIC);
...@@ -514,11 +514,11 @@ pool_herder(void *priv) ...@@ -514,11 +514,11 @@ pool_herder(void *priv)
dq = pp->ndequeued + 1; dq = pp->ndequeued + 1;
} else if (dq != pp->ndequeued) { } else if (dq != pp->ndequeued) {
dq = pp->ndequeued; dq = pp->ndequeued;
dqt = VTIM_real(); dqt = VTIM_mono();
} else if (VTIM_real() - dqt > cache_param->wthread_watchdog) { } else if (VTIM_mono() - dqt > cache_param->wthread_watchdog) {
VSL(SLT_Error, 0, VSL(SLT_Error, 0,
"Pool Herder: Queue does not move ql=%u dt=%f", "Pool Herder: Queue does not move ql=%u dt=%f",
pp->lqueue, VTIM_real() - dqt); pp->lqueue, VTIM_mono() - dqt);
WRONG("Worker Pool Queue does not move"); WRONG("Worker Pool Queue does not move");
} }
wthread_min = cache_param->wthread_min; wthread_min = cache_param->wthread_min;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment