Skip to content

U
unique-xids
Commit 07c41790 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

...and make it all work again. 

At least "work" in the sense that varnishtest does not obviously
break, but since it doesn't test the utils at all (but does use
the varnishapi) more work & testing will be needed.
parent a77b5767
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 38 deletions
bin/varnishd/common/heritage.h
View file @ 07c41790
...@@ -67,7 +67,6 @@ struct heritage { ...@@ -67,7 +67,6 @@ struct heritage {
char *panic_str; char *panic_str;
ssize_t panic_str_len; ssize_t panic_str_len;
}; };
extern struct heritage heritage; extern struct heritage heritage;
......
bin/varnishtest/vtc_varnish.c
View file @ 07c41790
...@@ -200,17 +200,12 @@ varnishlog_thread(void *priv) ...@@ -200,17 +200,12 @@ varnishlog_thread(void *priv)
vsl = VSM_New(); vsl = VSM_New();
VSL_Setup(vsl); VSL_Setup(vsl);
(void)VSL_Arg(vsl, 'n', v->workdir); (void)VSL_Arg(vsl, 'n', v->workdir);
VSL_NonBlocking(vsl, 1);
while (v->pid && VSL_Open(vsl, 0) != 0) { while (v->pid && VSL_Open(vsl, 0) != 0) {
assert(usleep(VSL_SLEEP_USEC) == 0 || errno == EINTR); assert(usleep(VSL_SLEEP_USEC) == 0 || errno == EINTR);
} }
while (v->pid) { while (v->pid) {
if (VSL_Dispatch(vsl, h_addlog, v) < 0) { if (VSL_Dispatch(vsl, h_addlog, v) <= 0)
assert(usleep(v->vsl_sleep) == 0 || errno == EINTR); break;
v->vsl_sleep += v->vsl_sleep;
if (v->vsl_sleep > VSL_SLEEP_USEC)
v->vsl_sleep = VSL_SLEEP_USEC;
}
} }
VSM_Delete(vsl); VSM_Delete(vsl);
return (NULL); return (NULL);
...@@ -732,7 +727,7 @@ varnish_expect(const struct varnish *v, char * const *av) { ...@@ -732,7 +727,7 @@ varnish_expect(const struct varnish *v, char * const *av) {
uint64_t ref; uint64_t ref;
int good; int good;
char *p; char *p;
int i; int i, j;
struct stat_priv sp; struct stat_priv sp;
good = -1; good = -1;
...@@ -742,9 +737,20 @@ varnish_expect(const struct varnish *v, char * const *av) { ...@@ -742,9 +737,20 @@ varnish_expect(const struct varnish *v, char * const *av) {
ref = 0; ref = 0;
for (i = 0; i < 10; i++, (void)usleep(100000)) { for (i = 0; i < 10; i++, (void)usleep(100000)) {
good = -1; good = VSC_Iter(v->vd, do_stat_cb, &sp);
if (!VSC_Iter(v->vd, do_stat_cb, &sp)) if (good < 0) {
continue; VSM_Close(v->vd);
j = VSM_Open(v->vd, 0);
if (j == 0)
continue;
do {
(void)usleep(100000);
j = VSM_Open(v->vd, 0);
i++;
} while(i < 10 && j < 0);
if (j < 0)
break;
}
good = 0; good = 0;
ref = strtoumax(av[2], &p, 0); ref = strtoumax(av[2], &p, 0);
......
lib/libvarnishapi/vsc.c
View file @ 07c41790
...@@ -326,6 +326,8 @@ VSC_Iter(const struct VSM_data *vd, VSC_iter_f *func, void *priv) ...@@ -326,6 +326,8 @@ VSC_Iter(const struct VSM_data *vd, VSC_iter_f *func, void *priv)
vsc = vd->vsc; vsc = vd->vsc;
CHECK_OBJ_NOTNULL(vsc, VSC_MAGIC); CHECK_OBJ_NOTNULL(vsc, VSC_MAGIC);
i = 0; i = 0;
if (!VSM_StillValid(vd, NULL))
return (-1);
VSM_FOREACH_SAFE(&vf, vd) { VSM_FOREACH_SAFE(&vf, vd) {
if (strcmp(vf.chunk->class, VSC_CLASS)) if (strcmp(vf.chunk->class, VSC_CLASS))
continue; continue;
......
lib/libvarnishapi/vsl.c
View file @ 07c41790
...@@ -51,6 +51,8 @@ ...@@ -51,6 +51,8 @@
#include "vsl_api.h" #include "vsl_api.h"
#include "vsm_api.h" #include "vsm_api.h"
static void VSL_Close(struct VSM_data *vd);
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
const char *VSL_tags[256] = { const char *VSL_tags[256] = {
...@@ -128,20 +130,30 @@ VSL_NonBlocking(const struct VSM_data *vd, int nb) ...@@ -128,20 +130,30 @@ VSL_NonBlocking(const struct VSM_data *vd, int nb)
vsl->flags &= ~F_NON_BLOCKING; vsl->flags &= ~F_NON_BLOCKING;
} }
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------
* Return the next log record, if there is one
*
* Return:
* <0: error
* 0: no record
* >0: record available at pp
*/
static int static int
vsl_nextlog(struct vsl *vsl, uint32_t **pp) vsl_nextlog(struct vsl *vsl, uint32_t **pp)
{ {
unsigned w, l; unsigned l;
uint32_t t; uint32_t t;
int i; int i;
CHECK_OBJ_NOTNULL(vsl, VSL_MAGIC); CHECK_OBJ_NOTNULL(vsl, VSL_MAGIC);
*pp = NULL;
if (vsl->r_fd != -1) { if (vsl->r_fd != -1) {
assert(vsl->rbuflen >= 8); assert(vsl->rbuflen >= 8);
i = read(vsl->r_fd, vsl->rbuf, 8); i = read(vsl->r_fd, vsl->rbuf, 8);
if (i == 0)
return (0);
if (i != 8) if (i != 8)
return (-1); return (-1);
l = 2 + VSL_WORDS(VSL_LEN(vsl->rbuf)); l = 2 + VSL_WORDS(VSL_LEN(vsl->rbuf));
...@@ -157,38 +169,36 @@ vsl_nextlog(struct vsl *vsl, uint32_t **pp) ...@@ -157,38 +169,36 @@ vsl_nextlog(struct vsl *vsl, uint32_t **pp)
*pp = vsl->rbuf; *pp = vsl->rbuf;
return (1); return (1);
} }
for (w = 0; w < TIMEOUT_USEC;) { while (1) {
if (vsl->log_ptr == NULL)
return (0);
assert(vsl->log_ptr >= vsl->log_start + 1);
assert(vsl->log_ptr < vsl->log_end);
t = *vsl->log_ptr; t = *vsl->log_ptr;
if (t == VSL_WRAPMARKER) { if (t == VSL_WRAPMARKER) {
/* Wrap around not possible at front */ /* Wrap around not possible at front */
assert(vsl->log_ptr != vsl->log_start + 1); if (vsl->log_ptr == vsl->log_start + 1)
return (-1);
vsl->log_ptr = vsl->log_start + 1; vsl->log_ptr = vsl->log_start + 1;
VRMB();
continue; continue;
} }
if (t == VSL_ENDMARKER) { if (t == VSL_ENDMARKER) {
if (vsl->log_ptr != vsl->log_start + 1 && if (vsl->log_ptr != vsl->log_start + 1 &&
vsl->last_seq != vsl->log_start[0]) { vsl->last_seq != vsl->log_start[0]) {
/* ENDMARKER not at front and seq wrapped */ /* ENDMARKER not at front and seq wrapped */
vsl->log_ptr = vsl->log_start + 1; vsl->log_ptr = vsl->log_start + 1;
VRMB();
continue; continue;
} }
if (vsl->flags & F_NON_BLOCKING) return (0);
return (-1);
w += SLEEP_USEC;
assert(usleep(SLEEP_USEC) == 0 || errno == EINTR);
VRMB();
continue;
} }
if (t == 0) { if (t == 0) {
/* Zero-initialized VSL */ /* Uninitialized VSL */
w += SLEEP_USEC; return (0);
assert(usleep(SLEEP_USEC) == 0 || errno == EINTR);
VRMB();
continue;
} }
if (vsl->log_ptr == vsl->log_start + 1) if (vsl->log_ptr == vsl->log_start + 1)
vsl->last_seq = vsl->log_start[0]; vsl->last_seq = vsl->log_start[0];
...@@ -196,8 +206,6 @@ vsl_nextlog(struct vsl *vsl, uint32_t **pp) ...@@ -196,8 +206,6 @@ vsl_nextlog(struct vsl *vsl, uint32_t **pp)
vsl->log_ptr = VSL_NEXT(vsl->log_ptr); vsl->log_ptr = VSL_NEXT(vsl->log_ptr);
return (1); return (1);
} }
*pp = NULL;
return (0);
} }
int int
...@@ -214,7 +222,7 @@ VSL_NextLog(const struct VSM_data *vd, uint32_t **pp, uint64_t *bits) ...@@ -214,7 +222,7 @@ VSL_NextLog(const struct VSM_data *vd, uint32_t **pp, uint64_t *bits)
while (1) { while (1) {
i = vsl_nextlog(vsl, &p); i = vsl_nextlog(vsl, &p);
if (i != 1) if (i <= 0)
return (i); return (i);
t = VSL_TAG(p); t = VSL_TAG(p);
if (vsl->skip) { if (vsl->skip) {
...@@ -275,17 +283,37 @@ VSL_Dispatch(struct VSM_data *vd, VSL_handler_f *func, void *priv) ...@@ -275,17 +283,37 @@ VSL_Dispatch(struct VSM_data *vd, VSL_handler_f *func, void *priv)
unsigned u, l, s; unsigned u, l, s;
uint32_t *p; uint32_t *p;
uint64_t bitmap; uint64_t bitmap;
int tmo;
CHECK_OBJ_NOTNULL(vd, VSM_MAGIC); CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
vsl = vd->vsl; vsl = vd->vsl;
CHECK_OBJ_NOTNULL(vsl, VSL_MAGIC); CHECK_OBJ_NOTNULL(vsl, VSL_MAGIC);
tmo = 0;
while (1) { while (1) {
bitmap = 0; bitmap = 0;
i = VSL_NextLog(vd, &p, &bitmap); i = VSL_NextLog(vd, &p, &bitmap);
if (i == 0 && VSM_ReOpen(vd, 0) == 1) if (i == 0) {
if (vsl->r_fd != -1)
return(0);
if (vsl->flags & F_NON_BLOCKING)
return (0);
if (VSM_StillValid(vd, &vsl->vf) != 1) {
VSL_Close(vd);
if (VSL_Open(vd, 0))
return (-1);
AN(vsl->log_ptr);
assert(vsl->log_ptr >= vsl->log_start + 1);
assert(vsl->log_ptr < vsl->log_end);
continue;
}
tmo += SLEEP_USEC;
if (tmo > TIMEOUT_USEC)
return (0);
(void)usleep(SLEEP_USEC);
continue; continue;
if (i != 1) }
if (i <= 0)
return (i); return (i);
u = VSL_ID(p); u = VSL_ID(p);
l = VSL_LEN(p); l = VSL_LEN(p);
...@@ -294,7 +322,8 @@ VSL_Dispatch(struct VSM_data *vd, VSL_handler_f *func, void *priv) ...@@ -294,7 +322,8 @@ VSL_Dispatch(struct VSM_data *vd, VSL_handler_f *func, void *priv)
s |= VSL_S_CLIENT; s |= VSL_S_CLIENT;
if (VSL_BACKEND(p)) if (VSL_BACKEND(p))
s |= VSL_S_BACKEND; s |= VSL_S_BACKEND;
if (func(priv, (enum VSL_tag_e)VSL_TAG(p), u, l, s, VSL_DATA(p), bitmap)) if (func(priv, (enum VSL_tag_e)VSL_TAG(p),
u, l, s, VSL_DATA(p), bitmap))
return (1); return (1);
} }
} }
...@@ -333,6 +362,23 @@ VSL_H_Print(void *priv, enum VSL_tag_e tag, unsigned fd, unsigned len, ...@@ -333,6 +362,23 @@ VSL_H_Print(void *priv, enum VSL_tag_e tag, unsigned fd, unsigned len,
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
static void
VSL_Close(struct VSM_data *vd)
{
struct vsl *vsl;
CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
vsl = vd->vsl;
CHECK_OBJ_NOTNULL(vsl, VSL_MAGIC);
VSM_Close(vd);
vsl->log_start = NULL;
vsl->log_end = NULL;
vsl->log_ptr = NULL;
}
/*--------------------------------------------------------------------*/
int int
VSL_Open(struct VSM_data *vd, int diag) VSL_Open(struct VSM_data *vd, int diag)
{ {
......
lib/libvarnishapi/vsm.c
View file @ 07c41790
...@@ -297,19 +297,25 @@ VSM__iter0(const struct VSM_data *vd, struct VSM_fantom *vf) ...@@ -297,19 +297,25 @@ VSM__iter0(const struct VSM_data *vd, struct VSM_fantom *vf)
int int
VSM__itern(const struct VSM_data *vd, struct VSM_fantom *vf) VSM__itern(const struct VSM_data *vd, struct VSM_fantom *vf)
{ {
void *p;
CHECK_OBJ_NOTNULL(vd, VSM_MAGIC); CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
if (vf->priv != 0) { if (vd->head->alloc_seq == 0)
return (0); /* abandonned VSM */
else if (vf->priv != 0) {
if (vf->priv != vd->head->alloc_seq) if (vf->priv != vd->head->alloc_seq)
return (0); return (0);
if (vf->chunk->len == 0) if (vf->chunk->len == 0)
return (0); return (0);
if (vf->chunk->next == 0) if (vf->chunk->next == 0)
return (0); return (0);
vf->chunk = (void*)(vd->b + vf->chunk->next); p = (void*)(vd->b + vf->chunk->next);
assert(p != vf->chunk);
vf->chunk = p;
} else if (vd->head->first == 0) { } else if (vd->head->first == 0) {
return (0); return (0);
} else { } else {
AZ(vf->chunk);
vf->chunk = (void*)(vd->b + vd->head->first); vf->chunk = (void*)(vd->b + vd->head->first);
} }
if (memcmp(vf->chunk->marker, VSM_CHUNK_MARKER, if (memcmp(vf->chunk->marker, VSM_CHUNK_MARKER,
...@@ -318,8 +324,13 @@ VSM__itern(const struct VSM_data *vd, struct VSM_fantom *vf) ...@@ -318,8 +324,13 @@ VSM__itern(const struct VSM_data *vd, struct VSM_fantom *vf)
vf->priv = vd->head->alloc_seq; vf->priv = vd->head->alloc_seq;
vf->b = (void*)(vf->chunk + 1); vf->b = (void*)(vf->chunk + 1);
vf->e = (char*)vf->b + vf->chunk->len; vf->e = (char*)vf->b + vf->chunk->len;
if (vd->priv == 0)
return (0); /* abandonned VSM */
if (vf->b == vf->e) if (vf->b == vf->e)
return (0); return (0); /* freed chunk */
AN(vf->priv);
AN(vf->chunk);
return (1); return (1);
} }
...@@ -331,6 +342,8 @@ VSM_StillValid(const struct VSM_data *vd, struct VSM_fantom *vf) ...@@ -331,6 +342,8 @@ VSM_StillValid(const struct VSM_data *vd, struct VSM_fantom *vf)
struct VSM_fantom f2; struct VSM_fantom f2;
CHECK_OBJ_NOTNULL(vd, VSM_MAGIC); CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
if (vf == NULL)
return (vd->head->alloc_seq ? 1 : 0);
if (vf->priv == vd->head->alloc_seq) if (vf->priv == vd->head->alloc_seq)
return (1); return (1);
VSM_FOREACH_SAFE(&f2, vd) { VSM_FOREACH_SAFE(&f2, 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