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
6327bfbf
Commit
6327bfbf
authored
Sep 10, 2013
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove a unnecessary level of indirection when creating/destroying
VCL created simple directors.
parent
8c4658af
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
39 deletions
+9
-39
cache_backend.c
bin/varnishd/cache/cache_backend.c
+7
-5
cache_backend.h
bin/varnishd/cache/cache_backend.h
+0
-6
cache_backend_cfg.c
bin/varnishd/cache/cache_backend_cfg.c
+0
-25
vrt.h
include/vrt.h
+1
-2
vcc_backend.c
lib/libvcl/vcc_backend.c
+1
-1
No files found.
bin/varnishd/cache/cache_backend.c
View file @
6327bfbf
...
...
@@ -402,11 +402,14 @@ vdi_simple_healthy(const struct director *d, double *changed)
return
(
VBE_Healthy
(
be
,
changed
));
}
static
void
vdi_simple_fini
(
const
struct
director
*
d
)
/*--------------------------------------------------------------------*/
void
VRT_fini_dir
(
struct
cli
*
cli
,
struct
director
*
d
)
{
struct
vdi_simple
*
vs
;
(
void
)
cli
;
ASSERT_CLI
();
CHECK_OBJ_NOTNULL
(
d
,
DIRECTOR_MAGIC
);
CAST_OBJ_NOTNULL
(
vs
,
d
->
priv
,
VDI_SIMPLE_MAGIC
);
...
...
@@ -415,11 +418,11 @@ vdi_simple_fini(const struct director *d)
free
(
vs
->
dir
.
vcl_name
);
vs
->
dir
.
magic
=
0
;
FREE_OBJ
(
vs
);
d
->
priv
=
NULL
;
}
void
VRT_init_dir_simple
(
struct
cli
*
cli
,
struct
director
**
bp
,
int
idx
,
const
void
*
priv
)
VRT_init_dir
(
struct
cli
*
cli
,
struct
director
**
bp
,
int
idx
,
const
void
*
priv
)
{
const
struct
vrt_backend
*
t
;
struct
vdi_simple
*
vs
;
...
...
@@ -435,7 +438,6 @@ VRT_init_dir_simple(struct cli *cli, struct director **bp, int idx,
vs
->
dir
.
name
=
"simple"
;
REPLACE
(
vs
->
dir
.
vcl_name
,
t
->
vcl_name
);
vs
->
dir
.
getfd
=
vdi_simple_getfd
;
vs
->
dir
.
fini
=
vdi_simple_fini
;
vs
->
dir
.
healthy
=
vdi_simple_healthy
;
vs
->
vrt
=
t
;
...
...
bin/varnishd/cache/cache_backend.h
View file @
6327bfbf
...
...
@@ -76,7 +76,6 @@ struct vrt_backend_probe;
*/
typedef
struct
vbc
*
vdi_getfd_f
(
const
struct
director
*
,
struct
busyobj
*
);
typedef
void
vdi_fini_f
(
const
struct
director
*
);
typedef
unsigned
vdi_healthy
(
const
struct
director
*
,
double
*
changed
);
struct
director
{
...
...
@@ -85,7 +84,6 @@ struct director {
const
char
*
name
;
char
*
vcl_name
;
vdi_getfd_f
*
getfd
;
vdi_fini_f
*
fini
;
vdi_healthy
*
healthy
;
void
*
priv
;
};
...
...
@@ -165,7 +163,3 @@ void VBP_Insert(struct backend *b, struct vrt_backend_probe const *p,
void
VBP_Remove
(
struct
backend
*
b
,
struct
vrt_backend_probe
const
*
p
);
void
VBP_Use
(
const
struct
backend
*
b
,
const
struct
vrt_backend_probe
*
p
);
void
VBP_Summary
(
struct
cli
*
cli
,
const
struct
vbp_target
*
vt
);
/* Init functions for directors */
typedef
void
dir_init_f
(
struct
cli
*
,
struct
director
**
,
int
,
const
void
*
);
dir_init_f
VRT_init_dir_simple
;
bin/varnishd/cache/cache_backend_cfg.c
View file @
6327bfbf
...
...
@@ -239,31 +239,6 @@ VBE_AddBackend(struct cli *cli, const struct vrt_backend *vb)
return
(
b
);
}
/*--------------------------------------------------------------------*/
void
VRT_init_dir
(
struct
cli
*
cli
,
struct
director
**
dir
,
const
char
*
name
,
int
idx
,
const
void
*
priv
)
{
ASSERT_CLI
();
if
(
!
strcmp
(
name
,
"simple"
))
VRT_init_dir_simple
(
cli
,
dir
,
idx
,
priv
);
else
INCOMPL
();
}
void
VRT_fini_dir
(
struct
cli
*
cli
,
struct
director
*
b
)
{
(
void
)
cli
;
ASSERT_CLI
();
CHECK_OBJ_NOTNULL
(
b
,
DIRECTOR_MAGIC
);
b
->
fini
(
b
);
b
->
priv
=
NULL
;
}
/*---------------------------------------------------------------------
* String to admin_health
*/
...
...
include/vrt.h
View file @
6327bfbf
...
...
@@ -222,8 +222,7 @@ void VRT_Rollback(const struct vrt_ctx *);
void
VRT_synth_page
(
const
struct
vrt_ctx
*
,
unsigned
flags
,
const
char
*
,
...);
/* Backend related */
void
VRT_init_dir
(
struct
cli
*
,
struct
director
**
,
const
char
*
name
,
int
idx
,
const
void
*
priv
);
void
VRT_init_dir
(
struct
cli
*
,
struct
director
**
,
int
idx
,
const
void
*
priv
);
void
VRT_fini_dir
(
struct
cli
*
,
struct
director
*
);
/* VMOD/Modules related */
...
...
lib/libvcl/vcc_backend.c
View file @
6327bfbf
...
...
@@ -444,7 +444,7 @@ vcc_ParseHostDef(struct vcc *tl, int serial, const char *vgcname)
Fh
(
tl
,
0
,
"%s"
,
VSB_data
(
vsb
));
VSB_delete
(
vsb
);
Fi
(
tl
,
0
,
"
\t
VRT_init_dir(cli, VCL_conf.director,
\"
simple
\"
,
\n
"
Fi
(
tl
,
0
,
"
\t
VRT_init_dir(cli, VCL_conf.director,
\n
"
"
\t
VGC_backend_%s, &vgc_dir_priv_%s);
\n
"
,
vgcname
,
vgcname
);
Ff
(
tl
,
0
,
"
\t
VRT_fini_dir(cli, VGCDIR(%s));
\n
"
,
vgcname
);
tl
->
ndirector
++
;
...
...
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