Commit 391d4720 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Have VCC report VMODs to Varnishd out of band (like VCL dependencies).

parent 6e8e590c
...@@ -373,8 +373,10 @@ mgt_VccCompile(struct cli *cli, struct vclprog *vcl, const char *vclname, ...@@ -373,8 +373,10 @@ mgt_VccCompile(struct cli *cli, struct vclprog *vcl, const char *vclname,
AZ(av[0]); AZ(av[0]);
AZ(strcmp(av[1], "/*")); AZ(strcmp(av[1], "/*"));
AZ(strcmp(av[ac-1], "*/")); AZ(strcmp(av[ac-1], "*/"));
AZ(strcmp(av[3], "VCL")); if (!strcmp(av[3], "VCL"))
mgt_vcl_depends(vcl, av[4]); mgt_vcl_depends(vcl, av[4]);
else if (strcmp(av[3], "VMOD"))
WRONG("Wrong VCCINFO");
VAV_Free(av); VAV_Free(av);
} }
AZ(fclose(fcs)); AZ(fclose(fcs));
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include "vcs_version.h" #include "vcs_version.h"
#include "libvcc.h"
#include "vfil.h" #include "vfil.h"
#include "vmod_abi.h" #include "vmod_abi.h"
#include "vrt.h" #include "vrt.h"
...@@ -212,6 +213,9 @@ vcc_ParseImport(struct vcc *tl) ...@@ -212,6 +213,9 @@ vcc_ParseImport(struct vcc *tl)
VSB_printf(ifp->ini, "\t ))\n"); VSB_printf(ifp->ini, "\t ))\n");
VSB_printf(ifp->ini, "\t\treturn(1);"); VSB_printf(ifp->ini, "\t\treturn(1);");
VSB_printf(tl->fi, "%s VMOD %s ./vmod_cache/_vmod_%.*s.%s */\n",
VCC_INFO_PREFIX, fnp, PF(mod), vmd->file_id);
/* XXX: zero the function pointer structure ?*/ /* XXX: zero the function pointer structure ?*/
VSB_printf(ifp->fin, "\t\tVRT_priv_fini(&vmod_priv_%.*s);\n", PF(mod)); VSB_printf(ifp->fin, "\t\tVRT_priv_fini(&vmod_priv_%.*s);\n", PF(mod));
VSB_printf(ifp->fin, "\t\t\tVRT_Vmod_Fini(&VGC_vmod_%.*s);", PF(mod)); VSB_printf(ifp->fin, "\t\t\tVRT_Vmod_Fini(&VGC_vmod_%.*s);", PF(mod));
......
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