Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
391d4720
Commit
391d4720
authored
Mar 04, 2017
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Have VCC report VMODs to Varnishd out of band (like VCL dependencies).
parent
6e8e590c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
mgt_vcc.c
bin/varnishd/mgt/mgt_vcc.c
+4
-2
vcc_vmod.c
lib/libvcc/vcc_vmod.c
+4
-0
No files found.
bin/varnishd/mgt/mgt_vcc.c
View file @
391d4720
...
@@ -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
));
...
...
lib/libvcc/vcc_vmod.c
View file @
391d4720
...
@@ -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\t
return(1);"
);
VSB_printf
(
ifp
->
ini
,
"
\t\t
return(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\t
VRT_priv_fini(&vmod_priv_%.*s);
\n
"
,
PF
(
mod
));
VSB_printf
(
ifp
->
fin
,
"
\t\t
VRT_priv_fini(&vmod_priv_%.*s);
\n
"
,
PF
(
mod
));
VSB_printf
(
ifp
->
fin
,
"
\t\t\t
VRT_Vmod_Fini(&VGC_vmod_%.*s);"
,
PF
(
mod
));
VSB_printf
(
ifp
->
fin
,
"
\t\t\t
VRT_Vmod_Fini(&VGC_vmod_%.*s);"
,
PF
(
mod
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment