Wanton renaming in libvarnishapi

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@4933 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishadm/varnishadm.c

@@ -216,7 +216,7 @@ main(int argc, char * const *argv)
 	const char *T_arg = NULL;
 	const char *S_arg = NULL;
 	const char *n_arg = NULL;
-	struct VSL_data *vsd;
+	struct VSM_data *vsd;
 	char *p;
 	int opt, sock;
 
@@ -243,17 +243,17 @@ main(int argc, char * const *argv)
 	argv += optind;
 
 	if (n_arg != NULL) {
-		vsd = VSL_New();
+		vsd = VSM_New();
 		assert(VSL_Log_Arg(vsd, 'n', n_arg));
-		if (!VSL_Open(vsd, 1)) {
+		if (!VSM_Open(vsd, 1)) {
 			if (T_arg == NULL) {
-				p = VSL_Find_Alloc(vsd, "Arg", "-T", "", NULL);
+				p = VSM_Find_Chunk(vsd, "Arg", "-T", "", NULL);
 				if (p != NULL) {
 					T_arg = strdup(p);
 				}
 			}
 			if (S_arg == NULL) {
-				p = VSL_Find_Alloc(vsd, "Arg", "-S", "", NULL);
+				p = VSM_Find_Chunk(vsd, "Arg", "-S", "", NULL);
 				if (p != NULL) {
 					S_arg = strdup(p);
 				}

bin/varnishhist/varnishhist.c

@@ -96,7 +96,7 @@ static int scales[] = {
 };
 
 static void
-update(struct VSL_data *vd)
+update(struct VSM_data *vd)
 {
 	int w = COLS / HIST_RANGE;
 	int n = w * HIST_RANGE;
@@ -116,7 +116,7 @@ update(struct VSL_data *vd)
 		mvprintw(LINES - 1, w * i, "|1e%d", j);
 	}
 
-	mvprintw(0, 0, "%*s", COLS - 1, VSL_Name(vd));
+	mvprintw(0, 0, "%*s", COLS - 1, VSM_Name(vd));
 
 	/* count our flock */
 	for (i = 0; i < n; ++i)
@@ -224,7 +224,7 @@ h_hist(void *priv, enum vsl_tag tag, unsigned fd, unsigned len,
 static void *
 accumulate_thread(void *arg)
 {
-	struct VSL_data *vd = arg;
+	struct VSM_data *vd = arg;
 	int i;
 
 	for (;;) {
@@ -238,7 +238,7 @@ accumulate_thread(void *arg)
 }
 
 static void
-do_curses(struct VSL_data *vd)
+do_curses(struct VSM_data *vd)
 {
 	pthread_t thr;
 	int ch;
@@ -319,9 +319,9 @@ int
 main(int argc, char **argv)
 {
 	int o;
-	struct VSL_data *vd;
+	struct VSM_data *vd;
 
-	vd = VSL_New();
+	vd = VSM_New();
 
 	while ((o = getopt(argc, argv, VSL_LOG_ARGS "Vw:")) != -1) {
 		switch (o) {
@@ -338,7 +338,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	if (VSL_OpenLog(vd))
+	if (VSM_OpenLog(vd))
 		exit(1);
 
 	log_ten = log(10.0);

bin/varnishlog/varnishlog.c

@@ -195,7 +195,7 @@ h_order(void *priv, enum vsl_tag tag, unsigned fd, unsigned len,
 }
 
 static void
-do_order(struct VSL_data *vd, int argc, char * const *argv)
+do_order(struct VSM_data *vd, int argc, char * const *argv)
 {
 	int i;
 	const char *error;
@@ -268,7 +268,7 @@ open_log(const char *w_arg, int a_flag)
 }
 
 static void
-do_write(struct VSL_data *vd, const char *w_arg, int a_flag)
+do_write(struct VSM_data *vd, const char *w_arg, int a_flag)
 {
 	int fd, i, l;
 	uint32_t *p;
@@ -316,9 +316,9 @@ main(int argc, char * const *argv)
 	const char *P_arg = NULL;
 	const char *w_arg = NULL;
 	struct pidfh *pfh = NULL;
-	struct VSL_data *vd;
+	struct VSM_data *vd;
 
-	vd = VSL_New();
+	vd = VSM_New();
 
 	while ((c = getopt(argc, argv, VSL_LOG_ARGS "aDoP:uVw:")) != -1) {
 		switch (c) {
@@ -361,7 +361,7 @@ main(int argc, char * const *argv)
 	if (o_flag && w_arg != NULL)
 		usage();
 
-	if (VSL_OpenLog(vd))
+	if (VSM_OpenLog(vd))
 		exit(1);
 
 	if (P_arg && (pfh = vpf_open(P_arg, 0644, NULL)) == NULL) {

bin/varnishncsa/varnishncsa.c

@@ -524,10 +524,10 @@ main(int argc, char *argv[])
 	const char *P_arg = NULL;
 	const char *w_arg = NULL;
 	struct pidfh *pfh = NULL;
-	struct VSL_data *vd;
+	struct VSM_data *vd;
 	FILE *of;
 
-	vd = VSL_New();
+	vd = VSM_New();
 
 	while ((c = getopt(argc, argv, VSL_LOG_ARGS "aDP:Vw:f")) != -1) {
 		switch (c) {
@@ -565,7 +565,7 @@ main(int argc, char *argv[])
 
 	VSL_Log_Arg(vd, 'c', optarg);
 
-	if (VSL_OpenLog(vd))
+	if (VSM_OpenLog(vd))
 		exit(1);
 
 	if (P_arg && (pfh = vpf_open(P_arg, 0644, NULL)) == NULL) {

bin/varnishreplay/varnishreplay.c

@@ -717,10 +717,10 @@ int
 main(int argc, char *argv[])
 {
 	int c;
-	struct VSL_data *vd;
+	struct VSM_data *vd;
 	const char *address = NULL;
 
-	vd = VSL_New();
+	vd = VSM_New();
 	debug = 0;
 
 	VSL_Log_Arg(vd, 'c', NULL);
@@ -743,7 +743,7 @@ main(int argc, char *argv[])
 		usage();
 	}
 
-	if (VSL_OpenLog(vd))
+	if (VSM_OpenLog(vd))
 		exit(1);
 
 	addr_info = init_connection(address);

bin/varnishsizes/varnishsizes.c

@@ -96,7 +96,7 @@ static int scales[] = {
 };
 
 static void
-update(struct VSL_data *vd)
+update(struct VSM_data *vd)
 {
 	int w = COLS / HIST_RANGE;
 	int n = w * HIST_RANGE;
@@ -116,7 +116,7 @@ update(struct VSL_data *vd)
 		mvprintw(LINES - 1, w * i, "|1e%d", j);
 	}
 
-	mvprintw(0, 0, "%*s", COLS - 1, VSL_Name(vd));
+	mvprintw(0, 0, "%*s", COLS - 1, VSM_Name(vd));
 
 	/* count our flock */
 	for (i = 0; i < n; ++i)
@@ -225,7 +225,7 @@ h_hist(void *priv, enum vsl_tag tag, unsigned fd, unsigned len,
 static void *
 accumulate_thread(void *arg)
 {
-	struct VSL_data *vd = arg;
+	struct VSM_data *vd = arg;
 	int i;
 
 	for (;;) {
@@ -239,7 +239,7 @@ accumulate_thread(void *arg)
 }
 
 static void
-do_curses(struct VSL_data *vd)
+do_curses(struct VSM_data *vd)
 {
 	pthread_t thr;
 	int ch;
@@ -320,9 +320,9 @@ int
 main(int argc, char **argv)
 {
 	int o;
-	struct VSL_data *vd;
+	struct VSM_data *vd;
 
-	vd = VSL_New();
+	vd = VSM_New();
 
 	while ((o = getopt(argc, argv, VSL_LOG_ARGS "Vw:")) != -1) {
 		switch (o) {
@@ -339,7 +339,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	if (VSL_OpenLog(vd))
+	if (VSM_OpenLog(vd))
 		exit(1);
 
 	log_ten = log(10.0);

bin/varnishstat/varnishstat.c

@@ -74,7 +74,7 @@ do_xml_cb(void *priv, const struct vsl_statpt * const pt)
 }
 
 static void
-do_xml(const struct VSL_data *vd)
+do_xml(const struct VSM_data *vd)
 {
 	char time_stamp[20];
 	time_t now;
@@ -121,7 +121,7 @@ do_once_cb(void *priv, const struct vsl_statpt * const pt)
 }
 
 static void
-do_once(const struct VSL_data *vd, const struct vsc_main *VSL_stats)
+do_once(const struct VSM_data *vd, const struct vsc_main *VSL_stats)
 {
 	struct once_priv op;
 
@@ -153,7 +153,7 @@ do_list_cb(void *priv, const struct vsl_statpt * const pt)
 }
 
 static void
-list_fields(const struct VSL_data *vd)
+list_fields(const struct VSM_data *vd)
 {
 	fprintf(stderr, "Varnishstat -f option fields:\n");
 	fprintf(stderr, "Field name                     Description\n");
@@ -192,11 +192,11 @@ int
 main(int argc, char * const *argv)
 {
 	int c;
-	struct VSL_data *vd;
+	struct VSM_data *vd;
 	const struct vsc_main *VSL_stats;
 	int delay = 1, once = 0, xml = 0;
 
-	vd = VSL_New();
+	vd = VSM_New();
 
 	while ((c = getopt(argc, argv, VSL_STAT_ARGS "1f:lVw:x")) != -1) {
 		switch (c) {
@@ -207,7 +207,7 @@ main(int argc, char * const *argv)
 			(void)VSL_Stat_Arg(vd, c, optarg);
 			break;
 		case 'l':
-			if (VSL_Open(vd, 1))
+			if (VSM_Open(vd, 1))
 				exit(1);
 			list_fields(vd);
 			exit(0);
@@ -227,10 +227,10 @@ main(int argc, char * const *argv)
 		}
 	}
 
-	if (VSL_Open(vd, 1))
+	if (VSM_Open(vd, 1))
 		exit(1);
 
-	if ((VSL_stats = VSL_OpenStats(vd)) == NULL)
+	if ((VSL_stats = VSM_OpenStats(vd)) == NULL)
 		exit(1);
 
 	if (xml)

bin/varnishstat/varnishstat.h

@@ -27,4 +27,4 @@
  *
  */
 
-void do_curses(struct VSL_data *vd, const struct vsc_main *VSL_stats, int delay);
+void do_curses(struct VSM_data *vd, const struct vsc_main *VSL_stats, int delay);

bin/varnishstat/varnishstat_curses.c

@@ -100,7 +100,7 @@ do_curses_cb(void *priv, const struct vsl_statpt * const sp)
 }
 
 static void
-prep_pts(const struct VSL_data *vd)
+prep_pts(const struct VSM_data *vd)
 {
 	struct pt *pt, *pt2;
 
@@ -123,7 +123,7 @@ myexp(double *acc, double val, unsigned *n, unsigned nmax)
 }
 
 void
-do_curses(struct VSL_data *vd, const struct vsc_main *VSL_stats,
+do_curses(struct VSM_data *vd, const struct vsc_main *VSL_stats,
     int delay)
 {
 	intmax_t ju;
@@ -164,7 +164,7 @@ do_curses(struct VSL_data *vd, const struct vsc_main *VSL_stats,
 			 * Only check if it looks like nothing is happening.
 			 */
 			act = VSL_stats->cache_hit + VSL_stats->cache_miss + 1;
-			if (act == lact && VSL_ReOpen(vd, 1))
+			if (act == lact && VSM_ReOpen(vd, 1))
 				break;
 			lact = act;
 
@@ -175,7 +175,7 @@ do_curses(struct VSL_data *vd, const struct vsc_main *VSL_stats,
 			rt = VSL_stats->uptime;
 			up = rt;
 
-			AC(mvprintw(0, 0, "%*s", COLS - 1, VSL_Name(vd)));
+			AC(mvprintw(0, 0, "%*s", COLS - 1, VSM_Name(vd)));
 			AC(mvprintw(0, 0, "%d+%02d:%02d:%02d", rt / 86400,
 			    (rt % 86400) / 3600, (rt % 3600) / 60, rt % 60));
 

bin/varnishtest/vtc_varnish.c

@@ -81,7 +81,7 @@ struct varnish {
 	int			vcl_nbr;
 	char			*workdir;
 
-	struct VSL_data		*vd;
+	struct VSM_data		*vd;
 };
 
 static VTAILQ_HEAD(, varnish)	varnishes =
@@ -200,7 +200,7 @@ varnish_delete(struct varnish *v)
 	vtc_logclose(v->vl);
 	free(v->name);
 	free(v->workdir);
-	VSL_Delete(v->vd);
+	VSM_Delete(v->vd);
 
 	/*
 	 * We do not delete the workdir, it may contain stuff people
@@ -261,7 +261,7 @@ varnish_launch(struct varnish *v)
 	enum cli_status_e u;
 	char *r;
 
-	v->vd = VSL_New();
+	v->vd = VSM_New();
 
 	/* Create listener socket */
 	nap = VSS_resolve("127.0.0.1", "0", &ap);
@@ -363,10 +363,10 @@ varnish_launch(struct varnish *v)
 	free(r);
 
 	if (v->stats != NULL)
-		VSL_Close(v->vd);
+		VSM_Close(v->vd);
 	(void)VSL_Log_Arg(v->vd, 'n', v->workdir);
-	AZ(VSL_Open(v->vd, 1));
-	v->stats = VSL_OpenStats(v->vd);
+	AZ(VSM_Open(v->vd, 1));
+	v->stats = VSM_OpenStats(v->vd);
 }
 
 /**********************************************************************

bin/varnishtop/varnishtop.c

@@ -143,7 +143,7 @@ accumulate(uint32_t * const p)
 }
 
 static void
-update(const struct VSL_data *vd)
+update(const struct VSM_data *vd)
 {
 	struct top *tp, *tp2;
 	int l, len;
@@ -158,7 +158,7 @@ update(const struct VSL_data *vd)
 
 	l = 1;
 	AC(erase());
-	AC(mvprintw(0, 0, "%*s", COLS - 1, VSL_Name(vd)));
+	AC(mvprintw(0, 0, "%*s", COLS - 1, VSM_Name(vd)));
 	AC(mvprintw(0, 0, "list length %u", ntop));
 	VTAILQ_FOREACH_SAFE(tp, &top_head, list, tp2) {
 		if (++l < LINES) {
@@ -185,7 +185,7 @@ update(const struct VSL_data *vd)
 static void *
 accumulate_thread(void *arg)
 {
-	struct VSL_data *vd = arg;
+	struct VSM_data *vd = arg;
 	uint32_t *p;
 	int i;
 
@@ -207,7 +207,7 @@ accumulate_thread(void *arg)
 }
 
 static void
-do_curses(struct VSL_data *vd)
+do_curses(struct VSM_data *vd)
 {
 	pthread_t thr;
 	int i;
@@ -284,7 +284,7 @@ dump(void)
 }
 
 static void
-do_once(struct VSL_data *vd)
+do_once(struct VSM_data *vd)
 {
 	uint32_t *p;
 
@@ -304,10 +304,10 @@ usage(void)
 int
 main(int argc, char **argv)
 {
-	struct VSL_data *vd;
+	struct VSM_data *vd;
 	int o, once = 0;
 
-	vd = VSL_New();
+	vd = VSM_New();
 
 	while ((o = getopt(argc, argv, VSL_LOG_ARGS "1fV")) != -1) {
 		switch (o) {
@@ -328,7 +328,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	if (VSL_OpenLog(vd))
+	if (VSM_OpenLog(vd))
 		exit (1);
 
 	if (once) {

include/varnishapi.h

@@ -42,10 +42,10 @@
 
 
 /*---------------------------------------------------------------------
- * Level 0:  Create and destroy the VSL_data handle structure
+ * VSM level access functions
  */
 
-struct VSL_data *VSL_New(void);
+struct VSM_data *VSM_New(void);
 	/*
 	 * Allocate and initialize a VSL_data handle structure.
 	 * This is the first thing you will have to do, always.
@@ -55,16 +55,16 @@ struct VSL_data *VSL_New(void);
 	 * 	Pointer to usable VSL_data handle.
 	 */
 
-typedef void vsl_diag_f(void *priv, const char *fmt, ...);
+typedef void vsm_diag_f(void *priv, const char *fmt, ...);
 
-void VSL_Diag(struct VSL_data *vd, vsl_diag_f *func, void *priv);
+void VSM_Diag(struct VSM_data *vd, vsm_diag_f *func, void *priv);
 	/*
 	 * Set the diagnostics reporting function.
 	 * Default is fprintf(stderr, ...)
 	 * If func is NULL, diagnostics are disabled.
 	 */
 
-int VSL_n_Arg(struct VSL_data *vd, const char *n_arg);
+int VSM_n_Arg(struct VSM_data *vd, const char *n_arg);
 	/*
 	 * Configure which varnishd instance to access.
 	 * Can also be, and normally is done through the VSL_Log_arg()
@@ -74,23 +74,19 @@ int VSL_n_Arg(struct VSL_data *vd, const char *n_arg);
 	 *	 -1 on failure, with diagnostic on stderr.
 	 */
 
-const char *VSL_Name(const struct VSL_data *vd);
+const char *VSM_Name(const struct VSM_data *vd);
 	/*
 	 * Return the instance name.
 	 */
 
-void VSL_Delete(struct VSL_data *vd);
+void VSM_Delete(struct VSM_data *vd);
 	/*
 	 * Close and deallocate all storage and mappings.
 	 */
 
 /* XXX: extension:  Patience argument for sleeps */
 
-/*---------------------------------------------------------------------
- * Level 1:  Open/Close and find allocation in shared memory segment
- */
-
-int VSL_Open(struct VSL_data *vd, int diag);
+int VSM_Open(struct VSM_data *vd, int diag);
 	/*
 	 * Attempt to open and map the shared memory file.
 	 * If diag is non-zero, diagnostics are emitted.
@@ -99,20 +95,31 @@ int VSL_Open(struct VSL_data *vd, int diag);
 	 * 	!= 0 on failure
 	 */
 
-int VSL_ReOpen(struct VSL_data *vd, int diag);
+int VSM_ReOpen(struct VSM_data *vd, int diag);
 	/*
 	 * Check if shared memory segment needs to be reopened/remapped
 	 * typically when the varnishd master process restarts.
-	 * diag is passed to VSL_Open()
+	 * diag is passed to VSM_Open()
 	 * Returns:
 	 *	0  No reopen needed.
 	 *	1  shared memory reopened/remapped.
 	 *	-1 failure to reopen.
 	 */
 
-void *VSL_Find_Alloc(struct VSL_data *vd, const char *class, const char *type,
+struct vsm_head *VSM_Head(struct VSM_data *vd);
+	/*
+	 * Return the head of the VSM.
+	 */
+
+void *VSM_Find_Chunk(struct VSM_data *vd, const char *class, const char *type,
     const char *ident, unsigned *lenp);
-void VSL_Close(struct VSL_data *vd);
+void VSM_Close(struct VSM_data *vd);
+
+struct vsm_chunk *vsm_iter0(const struct VSM_data *vd);
+void vsm_itern(const struct VSM_data *vd, struct vsm_chunk **pp);
+
+#define VSM_FOREACH(var, vd) \
+	for((var) = vsm_iter0((vd)); (var) != NULL; vsm_itern((vd), &(var)))
 
 
 /* shmlog.c */
@@ -125,24 +132,18 @@ typedef int vsl_handler(void *priv, enum vsl_tag tag, unsigned fd,
 #define VSL_USAGE	"[-bCcd] [-i tag] [-I regexp] [-k keep]" \
 			" [-r file] [-s skip] [-X regexp] [-x tag]"
 vsl_handler VSL_H_Print;
-struct VSL_data;
-void VSL_Select(const struct VSL_data *vd, unsigned tag);
-int VSL_OpenLog(struct VSL_data *vd);
-void VSL_NonBlocking(struct VSL_data *vd, int nb);
-int VSL_Dispatch(struct VSL_data *vd, vsl_handler *func, void *priv);
-int VSL_NextLog(struct VSL_data *lh, uint32_t **pp);
-int VSL_Log_Arg(struct VSL_data *vd, int arg, const char *opt);
-int VSL_Stat_Arg(struct VSL_data *vd, int arg, const char *opt);
-struct vsc_main *VSL_OpenStats(struct VSL_data *vd);
+struct VSM_data;
+void VSL_Select(const struct VSM_data *vd, unsigned tag);
+int VSM_OpenLog(struct VSM_data *vd);
+void VSL_NonBlocking(struct VSM_data *vd, int nb);
+int VSL_Dispatch(struct VSM_data *vd, vsl_handler *func, void *priv);
+int VSL_NextLog(struct VSM_data *lh, uint32_t **pp);
+int VSL_Log_Arg(struct VSM_data *vd, int arg, const char *opt);
+int VSL_Stat_Arg(struct VSM_data *vd, int arg, const char *opt);
+struct vsc_main *VSM_OpenStats(struct VSM_data *vd);
 extern const char *VSL_tags[256];
 
 
-struct vsm_chunk *vsl_iter0(const struct VSL_data *vd);
-void vsl_itern(const struct VSL_data *vd, struct vsm_chunk **pp);
-
-#define VSL_FOREACH(var, vd) \
-	for((var) = vsl_iter0((vd)); (var) != NULL; vsl_itern((vd), &(var)))
-
 struct vsl_statpt {
 	const char *class;	/* stat struct type			*/
 	const char *ident;	/* stat struct ident			*/
@@ -155,7 +156,7 @@ struct vsl_statpt {
 
 typedef int vsl_stat_f(void *priv, const struct vsl_statpt *const pt);
 
-int VSL_IterStat(const struct VSL_data *vd, vsl_stat_f *func, void *priv);
+int VSL_IterStat(const struct VSM_data *vd, vsl_stat_f *func, void *priv);
 
 /* base64.c */
 void base64_init(void);

lib/libvarnishapi/Makefile.am

@@ -17,7 +17,7 @@ libvarnishapi_la_SOURCES = \
 	../libvarnish/vmb.c \
 	../libvarnish/vre.c \
 	base64.c \
-	vsl.c \
+	vsm.c \
 	vsl_arg.c \
 	vsl_log.c \
 	vsl_stat.c

lib/libvarnishapi/vsl_arg.c

@@ -57,10 +57,10 @@ SVNID("$Id$")
 /*--------------------------------------------------------------------*/
 
 static int
-vsl_r_arg(struct VSL_data *vd, const char *opt)
+vsl_r_arg(struct VSM_data *vd, const char *opt)
 {
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	if (!strcmp(opt, "-"))
 		vd->r_fd = STDIN_FILENO;
 	else
@@ -75,13 +75,13 @@ vsl_r_arg(struct VSL_data *vd, const char *opt)
 /*--------------------------------------------------------------------*/
 
 static int
-vsl_IX_arg(struct VSL_data *vd, const char *opt, int arg)
+vsl_IX_arg(struct VSM_data *vd, const char *opt, int arg)
 {
 	vre_t **rp;
 	const char *error;
 	int erroroffset;
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	if (arg == 'I')
 		rp = &vd->regincl;
 	else
@@ -101,12 +101,12 @@ vsl_IX_arg(struct VSL_data *vd, const char *opt, int arg)
 /*--------------------------------------------------------------------*/
 
 static int
-vsl_ix_arg(struct VSL_data *vd, const char *opt, int arg)
+vsl_ix_arg(struct VSM_data *vd, const char *opt, int arg)
 {
 	int i, j, l;
 	const char *b, *e, *p, *q;
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	/* If first option is 'i', set all bits for supression */
 	if (arg == 'i' && !(vd->flags & F_SEEN_IX))
 		for (i = 0; i < 256; i++)
@@ -153,11 +153,11 @@ vsl_ix_arg(struct VSL_data *vd, const char *opt, int arg)
 /*--------------------------------------------------------------------*/
 
 static int
-vsl_s_arg(struct VSL_data *vd, const char *opt)
+vsl_s_arg(struct VSM_data *vd, const char *opt)
 {
 	char *end;
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	if (*opt == '\0') {
 		fprintf(stderr, "number required for -s\n");
 		return (-1);
@@ -173,11 +173,11 @@ vsl_s_arg(struct VSL_data *vd, const char *opt)
 /*--------------------------------------------------------------------*/
 
 static int
-vsl_k_arg(struct VSL_data *vd, const char *opt)
+vsl_k_arg(struct VSM_data *vd, const char *opt)
 {
 	char *end;
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	if (*opt == '\0') {
 		fprintf(stderr, "number required for -k\n");
 		return (-1);
@@ -193,10 +193,10 @@ vsl_k_arg(struct VSL_data *vd, const char *opt)
 /*--------------------------------------------------------------------*/
 
 int
-VSL_Log_Arg(struct VSL_data *vd, int arg, const char *opt)
+VSL_Log_Arg(struct VSM_data *vd, int arg, const char *opt)
 {
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	switch (arg) {
 	case 'b': vd->b_opt = !vd->b_opt; return (1);
 	case 'c': vd->c_opt = !vd->c_opt; return (1);
@@ -206,7 +206,7 @@ VSL_Log_Arg(struct VSL_data *vd, int arg, const char *opt)
 		return (1);
 	case 'i': case 'x': return (vsl_ix_arg(vd, opt, arg));
 	case 'k': return (vsl_k_arg(vd, opt));
-	case 'n': return (VSL_n_Arg(vd, opt));
+	case 'n': return (VSM_n_Arg(vd, opt));
 	case 'r': return (vsl_r_arg(vd, opt));
 	case 's': return (vsl_s_arg(vd, opt));
 	case 'I': case 'X': return (vsl_IX_arg(vd, opt, arg));
@@ -229,13 +229,13 @@ VSL_Log_Arg(struct VSL_data *vd, int arg, const char *opt)
 /*--------------------------------------------------------------------*/
 
 static int
-vsl_sf_arg(struct VSL_data *vd, const char *opt)
+vsl_sf_arg(struct VSM_data *vd, const char *opt)
 {
 	struct vsl_sf *sf;
 	char **av, *q, *p;
 	int i;
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 
 	if (VTAILQ_EMPTY(&vd->sf_list)) {
 		if (*opt == '^')
@@ -309,13 +309,13 @@ vsl_sf_arg(struct VSL_data *vd, const char *opt)
 /*--------------------------------------------------------------------*/
 
 int
-VSL_Stat_Arg(struct VSL_data *vd, int arg, const char *opt)
+VSL_Stat_Arg(struct VSM_data *vd, int arg, const char *opt)
 {
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	switch (arg) {
 	case 'f': return (vsl_sf_arg(vd, opt));
-	case 'n': return (VSL_n_Arg(vd, opt));
+	case 'n': return (VSM_n_Arg(vd, opt));
 	default:
 		return (0);
 	}

lib/libvarnishapi/vsl_log.c

@@ -52,7 +52,7 @@ SVNID("$Id$")
 #include "vslapi.h"
 #include "vmb.h"
 
-static int vsl_nextlog(struct VSL_data *vd, uint32_t **pp);
+static int vsl_nextlog(struct VSM_data *vd, uint32_t **pp);
 
 /*--------------------------------------------------------------------*/
 
@@ -65,10 +65,10 @@ const char *VSL_tags[256] = {
 /*--------------------------------------------------------------------*/
 
 void
-VSL_Select(const struct VSL_data *vd, unsigned tag)
+VSL_Select(const struct VSM_data *vd, unsigned tag)
 {
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	vbit_set(vd->vbm_select, tag);
 }
 
@@ -76,7 +76,7 @@ VSL_Select(const struct VSL_data *vd, unsigned tag)
 /*--------------------------------------------------------------------*/
 
 void
-VSL_NonBlocking(struct VSL_data *vd, int nb)
+VSL_NonBlocking(struct VSM_data *vd, int nb)
 {
 	if (nb)
 		vd->flags |= F_NON_BLOCKING;
@@ -87,13 +87,13 @@ VSL_NonBlocking(struct VSL_data *vd, int nb)
 /*--------------------------------------------------------------------*/
 
 static int
-vsl_nextlog(struct VSL_data *vd, uint32_t **pp)
+vsl_nextlog(struct VSM_data *vd, uint32_t **pp)
 {
 	unsigned w, l;
 	uint32_t t;
 	int i;
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	if (vd->r_fd != -1) {
 		assert(vd->rbuflen >= 8);
 		i = read(vd->r_fd, vd->rbuf, 8);
@@ -138,14 +138,14 @@ vsl_nextlog(struct VSL_data *vd, uint32_t **pp)
 }
 
 int
-VSL_NextLog(struct VSL_data *vd, uint32_t **pp)
+VSL_NextLog(struct VSM_data *vd, uint32_t **pp)
 {
 	uint32_t *p;
 	unsigned char t;
 	unsigned u;
 	int i;
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	while (1) {
 		i = vsl_nextlog(vd, &p);
 		if (i != 1)
@@ -204,13 +204,13 @@ VSL_NextLog(struct VSL_data *vd, uint32_t **pp)
 /*--------------------------------------------------------------------*/
 
 int
-VSL_Dispatch(struct VSL_data *vd, vsl_handler *func, void *priv)
+VSL_Dispatch(struct VSM_data *vd, vsl_handler *func, void *priv)
 {
 	int i;
 	unsigned u, l, s;
 	uint32_t *p;
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	while (1) {
 		i = VSL_NextLog(vd, &p);
 		if (i != 1)
@@ -260,12 +260,12 @@ VSL_H_Print(void *priv, enum vsl_tag tag, unsigned fd, unsigned len,
 /*--------------------------------------------------------------------*/
 
 int
-VSL_OpenLog(struct VSL_data *vd)
+VSM_OpenLog(struct VSM_data *vd)
 {
 	struct vsm_chunk *sha;
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
-	sha = vsl_find_alloc(vd, VSL_CLASS, "", "");
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
+	sha = vsm_find_alloc(vd, VSL_CLASS, "", "");
 	assert(sha != NULL);
 
 	vd->log_start = VSM_PTR(sha);

lib/libvarnishapi/vsl_stat.c

@@ -49,13 +49,13 @@ SVNID("$Id$")
 /*--------------------------------------------------------------------*/
 
 struct vsc_main *
-VSL_OpenStats(struct VSL_data *vd)
+VSM_OpenStats(struct VSM_data *vd)
 {
 	struct vsm_chunk *sha;
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 
-	sha = vsl_find_alloc(vd, VSC_CLASS, "", "");
+	sha = vsm_find_alloc(vd, VSC_CLASS, "", "");
 	assert(sha != NULL);
 	return (VSM_PTR(sha));
 }
@@ -78,7 +78,7 @@ iter_test(const char *s1, const char *s2, int wc)
 }
 
 static int
-iter_call(const struct VSL_data *vd, vsl_stat_f *func, void *priv,
+iter_call(const struct VSM_data *vd, vsl_stat_f *func, void *priv,
     const struct vsl_statpt *const sp)
 {
 	struct vsl_sf *sf;
@@ -105,7 +105,7 @@ iter_call(const struct VSL_data *vd, vsl_stat_f *func, void *priv,
 }
 
 static int
-iter_main(const struct VSL_data *vd, struct vsm_chunk *sha, vsl_stat_f *func,
+iter_main(const struct VSM_data *vd, struct vsm_chunk *sha, vsl_stat_f *func,
     void *priv)
 {
 	struct vsc_main *st = VSM_PTR(sha);
@@ -129,7 +129,7 @@ iter_main(const struct VSL_data *vd, struct vsm_chunk *sha, vsl_stat_f *func,
 }
 
 static int
-iter_sma(const struct VSL_data *vd, struct vsm_chunk *sha, vsl_stat_f *func,
+iter_sma(const struct VSM_data *vd, struct vsm_chunk *sha, vsl_stat_f *func,
     void *priv)
 {
 	struct vsc_sma *st = VSM_PTR(sha);
@@ -153,13 +153,13 @@ iter_sma(const struct VSL_data *vd, struct vsm_chunk *sha, vsl_stat_f *func,
 }
 
 int
-VSL_IterStat(const struct VSL_data *vd, vsl_stat_f *func, void *priv)
+VSL_IterStat(const struct VSM_data *vd, vsl_stat_f *func, void *priv)
 {
 	struct vsm_chunk *sha;
 	int i;
 
 	i = 0;
-	VSL_FOREACH(sha, vd) {
+	VSM_FOREACH(sha, vd) {
 		CHECK_OBJ_NOTNULL(sha, VSM_CHUNK_MAGIC);
 		if (strcmp(sha->class, VSC_CLASS))
 			continue;

lib/libvarnishapi/vslapi.h

@@ -47,11 +47,11 @@ struct vsl_sf {
 	char			*name;
 };
 
-struct VSL_data {
+struct VSM_data {
 	unsigned		magic;
-#define VSL_MAGIC		0x6e3bd69b
+#define VSM_MAGIC		0x6e3bd69b
 
-	vsl_diag_f		*diag;
+	vsm_diag_f		*diag;
 	void			*priv;
 
 	char			*n_opt;
@@ -117,5 +117,5 @@ struct VSL_data {
 	unsigned long		keep;
 };
 
-struct vsm_chunk *vsl_find_alloc(const struct VSL_data *vd, const char *class,
+struct vsm_chunk *vsm_find_alloc(const struct VSM_data *vd, const char *class,
     const char *type, const char *ident);

lib/libvarnishapi/vsl.c → lib/libvarnishapi/vsm.c

@@ -60,15 +60,15 @@ SVNID("$Id$")
 
 /*--------------------------------------------------------------------*/
 
-struct VSL_data *
-VSL_New(void)
+struct VSM_data *
+VSM_New(void)
 {
-	struct VSL_data *vd;
+	struct VSM_data *vd;
 
-	ALLOC_OBJ(vd, VSL_MAGIC);
+	ALLOC_OBJ(vd, VSM_MAGIC);
 	AN(vd);
 
-	vd->diag = (vsl_diag_f*)fprintf;
+	vd->diag = (vsm_diag_f*)fprintf;
 	vd->priv = stderr;
 
 	vd->vsl_fd = -1;
@@ -89,19 +89,19 @@ VSL_New(void)
 
 	VTAILQ_INIT(&vd->sf_list);
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	return (vd);
 }
 
 /*--------------------------------------------------------------------*/
 
 void
-VSL_Diag(struct VSL_data *vd, vsl_diag_f *func, void *priv)
+VSM_Diag(struct VSM_data *vd, vsm_diag_f *func, void *priv)
 {
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	if (func == NULL)
-		vd->diag = (vsl_diag_f*)getpid;
+		vd->diag = (vsm_diag_f*)getpid;
 	else
 		vd->diag = func;
 	vd->priv = priv;
@@ -110,10 +110,10 @@ VSL_Diag(struct VSL_data *vd, vsl_diag_f *func, void *priv)
 /*--------------------------------------------------------------------*/
 
 int
-VSL_n_Arg(struct VSL_data *vd, const char *opt)
+VSM_n_Arg(struct VSM_data *vd, const char *opt)
 {
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	REPLACE(vd->n_opt, opt);
 	AN(vd->n_opt);
 	if (vin_n_arg(vd->n_opt, NULL, NULL, &vd->fname)) {
@@ -127,22 +127,22 @@ VSL_n_Arg(struct VSL_data *vd, const char *opt)
 /*--------------------------------------------------------------------*/
 
 const char *
-VSL_Name(const struct VSL_data *vd)
+VSM_Name(const struct VSM_data *vd)
 {
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	return (vd->n_opt);
 }
 
 /*--------------------------------------------------------------------*/
 
 void
-VSL_Delete(struct VSL_data *vd)
+VSM_Delete(struct VSM_data *vd)
 {
 	struct vsl_sf *sf;
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
-	VSL_Close(vd);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
+	VSM_Close(vd);
 	vbit_destroy(vd->vbm_client);
 	vbit_destroy(vd->vbm_backend);
 	vbit_destroy(vd->vbm_supress);
@@ -166,11 +166,12 @@ VSL_Delete(struct VSL_data *vd)
 /*--------------------------------------------------------------------*/
 
 static int
-vsl_open(struct VSL_data *vd, int diag)
+vsl_open(struct VSM_data *vd, int diag)
 {
 	int i;
 	struct vsm_head slh;
 
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	if (vd->vsl_lh != NULL)
 		return (0);
 
@@ -223,18 +224,21 @@ vsl_open(struct VSL_data *vd, int diag)
 /*--------------------------------------------------------------------*/
 
 int
-VSL_Open(struct VSL_data *vd, int diag)
+VSM_Open(struct VSM_data *vd, int diag)
 
 {
 
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	return (vsl_open(vd, diag));
 }
 
 /*--------------------------------------------------------------------*/
 
 void
-VSL_Close(struct VSL_data *vd)
+VSM_Close(struct VSM_data *vd)
 {
+
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	if (vd->vsl_lh == NULL)
 		return;
 	assert(0 == munmap((void*)vd->vsl_lh, vd->vsl_lh->shm_size));
@@ -247,11 +251,12 @@ VSL_Close(struct VSL_data *vd)
 /*--------------------------------------------------------------------*/
 
 int
-VSL_ReOpen(struct VSL_data *vd, int diag)
+VSM_ReOpen(struct VSM_data *vd, int diag)
 {
 	struct stat st;
 	int i;
 
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	AN(vd->vsl_lh);
 
 	if (stat(vd->fname, &st))
@@ -260,7 +265,7 @@ VSL_ReOpen(struct VSL_data *vd, int diag)
 	if (st.st_dev == vd->fstat.st_dev && st.st_ino == vd->fstat.st_ino)
 		return (0);
 
-	VSL_Close(vd);
+	VSM_Close(vd);
 	for (i = 0; i < 5; i++) {		/* XXX param */
 		if (!vsl_open(vd, 0))
 			return (1);
@@ -272,44 +277,26 @@ VSL_ReOpen(struct VSL_data *vd, int diag)
 
 /*--------------------------------------------------------------------*/
 
-struct vsm_chunk *
-vsl_iter0(const struct VSL_data *vd)
+struct vsm_head *
+VSM_Head(struct VSM_data *vd)
 {
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
-	if (vd->alloc_seq != vd->vsl_lh->alloc_seq)
-		return(NULL);
-	CHECK_OBJ_NOTNULL(&vd->vsl_lh->head, VSM_CHUNK_MAGIC);
-	return (&vd->vsl_lh->head);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
+	AN(vd->vsl_lh);
+	return(vd->vsl_lh);
 }
 
-void
-vsl_itern(const struct VSL_data *vd, struct vsm_chunk **pp)
-{
-
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
-	if (vd->alloc_seq != vd->vsl_lh->alloc_seq) {
-		*pp = NULL;
-		return;
-	}
-	CHECK_OBJ_NOTNULL(*pp, VSM_CHUNK_MAGIC);
-	*pp = VSM_NEXT(*pp);
-	if ((void*)(*pp) >= vd->vsl_end) {
-		*pp = NULL;
-		return;
-	}
-	CHECK_OBJ_NOTNULL(*pp, VSM_CHUNK_MAGIC);
-}
 
 /*--------------------------------------------------------------------*/
 
 struct vsm_chunk *
-vsl_find_alloc(const struct VSL_data *vd, const char *class, const char *type, const char *ident)
+vsm_find_alloc(const struct VSM_data *vd, const char *class, const char *type, const char *ident)
 {
 	struct vsm_chunk *sha;
 
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	assert (vd->vsl_lh != NULL);
-	VSL_FOREACH(sha, vd) {
+	VSM_FOREACH(sha, vd) {
 		CHECK_OBJ_NOTNULL(sha, VSM_CHUNK_MAGIC);
 		if (strcmp(sha->class, class))
 			continue;
@@ -325,16 +312,47 @@ vsl_find_alloc(const struct VSL_data *vd, const char *class, const char *type, c
 /*--------------------------------------------------------------------*/
 
 void *
-VSL_Find_Alloc(struct VSL_data *vd, const char *class, const char *type, const char *ident,
+VSM_Find_Chunk(struct VSM_data *vd, const char *class, const char *type, const char *ident,
     unsigned *lenp)
 {
 	struct vsm_chunk *sha;
 
-	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
-	sha = vsl_find_alloc(vd, class, type, ident);
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
+	sha = vsm_find_alloc(vd, class, type, ident);
 	if (sha == NULL)
 		return (NULL);
 	if (lenp != NULL)
 		*lenp = sha->len - sizeof *sha;
 	return (VSM_PTR(sha));
 }
+
+/*--------------------------------------------------------------------*/
+
+struct vsm_chunk *
+vsm_iter0(const struct VSM_data *vd)
+{
+
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
+	if (vd->alloc_seq != vd->vsl_lh->alloc_seq)
+		return(NULL);
+	CHECK_OBJ_NOTNULL(&vd->vsl_lh->head, VSM_CHUNK_MAGIC);
+	return (&vd->vsl_lh->head);
+}
+
+void
+vsm_itern(const struct VSM_data *vd, struct vsm_chunk **pp)
+{
+
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
+	if (vd->alloc_seq != vd->vsl_lh->alloc_seq) {
+		*pp = NULL;
+		return;
+	}
+	CHECK_OBJ_NOTNULL(*pp, VSM_CHUNK_MAGIC);
+	*pp = VSM_NEXT(*pp);
+	if ((void*)(*pp) >= vd->vsl_end) {
+		*pp = NULL;
+		return;
+	}
+	CHECK_OBJ_NOTNULL(*pp, VSM_CHUNK_MAGIC);
+}