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
1113031f
Commit
1113031f
authored
Apr 26, 2018
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Shuffle code from backend to director level
parent
c8576564
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
19 deletions
+26
-19
cache_backend.c
bin/varnishd/cache/cache_backend.c
+10
-16
cache_director.h
bin/varnishd/cache/cache_director.h
+3
-1
cache_vcl_vrt.c
bin/varnishd/cache/cache_vcl_vrt.c
+13
-2
No files found.
bin/varnishd/cache/cache_backend.c
View file @
1113031f
...
@@ -485,12 +485,17 @@ VRT_new_backend_clustered(VRT_CTX, struct vsmw_cluster *vc,
...
@@ -485,12 +485,17 @@ VRT_new_backend_clustered(VRT_CTX, struct vsmw_cluster *vc,
d
=
be
->
director
;
d
=
be
->
director
;
INIT_OBJ
(
d
,
DIRECTOR_MAGIC
);
INIT_OBJ
(
d
,
DIRECTOR_MAGIC
);
d
->
priv
=
be
;
d
->
priv
=
be
;
d
->
vcl_name
=
be
->
vcl_name
;
d
->
methods
=
vbe_methods
;
d
->
methods
=
vbe_methods
;
d
->
health
=
1
;
be
->
vsc
=
VSC_vbe_New
(
vc
,
&
be
->
vsc_seg
,
d
->
health_changed
=
VTIM_real
();
"%s.%s"
,
VCL_Name
(
ctx
->
vcl
),
vrt
->
vcl_name
);
d
->
admin_health
=
VDI_AH_PROBE
;
AN
(
be
->
vsc
);
retval
=
VRT_AddDirector
(
ctx
,
d
,
"%s"
,
vrt
->
vcl_name
);
if
(
retval
)
{
VRT_delete_backend
(
ctx
,
&
d
);
return
(
NULL
);
}
vbp
=
vrt
->
probe
;
vbp
=
vrt
->
probe
;
if
(
vbp
==
NULL
)
if
(
vbp
==
NULL
)
...
@@ -508,18 +513,7 @@ VRT_new_backend_clustered(VRT_CTX, struct vsmw_cluster *vc,
...
@@ -508,18 +513,7 @@ VRT_new_backend_clustered(VRT_CTX, struct vsmw_cluster *vc,
VBP_Insert
(
be
,
vbp
,
be
->
tcp_pool
);
VBP_Insert
(
be
,
vbp
,
be
->
tcp_pool
);
}
}
be
->
vsc
=
VSC_vbe_New
(
vc
,
&
be
->
vsc_seg
,
return
(
d
);
"%s.%s"
,
VCL_Name
(
ctx
->
vcl
),
vrt
->
vcl_name
);
AN
(
be
->
vsc
);
retval
=
VRT_AddDirector
(
ctx
,
d
,
vrt
->
vcl_name
);
if
(
retval
==
0
)
return
(
d
);
VRT_delete_backend
(
ctx
,
&
d
);
AZ
(
d
);
return
(
NULL
);
}
}
struct
director
*
v_matchproto_
()
struct
director
*
v_matchproto_
()
...
...
bin/varnishd/cache/cache_director.h
View file @
1113031f
...
@@ -98,7 +98,9 @@ struct director {
...
@@ -98,7 +98,9 @@ struct director {
/* cache_vcl.c */
/* cache_vcl.c */
int
VRT_AddDirector
(
VRT_CTX
,
struct
director
*
,
const
char
*
);
int
VRT_AddDirector
(
VRT_CTX
,
struct
director
*
,
const
char
*
,
...)
v_printflike_
(
3
,
4
);
void
VRT_DelDirector
(
VRT_CTX
,
struct
director
*
);
void
VRT_DelDirector
(
VRT_CTX
,
struct
director
*
);
/* cache_director.c */
/* cache_director.c */
...
...
bin/varnishd/cache/cache_vcl_vrt.c
View file @
1113031f
...
@@ -38,6 +38,7 @@
...
@@ -38,6 +38,7 @@
#include "vcl.h"
#include "vcl.h"
#include "vct.h"
#include "vct.h"
#include "vtim.h"
#include "cache_director.h"
#include "cache_director.h"
#include "cache_vcl.h"
#include "cache_vcl.h"
...
@@ -126,11 +127,13 @@ VCL_Rel(struct vcl **vcc)
...
@@ -126,11 +127,13 @@ VCL_Rel(struct vcl **vcc)
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
int
int
VRT_AddDirector
(
VRT_CTX
,
struct
director
*
d
,
const
char
*
vcl_name
)
VRT_AddDirector
(
VRT_CTX
,
struct
director
*
d
,
const
char
*
fmt
,
...
)
{
{
struct
vsb
*
vsb
;
struct
vsb
*
vsb
;
struct
vcl
*
vcl
;
struct
vcl
*
vcl
;
struct
vcldir
*
vdir
;
struct
vcldir
*
vdir
;
va_list
ap
;
int
i
;
CHECK_OBJ_NOTNULL
(
d
,
DIRECTOR_MAGIC
);
CHECK_OBJ_NOTNULL
(
d
,
DIRECTOR_MAGIC
);
vcl
=
ctx
->
vcl
;
vcl
=
ctx
->
vcl
;
...
@@ -147,16 +150,24 @@ VRT_AddDirector(VRT_CTX, struct director *d, const char *vcl_name)
...
@@ -147,16 +150,24 @@ VRT_AddDirector(VRT_CTX, struct director *d, const char *vcl_name)
d
->
admin_health
=
VDI_AH_PROBE
;
d
->
admin_health
=
VDI_AH_PROBE
;
vsb
=
VSB_new_auto
();
vsb
=
VSB_new_auto
();
AN
(
vsb
);
AN
(
vsb
);
VSB_printf
(
vsb
,
"%s.%s"
,
VCL_Name
(
vcl
),
vcl_name
);
VSB_printf
(
vsb
,
"%s."
,
VCL_Name
(
vcl
));
i
=
VSB_len
(
vsb
);
va_start
(
ap
,
fmt
);
VSB_vprintf
(
vsb
,
fmt
,
ap
);
va_end
(
ap
);
AZ
(
VSB_finish
(
vsb
));
AZ
(
VSB_finish
(
vsb
));
REPLACE
((
d
->
cli_name
),
VSB_data
(
vsb
));
REPLACE
((
d
->
cli_name
),
VSB_data
(
vsb
));
VSB_destroy
(
&
vsb
);
VSB_destroy
(
&
vsb
);
d
->
vcl_name
=
d
->
cli_name
+
i
;
ALLOC_OBJ
(
vdir
,
VCLDIR_MAGIC
);
ALLOC_OBJ
(
vdir
,
VCLDIR_MAGIC
);
AN
(
vdir
);
AN
(
vdir
);
vdir
->
dir
=
d
;
vdir
->
dir
=
d
;
vdir
->
vcl
=
vcl
;
vdir
->
vcl
=
vcl
;
d
->
vdir
=
vdir
;
d
->
vdir
=
vdir
;
d
->
health
=
1
;
d
->
admin_health
=
VDI_AH_PROBE
;
d
->
health_changed
=
VTIM_real
();
Lck_Lock
(
&
vcl_mtx
);
Lck_Lock
(
&
vcl_mtx
);
VTAILQ_INSERT_TAIL
(
&
vcl
->
director_list
,
vdir
,
list
);
VTAILQ_INSERT_TAIL
(
&
vcl
->
director_list
,
vdir
,
list
);
...
...
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