Isolate VSC from VSM

lib/libvarnishapi/Makefile.am

@@ -14,7 +14,7 @@ libvarnishapi_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:6:0
 libvarnishapi_la_SOURCES = \
 	vjsn.c \
 	vjsn.h \
-	vsm_api.h \
+	vsc_priv.h \
 	vsl_api.h \
 	vxp.h \
 	vxp_tokens.h \

lib/libvarnishapi/vsc.c

@@ -49,7 +49,7 @@
 #include "vapi/vsc.h"
 #include "vapi/vsm.h"
 
-#include "vsm_api.h"
+#include "vsc_priv.h"
 
 struct vsc_vf {
 	unsigned		magic;
@@ -111,18 +111,20 @@ static const size_t nlevels =
 static struct vsc *
 vsc_setup(struct VSM_data *vd)
 {
+	struct vsc *vsc;
 
-	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
-	if (vd->vsc == NULL) {
-		ALLOC_OBJ(vd->vsc, VSC_MAGIC);
-		AN(vd->vsc);
-		VTAILQ_INIT(&vd->vsc->vf_list);
-		VTAILQ_INIT(&vd->vsc->pt_list);
-		VTAILQ_INIT(&vd->vsc->sf_list_include);
-		VTAILQ_INIT(&vd->vsc->sf_list_exclude);
+	vsc = VSM_GetVSC(vd);
+	if (vsc == NULL) {
+		ALLOC_OBJ(vsc, VSC_MAGIC);
+		AN(vsc);
+		VTAILQ_INIT(&vsc->vf_list);
+		VTAILQ_INIT(&vsc->pt_list);
+		VTAILQ_INIT(&vsc->sf_list_include);
+		VTAILQ_INIT(&vsc->sf_list_exclude);
+		VSM_SetVSC(vd, vsc);
 	}
-	CHECK_OBJ_NOTNULL(vd->vsc, VSC_MAGIC);
-	return (vd->vsc);
+	CHECK_OBJ_NOTNULL(vsc, VSC_MAGIC);
+	return (vsc);
 }
 
 /*--------------------------------------------------------------------*/
@@ -168,13 +170,9 @@ vsc_delete_sf_list(struct vsc_sf_head *head)
 }
 
 void
-VSC_Delete(struct VSM_data *vd)
+VSC_Delete(struct vsc *vsc)
 {
-	struct vsc *vsc;
 
-	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
-	vsc = vd->vsc;
-	vd->vsc = NULL;
 	CHECK_OBJ_NOTNULL(vsc, VSC_MAGIC);
 	vsc_delete_sf_list(&vsc->sf_list_include);
 	vsc_delete_sf_list(&vsc->sf_list_exclude);
@@ -343,7 +341,7 @@ vsc_build_pt_list(struct VSM_data *vd)
 		vve = vjsn_child(vf->vjsn->value, "elem");
 		AN(vve);
 		VTAILQ_FOREACH(vv, &vve->children, list) {
-			vdsc = calloc(sizeof *vd, 1);
+			vdsc = calloc(sizeof *vdsc, 1);
 			AN(vdsc);
 
 #define DOF(n, k)						\

lib/libvarnishapi/vsm_api.h → lib/libvarnishapi/vsc_priv.h

@@ -29,30 +29,8 @@
  */
 
 struct vsc;
-struct vsb;
+struct VSM_data;
 
-struct VSM_data {
-	unsigned		magic;
-#define VSM_MAGIC		0x6e3bd69b
-
-	struct vsb		*diag;
-
-	char			*dname;
-	char			*iname;
-
-	struct stat		fstat;
-
-	int			vsm_fd;
-	struct VSM_head		*head;
-	char			*b;
-	char			*e;
-
-	uint64_t		age_ok;
-	double			t_ok;
-
-	struct vsc		*vsc;
-};
-
-int vsm_diag(struct VSM_data *vd, const char *fmt, ...)
-    __v_printflike(2, 3);
-void VSC_Delete(struct VSM_data *vd);
+void VSM_SetVSC(struct VSM_data *, struct vsc *);
+struct vsc *VSM_GetVSC(const struct VSM_data *);
+void VSC_Delete(struct vsc *);

lib/libvarnishapi/vsl_cursor.c

@@ -54,7 +54,6 @@
 #include "vapi/vsm.h"
 
 #include "vsl_api.h"
-#include "vsm_api.h"
 
 struct vslc_vsm {
 	unsigned			magic;
@@ -125,7 +124,6 @@ vslc_vsm_next(const struct VSL_cursor *cursor)
 
 	CAST_OBJ_NOTNULL(c, cursor->priv_data, VSLC_VSM_MAGIC);
 	assert(&c->cursor == cursor);
-	CHECK_OBJ_NOTNULL(c->vsm, VSM_MAGIC);
 
 	while (1) {
 		i = vslc_vsm_check(&c->cursor, &c->next);
@@ -248,7 +246,6 @@ VSL_CursorVSM(struct VSL_data *vsl, struct VSM_data *vsm, unsigned options)
 	int i;
 
 	CHECK_OBJ_NOTNULL(vsl, VSL_MAGIC);
-	CHECK_OBJ_NOTNULL(vsm, VSM_MAGIC);
 
 	if (!VSM_Get(vsm, &vf, VSL_CLASS, "", "")) {
 		(void)vsl_diag(vsl,

lib/libvarnishapi/vsm.c

@@ -48,11 +48,11 @@
 #include "vin.h"
 #include "vsb.h"
 #include "vsm_priv.h"
+#include "vsc_priv.h"
 #include "vtim.h"
 
 #include "vapi/vsm.h"
 
-#include "vsm_api.h"
 
 #ifndef MAP_HASSEMAPHORE
 #define MAP_HASSEMAPHORE 0 /* XXX Linux */
@@ -64,6 +64,32 @@ const struct vsm_valid VSM_similar[1] = {{"similar"}};
 
 /*--------------------------------------------------------------------*/
 
+struct vsc;
+
+struct VSM_data {
+	unsigned		magic;
+#define VSM_MAGIC		0x6e3bd69b
+
+	struct vsb		*diag;
+
+	char			*dname;
+	char			*iname;
+
+	struct stat		fstat;
+
+	int			vsm_fd;
+	struct VSM_head		*head;
+	char			*b;
+	char			*e;
+
+	uint64_t		age_ok;
+	double			t_ok;
+
+	struct vsc		*vsc;
+};
+
+/*--------------------------------------------------------------------*/
+
 struct VSM_data *
 VSM_New(void)
 {
@@ -81,7 +107,25 @@ VSM_New(void)
 
 /*--------------------------------------------------------------------*/
 
-int
+void
+VSM_SetVSC(struct VSM_data *vd, struct vsc *vsc)
+{
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
+
+	vd->vsc = vsc;
+}
+
+struct vsc *
+VSM_GetVSC(const struct VSM_data *vd)
+{
+	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
+
+	return (vd->vsc);
+}
+
+/*--------------------------------------------------------------------*/
+
+static int
 vsm_diag(struct VSM_data *vd, const char *fmt, ...)
 {
 	va_list ap;
@@ -179,7 +223,7 @@ VSM_Delete(struct VSM_data *vd)
 
 	VSM_Close(vd);
 	if (vd->vsc != NULL)
-		VSC_Delete(vd);
+		VSC_Delete(vd->vsc);
 	VSM_ResetError(vd);
 	free(vd->dname);
 	FREE_OBJ(vd);