Skip to content

V
varnishevent3
Commit bc6aded4 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp Committed by Tollef Fog Heen
Browse files
Options

Don't look at a static version of the VSM during startup. 

Fixes		#995
Patch by	DocWilco
parent 9ac381b8
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
lib/libvarnishapi/vsm.c
View file @ bc6aded4
...@@ -192,18 +192,19 @@ vsm_open(struct VSM_data *vd, int diag) ...@@ -192,18 +192,19 @@ vsm_open(struct VSM_data *vd, int diag)
} }
vd->vsm_end = (uint8_t *)vd->VSM_head + slh.shm_size; vd->vsm_end = (uint8_t *)vd->VSM_head + slh.shm_size;
for (j = 0; j < 20 && slh.alloc_seq == 0; j++) for (j = 0; j < 20 && vd->VSM_head->alloc_seq == 0; j++)
(void)usleep(50000); (void)usleep(50000);
if (slh.alloc_seq == 0) { if (vd->VSM_head->alloc_seq == 0) {
if (diag) if (diag)
vd->diag(vd->priv, "File not initialized %s\n", vd->diag(vd->priv, "File not initialized %s\n",
vd->fname); vd->fname);
assert(0 == munmap((void*)vd->VSM_head, slh.shm_size)); assert(0 == munmap((void*)vd->VSM_head, slh.shm_size));
AZ(close(vd->vsm_fd)); AZ(close(vd->vsm_fd));
vd->vsm_fd = -1; vd->vsm_fd = -1;
vd->VSM_head = NULL;
return (1); return (1);
} }
vd->alloc_seq = slh.alloc_seq; vd->alloc_seq = vd->VSM_head->alloc_seq;
if (vd->vsl != NULL) if (vd->vsl != NULL)
VSL_Open_CallBack(vd); VSL_Open_CallBack(vd);
......
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