[master] 23f828a Various VSM changes
Martin Blix Grydeland
martin at varnish-cache.org
Wed May 15 14:46:13 CEST 2013
commit 23f828a74b9d1e31dc6b245952f4d28fe1912bc2
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date: Fri Oct 19 10:55:21 2012 +0200
Various VSM changes
Rename VSM_FOREACH_SAFE as it isn't really safe in the vqueue sense,
and removing chunks from the VSM from the client library isn't
applicable anyway.
Make the VSM chunk marker sizes defines.
Check for shm open in VSM__itern
Revisit logic of VSM__itern: Make sure that the VSM_fantom is either
changed to the next, or not changed at all.
Add comments.
Keep copies of class, type and ident in VSM_fantom, and use these when
revalidating fantoms.
Do a proper VSM_Open in varnishstat
Add a VSM_ResetError function
Differentiate between missing HEAD marker and zero alloc sequence. The
latter is an indication Varnish isn't running, the former a corrupt
file.
Fix newline on diag messages for consistency.
Fix return value check inversion bug on stat call in VSM_Abandoned()
Don't assert on VSM_Open on an already open VSM. Report success instead.
diff --git a/bin/varnishstat/varnishstat.c b/bin/varnishstat/varnishstat.c
index 47cee40..6adae1d 100644
--- a/bin/varnishstat/varnishstat.c
+++ b/bin/varnishstat/varnishstat.c
@@ -290,6 +290,10 @@ main(int argc, char * const *argv)
}
}
+ if (VSM_Open(vd)) {
+ fprintf(stderr, "%s\n", VSM_Error(vd));
+ exit(1);
+ }
VSC_C_main = VSC_Main(vd);
AN(VSC_C_main);
diff --git a/include/vapi/vsm.h b/include/vapi/vsm.h
index 9d9ef5e..c405168 100644
--- a/include/vapi/vsm.h
+++ b/include/vapi/vsm.h
@@ -35,6 +35,8 @@
#ifndef VAPI_VSM_H_INCLUDED
#define VAPI_VSM_H_INCLUDED
+#include "vsm_int.h"
+
struct VSM_chunk;
struct VSM_data;
@@ -47,6 +49,9 @@ struct VSM_fantom {
void *b; /* first byte of payload */
void *e; /* first byte past payload */
uintptr_t priv; /* VSM private */
+ char class[VSM_MARKER_LEN];
+ char type[VSM_MARKER_LEN];
+ char ident[VSM_IDENT_LEN];
};
/*---------------------------------------------------------------------
@@ -75,6 +80,11 @@ const char *VSM_Error(const struct VSM_data *vd);
* Return the latest error message.
*/
+void VSM_ResetError(struct VSM_data *vd);
+ /*
+ * Reset any error message.
+ */
+
#define VSM_n_USAGE "[-n varnish_name]"
int VSM_n_Arg(struct VSM_data *vd, const char *n_arg);
@@ -94,9 +104,9 @@ const char *VSM_Name(const struct VSM_data *vd);
int VSM_Open(struct VSM_data *vd);
/*
* Attempt to open and map the VSM file.
- * If diag is non-zero, diagnostics are emitted.
+ *
* Returns:
- * 0 on success
+ * 0 on success, or the VSM log was already open
* <0 on failure, VSM_Error() returns diagnostic string
*/
@@ -121,7 +131,7 @@ void VSM_Close(struct VSM_data *vd);
void VSM__iter0(const struct VSM_data *vd, struct VSM_fantom *vf);
int VSM__itern(const struct VSM_data *vd, struct VSM_fantom *vf);
-#define VSM_FOREACH_SAFE(vf, vd) \
+#define VSM_FOREACH(vf, vd) \
for(VSM__iter0((vd), (vf)); VSM__itern((vd), (vf));)
/*
* Iterate over all chunks in shared memory
diff --git a/include/vapi/vsm_int.h b/include/vapi/vsm_int.h
index a615ffd..2d1eab6 100644
--- a/include/vapi/vsm_int.h
+++ b/include/vapi/vsm_int.h
@@ -97,20 +97,22 @@
#define VSM_INT_H_INCLUDED
#define VSM_FILENAME "_.vsm"
+#define VSM_MARKER_LEN 8
+#define VSM_IDENT_LEN 128
struct VSM_chunk {
#define VSM_CHUNK_MARKER "VSMCHUNK"
- char marker[8];
+ char marker[VSM_MARKER_LEN];
ssize_t len; /* Incl VSM_chunk */
ssize_t next; /* Offset in shmem */
- char class[8];
- char type[8];
- char ident[128];
+ char class[VSM_MARKER_LEN];
+ char type[VSM_MARKER_LEN];
+ char ident[VSM_IDENT_LEN];
};
struct VSM_head {
#define VSM_HEAD_MARKER "VSMHEAD0" /* Incr. as version# */
- char marker[8];
+ char marker[VSM_MARKER_LEN];
ssize_t hdrsize;
ssize_t shm_size;
ssize_t first; /* Offset, first chunk */
diff --git a/lib/libvarnishapi/libvarnishapi.map b/lib/libvarnishapi/libvarnishapi.map
index 272cbd6..aef4221 100644
--- a/lib/libvarnishapi/libvarnishapi.map
+++ b/lib/libvarnishapi/libvarnishapi.map
@@ -89,5 +89,6 @@ LIBVARNISHAPI_1.3 {
global:
# Functions:
VSM_Abandoned;
+ VSM_ResetError;
# Variables:
} LIBVARNISHAPI_1.0;
diff --git a/lib/libvarnishapi/vsc.c b/lib/libvarnishapi/vsc.c
index 67f0690..bf63816 100644
--- a/lib/libvarnishapi/vsc.c
+++ b/lib/libvarnishapi/vsc.c
@@ -297,7 +297,7 @@ vsc_build_pt_list(struct VSM_data *vd)
vsc_delete_pts(vsc);
- VSM_FOREACH_SAFE(&vf, vd) {
+ VSM_FOREACH(&vf, vd) {
if (strcmp(vf.chunk->class, VSC_CLASS))
continue;
/*lint -save -e525 -e539 */
diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index ff42be5..a957293 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -111,6 +111,20 @@ VSM_Error(const struct VSM_data *vd)
/*--------------------------------------------------------------------*/
+void
+VSM_ResetError(struct VSM_data *vd)
+{
+
+ CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
+
+ if (vd->diag == NULL)
+ return;
+ VSB_delete(vd->diag);
+ vd->diag = NULL;
+}
+
+/*--------------------------------------------------------------------*/
+
int
VSM_n_Arg(struct VSM_data *vd, const char *opt)
{
@@ -174,7 +188,10 @@ VSM_Open(struct VSM_data *vd)
CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
- AZ(vd->head);
+ if (vd->head != NULL)
+ /* Already open */
+ return (0);
+
if (!vd->n_opt)
(void)VSM_n_Arg(vd, "");
@@ -202,13 +219,20 @@ VSM_Open(struct VSM_data *vd)
vd->fname, strerror(errno)));
}
- if (memcmp(slh.marker, VSM_HEAD_MARKER, sizeof slh.marker) ||
- slh.alloc_seq == 0) {
+ if (memcmp(slh.marker, VSM_HEAD_MARKER, sizeof slh.marker)) {
AZ(close(vd->vsm_fd));
vd->vsm_fd = -1;
return (vsm_diag(vd, "Not a VSM file %s\n", vd->fname));
}
+ if (slh.alloc_seq == 0) {
+ AZ(close(vd->vsm_fd));
+ vd->vsm_fd = -1;
+ return (vsm_diag(vd,
+ "Abandoned VSM file (Varnish not running?) %s\n",
+ vd->fname));
+ }
+
v = mmap(NULL, slh.shm_size,
PROT_READ, MAP_SHARED|MAP_HASSEMAPHORE, vd->vsm_fd, 0);
if (v == MAP_FAILED) {
@@ -268,7 +292,7 @@ VSM_Abandoned(struct VSM_data *vd)
now = VTIM_mono();
if (vd->head->age == vd->age_ok && now - vd->t_ok > 2.) {
/* No age change for 2 seconds, stat the file */
- if (!stat(vd->fname, &st))
+ if (stat(vd->fname, &st))
return (1);
if (st.st_dev != vd->fstat.st_dev)
return (1);
@@ -295,46 +319,50 @@ VSM__iter0(const struct VSM_data *vd, struct VSM_fantom *vf)
memset(vf, 0, sizeof *vf);
}
-/* XXX: revisit, logic is unclear */
int
VSM__itern(const struct VSM_data *vd, struct VSM_fantom *vf)
{
- void *p;
+ struct VSM_chunk *c = NULL;
CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
AN(vf);
+ if (!vd->head)
+ return (0); /* Not open */
if (vd->head->alloc_seq == 0)
return (0); /* abandoned VSM */
else if (vf->priv != 0) {
+ /* get next chunk */
if (vf->priv != vd->head->alloc_seq)
- return (0);
+ return (0); /* changes during iteration */
if (vf->chunk->len == 0)
- return (0);
+ return (0); /* free'd during iteration */
if (vf->chunk->next == 0)
- return (0);
- p = (void*)(vd->b + vf->chunk->next);
- assert(p != vf->chunk);
- vf->chunk = p;
+ return (0); /* last */
+ c = (struct VSM_chunk *)(vd->b + vf->chunk->next);
+ assert(c != vf->chunk);
} else if (vd->head->first == 0) {
- return (0);
+ return (0); /* empty vsm */
} else {
+ /* get first chunk */
AZ(vf->chunk);
- vf->chunk = (void*)(vd->b + vd->head->first);
+ c = (struct VSM_chunk *)(vd->b + vd->head->first);
}
- if (memcmp(vf->chunk->marker, VSM_CHUNK_MARKER,
- sizeof vf->chunk->marker))
- return (0);
+ AN(c);
+ if (memcmp(c->marker, VSM_CHUNK_MARKER, sizeof c->marker))
+ return (0); /* XXX - assert? */
+
+ vf->chunk = c;
vf->priv = vd->head->alloc_seq;
vf->b = (void*)(vf->chunk + 1);
vf->e = (char*)vf->b + vf->chunk->len;
+ strncpy(vf->class, vf->chunk->class, sizeof vf->class);
+ vf->class[sizeof vf->class - 1] = '\0';
+ strncpy(vf->type, vf->chunk->type, sizeof vf->type);
+ vf->type[sizeof vf->type - 1] = '\0';
+ strncpy(vf->ident, vf->chunk->ident, sizeof vf->ident);
+ vf->ident[sizeof vf->ident - 1] = '\0';
- if (vf->priv == 0)
- return (0); /* abandoned VSM */
- if (vf->b == vf->e)
- return (0); /* freed chunk */
- AN(vf->priv);
- AN(vf->chunk);
return (1);
}
@@ -353,11 +381,17 @@ VSM_StillValid(const struct VSM_data *vd, struct VSM_fantom *vf)
return (0);
if (vf->priv == vd->head->alloc_seq)
return (1);
- VSM_FOREACH_SAFE(&f2, vd) {
- if (f2.chunk == vf->chunk && f2.b == vf->b && f2.e == vf->e) {
- vf->priv = vd->head->alloc_seq;
- return (2);
- }
+ VSM_FOREACH(&f2, vd) {
+ if (f2.chunk != vf->chunk || f2.b != vf->b || f2.e != vf->e)
+ continue;
+ if (strcmp(f2.class, vf->class))
+ continue;
+ if (strcmp(f2.type, vf->type))
+ continue;
+ if (strcmp(f2.ident, vf->ident))
+ continue;
+ vf->priv = vd->head->alloc_seq;
+ return (2);
}
return (0);
}
@@ -368,12 +402,12 @@ VSM_Get(const struct VSM_data *vd, struct VSM_fantom *vf,
{
CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
- VSM_FOREACH_SAFE(vf, vd) {
- if (strcmp(vf->chunk->class, class))
+ VSM_FOREACH(vf, vd) {
+ if (strcmp(vf->class, class))
continue;
- if (type != NULL && strcmp(vf->chunk->type, type))
+ if (type != NULL && strcmp(vf->type, type))
continue;
- if (ident != NULL && strcmp(vf->chunk->ident, ident))
+ if (ident != NULL && strcmp(vf->ident, ident))
continue;
return (1);
}
More information about the varnish-commit
mailing list